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

[michi at wyona.com]

Author: michi
Date: 2010-07-21 12:29:17 +0200 (Wed, 21 Jul 2010)
New Revision: 51482

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
Log:
identity constructor fixed

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2010-07-21 10:28:23 UTC (rev 51481)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2010-07-21 10:29:17 UTC (rev 51482)
@@ -92,7 +92,8 @@
             }
             if(loginUsername != null) {
                 try {
-                    User user = realm.getIdentityManager().getUserManager().getUser(loginUsername, true);
+                    String trueId = realm.getIdentityManager().getUserManager().getTrueId(loginUsername);
+                    User user = realm.getIdentityManager().getUserManager().getUser(trueId, true);
                     if (user != null && user.authenticate(request.getParameter("yanel.login.password"))) {
                         log.debug("Realm: " + realm);
                         IdentityMap identityMap = (IdentityMap)session.getAttribute(YanelServlet.IDENTITY_MAP_KEY);
@@ -100,12 +101,12 @@
                             identityMap = new IdentityMap();
                             session.setAttribute(YanelServlet.IDENTITY_MAP_KEY, identityMap);
                         }
-                        identityMap.put(realm.getID(), new Identity(user));
+                        identityMap.put(realm.getID(), new Identity(user, loginUsername));
                         log.warn("Authentication was successful for user: " + user.getID());
                         log.warn("TODO: Add user to session listener!");
                         return null;
                     }
-                    log.warn("Login failed: " + loginUsername);
+                    log.warn("Login failed: " + loginUsername + " (True ID: " + trueId + ")");
                     getXHTMLAuthenticationForm(request, response, realm, "Login failed!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
                     return response;
                 } catch (ExpiredIdentityException e) {
@@ -150,7 +151,7 @@
                             session.setAttribute(YanelServlet.IDENTITY_MAP_KEY, identityMap);
                         }
                         log.debug("User: " + user.getID());
-                        identityMap.put(realm.getID(), new Identity(user));
+                        identityMap.put(realm.getID(), new Identity(user, openIDSignature));
                         // OpenID authentication successful, hence return null instead an "exceptional" response
                         // TODO: Do not return null (although successful), but rather strip-off all the openid query string stuff and then do a redirect
                         response.sendRedirect(request.getParameter("openid.return_to"));
@@ -224,7 +225,7 @@
                             identityMap = new IdentityMap();
                             session.setAttribute(YanelServlet.IDENTITY_MAP_KEY, identityMap);
                         }
-                        identityMap.put(realm.getID(), new Identity(user));
+                        identityMap.put(realm.getID(), new Identity(user, username));
 
                         // TODO: send some XML content, e.g. <authentication-successful/>
                         response.setContentType("text/plain; charset=" + YanelServlet.DEFAULT_ENCODING);