X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=eaaf41ab72a458ee7acacb0778315922c9c52ba5;hb=3577df2ca5eee54db1ac39a7bd5ed7bdc8824a67;hp=ef56adc33a318773941ac56a69d3fec202e6e862;hpb=e21dfe7624fb036d0f4003058ecb2d1368259cc5;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 ef56adc33..eaaf41ab7 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.cms.auth;
 
 import java.security.AccessController;
@@ -20,17 +5,18 @@ import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.security.acl.Group;
 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.argeo.cms.CmsException;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
-import org.argeo.node.NodeConstants;
+import org.argeo.cms.internal.auth.ImpliedByPrincipal;
+import org.argeo.cms.internal.kernel.Activator;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -38,9 +24,6 @@ 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();
 	/*
 	 * CURRENT USER API
 	 */
@@ -48,16 +31,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());
@@ -68,6 +50,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());
@@ -95,7 +82,7 @@ public final class CurrentUser {
 
 	public final static String getUsername(Subject subject) {
 		if (subject == null)
-			throw new CmsException("Subject cannot be null");
+			throw new IllegalArgumentException("Subject cannot be null");
 		if (subject.getPrincipals(X500Principal.class).size() != 1)
 			return NodeConstants.ROLE_ANONYMOUS;
 		Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
@@ -109,12 +96,21 @@ public final class CurrentUser {
 	public final static Set<String> roles(Subject subject) {
 		Set<String> roles = new HashSet<String>();
 		roles.add(getUsername(subject));
-		for (Principal group : subject.getPrincipals(Group.class)) {
+		for (Principal group : subject.getPrincipals(ImpliedByPrincipal.class)) {
 			roles.add(group.getName());
 		}
 		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)
@@ -133,32 +129,16 @@ public final class CurrentUser {
 	 * HELPERS
 	 */
 	private static Subject currentSubject() {
-		// CmsAuthenticated cmsView = getNodeAuthenticated();
-		// if (cmsView != null)
-		// return cmsView.getSubject();
 		Subject subject = getAccessControllerSubject();
 		if (subject != null)
 			return subject;
-		throw new CmsException("Cannot find related subject");
+		throw new IllegalStateException("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>
-	 */
-	// private static CmsAuthenticated getNodeAuthenticated() {
-	// return UiContext.getData(CmsAuthenticated.KEY);
-	// }
-
 	private static Authorization getAuthorization(Subject subject) {
 		return subject.getPrivateCredentials(Authorization.class).iterator().next();
 	}
@@ -170,9 +150,13 @@ public final class CurrentUser {
 		else
 			return false;
 		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
-		cmsSession.close();
-//		if (log.isDebugEnabled())
-//			log.debug("Logged out CMS session " + cmsSession.getUuid());
+		
+		// FIXME logout all views
+		// TODO check why it is sometimes null
+		if (cmsSession != null)
+			cmsSession.close();
+		// if (log.isDebugEnabled())
+		// log.debug("Logged out CMS session " + cmsSession.getUuid());
 		return true;
 	}