[Yanel-commits] rev 51484 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-07-21 12:33:42 +0200 (Wed, 21 Jul 2010)
New Revision: 51484

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
differentiate between alias and true ID

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-07-21 10:29:51 UTC (rev 51483)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-07-21 10:33:42 UTC (rev 51484)
@@ -1637,11 +1637,12 @@
                 String password = up[1];
                 log.debug("username: " + username + ", password: " + password);
                 try {
-                    User user = realm.getIdentityManager().getUserManager().getUser(username);
+                    String trueID = realm.getIdentityManager().getUserManager().getTrueId(username);
+                    User user = realm.getIdentityManager().getUserManager().getUser(trueID);
                     if (user != null && user.authenticate(password)) {
-                        return new Identity(user);
+                        return new Identity(user, username);
                     } else {
-                        log.warn("HTTP BASIC Authentication failed for " + username + "!");
+                        log.warn("HTTP BASIC Authentication failed for " + username + " (True ID: '" + trueID + "')!");
 /*
                         response.setHeader("WWW-Authenticate", "BASIC realm=\"" + realm.getName() + "\"");
                         response.sendError(response.SC_UNAUTHORIZED);