[Yanel-commits] rev 55535 -
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl
michi at wyona.com
michi at wyona.com
Thu Dec 16 08:19:38 CET 2010
Author: michi
Date: 2010-12-16 08:19:38 +0100 (Thu, 16 Dec 2010)
New Revision: 55535
Modified:
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
Log:
unused method commented and replaced by YanelServlet and note added re group resolving
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-12-16 07:16:21 UTC (rev 55534)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java 2010-12-16 07:19:38 UTC (rev 55535)
@@ -393,7 +393,12 @@
realmElement.setAttributeNS(YanelServlet.NAMESPACE, "name", realm.getName());
realmElement.setAttributeNS(YanelServlet.NAMESPACE, "mount-point", realm.getMountPoint().toString());
- String currentUserId = getCurrentUserId(request.getSession(true), realm);
+ String currentUserId = null;
+ Identity identity = YanelServlet.getIdentity(request.getSession(true), realm);
+ if (identity != null) {
+ currentUserId = identity.getUsername();
+ }
+ //String currentUserId = getCurrentUserId(request.getSession(true), realm);
if (currentUserId != null) {
Element userElement = (Element) rootElement.appendChild(adoc.createElementNS(YanelServlet.NAMESPACE, "user"));
userElement.setAttributeNS(YanelServlet.NAMESPACE, "id", currentUserId);
@@ -585,11 +590,13 @@
*/
/**
+ * @deprecated Use YanelServlet.getIdentity(Session, Realm) instead
* Get current user id (if signed-in) for a specific realm.
* @param session HTTP session
* @param realm Realm
* @return Username and if not signed-in, then null
*/
+/*
public static String getCurrentUserId(HttpSession session, Realm realm) {
IdentityMap identityMap = (IdentityMap)session.getAttribute(YanelServlet.IDENTITY_MAP_KEY);
if (identityMap != null) {
@@ -598,6 +605,7 @@
}
return null;
}
+*/
/**
* Handle "remember my login"
@@ -657,7 +665,7 @@
identityMap = new IdentityMap();
session.setAttribute(YanelServlet.IDENTITY_MAP_KEY, identityMap);
}
- identityMap.put(realm.getID(), new Identity(user, username));
+ identityMap.put(realm.getID(), new Identity(user, username)); // INFO: Please note that the constructor Identity(User, String) is resolving group IDs (including parent group IDs) and hence these are "attached" to the session in order to improve performance during authorization checks
log.warn("Authentication was successful for user: " + user.getID());
log.warn("TODO: Add user to session listener!");
return true;
More information about the Yanel-commits
mailing list