X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=34f4457ed446021369a5a51e340bdf9d715cada3;hb=7e77ed8fc812ea81d5cecec67006fbe363150ef8;hp=375600ad275406c71f36404f4fa8e43c852360ec;hpb=34ba1b915e1d406f6574c0be93e1e9da3eab1978;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index 375600ad2..34f4457ed 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -21,25 +21,18 @@ import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.security.acl.Group;
-import java.util.Collection;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.internal.http.WebCmsSessionImpl;
-import org.argeo.eclipse.ui.specific.UiContext;
+import org.argeo.cms.internal.auth.CmsSessionImpl;
+import org.argeo.cms.internal.kernel.Activator;
 import org.argeo.node.NodeConstants;
-import org.argeo.node.security.NodeAuthenticated;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -47,8 +40,9 @@ import org.osgi.service.useradmin.Authorization;
  * context.
  */
 public final class CurrentUser {
-	private final static Log log = LogFactory.getLog(CurrentUser.class);
-	private final static BundleContext bc = FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
+	// private final static Log log = LogFactory.getLog(CurrentUser.class);
+	// private final static BundleContext bc =
+	// FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
 	/*
 	 * CURRENT USER API
 	 */
@@ -56,16 +50,15 @@ public final class CurrentUser {
 	/**
 	 * Technical username of the currently authenticated user.
 	 * 
-	 * @return the authenticated username or null if not authenticated /
-	 *         anonymous
+	 * @return the authenticated username or null if not authenticated / anonymous
 	 */
 	public static String getUsername() {
 		return getUsername(currentSubject());
 	}
 
 	/**
-	 * Human readable name of the currently authenticated user (typically first
-	 * name and last name).
+	 * Human readable name of the currently authenticated user (typically first name
+	 * and last name).
 	 */
 	public static String getDisplayName() {
 		return getDisplayName(currentSubject());
@@ -76,6 +69,11 @@ public final class CurrentUser {
 		return isAnonymous(currentSubject());
 	}
 
+	/** Locale of the current user */
+	public final static Locale locale() {
+		return locale(currentSubject());
+	}
+
 	/** Roles of the currently logged-in user */
 	public final static Set<String> roles() {
 		return roles(currentSubject());
@@ -123,6 +121,15 @@ public final class CurrentUser {
 		return roles;
 	}
 
+	public final static Locale locale(Subject subject) {
+		Set<Locale> locales = subject.getPublicCredentials(Locale.class);
+		if (locales.isEmpty()) {
+			Locale defaultLocale = Activator.getNodeState().getDefaultLocale();
+			return defaultLocale;
+		} else
+			return locales.iterator().next();
+	}
+
 	/** Whether this user is currently authenticated. */
 	public static boolean isAnonymous(Subject subject) {
 		if (subject == null)
@@ -130,28 +137,42 @@ public final class CurrentUser {
 		String username = getUsername(subject);
 		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
 	}
+
+	public CmsSession getCmsSession() {
+		Subject subject = currentSubject();
+		CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
+		return CmsSessionImpl.getByUuid(cmsSessionId.getUuid());
+	}
+
 	/*
 	 * HELPERS
 	 */
-
 	private static Subject currentSubject() {
-		NodeAuthenticated cmsView = getNodeAuthenticated();
-		if (cmsView != null)
-			return cmsView.getLoginContext().getSubject();
-		Subject subject = Subject.getSubject(AccessController.getContext());
+		// CmsAuthenticated cmsView = getNodeAuthenticated();
+		// if (cmsView != null)
+		// return cmsView.getSubject();
+		Subject subject = getAccessControllerSubject();
 		if (subject != null)
 			return subject;
 		throw new CmsException("Cannot find related subject");
 	}
 
+	private static Subject getAccessControllerSubject() {
+		return Subject.getSubject(AccessController.getContext());
+	}
+
+	// public static boolean isAuthenticated() {
+	// return getAccessControllerSubject() != null;
+	// }
+
 	/**
 	 * The node authenticated component (typically a CMS view) related to this
-	 * display, or null if none is available from this call. <b>Not API: Only
-	 * for low-level access.</b>
+	 * display, or null if none is available from this call. <b>Not API: Only for
+	 * low-level access.</b>
 	 */
-	private static NodeAuthenticated getNodeAuthenticated() {
-		return UiContext.getData(NodeAuthenticated.KEY);
-	}
+	// private static CmsAuthenticated getNodeAuthenticated() {
+	// return UiContext.getData(CmsAuthenticated.KEY);
+	// }
 
 	private static Authorization getAuthorization(Subject subject) {
 		return subject.getPrivateCredentials(Authorization.class).iterator().next();
@@ -163,26 +184,10 @@ public final class CurrentUser {
 			nodeSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
 		else
 			return false;
-		Collection<ServiceReference<CmsSession>> srs;
-		try {
-			srs = bc.getServiceReferences(CmsSession.class, "(" + CmsSession.SESSION_UUID + "=" + nodeSessionId + ")");
-		} catch (InvalidSyntaxException e) {
-			throw new CmsException("Cannot retrieve CMS session #" + nodeSessionId, e);
-		}
-
-		if (srs.size() == 0) {
-			// if (log.isTraceEnabled())
-			// log.warn("No CMS web session found for http session " +
-			// nodeSessionId);
-			return false;
-		} else if (srs.size() > 1)
-			throw new CmsException(srs.size() + " CMS web sessions found for http session " + nodeSessionId);
-
-		WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) bc.getService(srs.iterator().next());
-		cmsSession.cleanUp();
-//		subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(CmsSessionId.class));
-		if (log.isDebugEnabled())
-			log.debug("Logged out CMS session " + cmsSession.getUuid());
+		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
+		cmsSession.close();
+		// if (log.isDebugEnabled())
+		// log.debug("Logged out CMS session " + cmsSession.getUuid());
 		return true;
 	}