X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=c18348385587e4ac956160779a3235f36b0626e9;hb=a4dac2851e23533c64a23a056da0d82574d8e300;hp=8761480fe29f8ebdc57a4d7336ab4c748ab4ffd1;hpb=3877d57c9cdad93179d6362a09af6b18576a512c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
index 8761480fe..c18348385 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
@@ -10,7 +10,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -24,6 +23,7 @@ import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
+import javax.security.auth.x500.X500Principal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -38,6 +38,7 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.useradmin.Authorization;
 
+/** Default CMS session implementation. */
 public class CmsSessionImpl implements CmsSession {
 	private final static BundleContext bc = FrameworkUtil.getBundle(CmsSessionImpl.class).getBundleContext();
 	private final static Log log = LogFactory.getLog(CmsSessionImpl.class);
@@ -58,7 +59,9 @@ public class CmsSessionImpl implements CmsSession {
 
 	private Map<String, Session> dataSessions = new HashMap<>();
 	private Set<String> dataSessionsInUse = new HashSet<>();
-	private LinkedHashSet<Session> additionalDataSessions = new LinkedHashSet<>();
+	private Set<Session> additionalDataSessions = new HashSet<>();
+
+	private Map<String, Object> views = new HashMap<>();
 
 	public CmsSessionImpl(Subject initialSubject, Authorization authorization, Locale locale, String localSessionId) {
 		this.creationTime = ZonedDateTime.now();
@@ -125,14 +128,17 @@ public class CmsSessionImpl implements CmsSession {
 	}
 
 	public Set<SecretKey> getSecretKeys() {
+		checkValid();
 		return getSubject().getPrivateCredentials(SecretKey.class);
 	}
 
 	public Session newDataSession(String cn, String workspace, Repository repository) {
+		checkValid();
 		return login(repository, workspace);
 	}
 
 	public synchronized Session getDataSession(String cn, String workspace, Repository repository) {
+		checkValid();
 		// FIXME make it more robust
 		if (workspace == null)
 			workspace = NodeConstants.SYS_WORKSPACE;
@@ -203,12 +209,18 @@ public class CmsSessionImpl implements CmsSession {
 		return !isClosed();
 	}
 
-	protected boolean isClosed() {
+	private void checkValid() {
+		if (!isValid())
+			throw new IllegalStateException("CMS session " + uuid + " is not valid since " + end);
+	}
+
+	final protected boolean isClosed() {
 		return getEnd() != null;
 	}
 
 	@Override
 	public Authorization getAuthorization() {
+		checkValid();
 		return authorization;
 	}
 
@@ -222,6 +234,11 @@ public class CmsSessionImpl implements CmsSession {
 		return userDn;
 	}
 
+	@Override
+	public String getUserRole() {
+		return new X500Principal(authorization.getName()).getName();
+	}
+
 	@Override
 	public String getLocalId() {
 		return localSessionId;
@@ -247,6 +264,14 @@ public class CmsSessionImpl implements CmsSession {
 		return end;
 	}
 
+	@Override
+	public void registerView(String uid, Object view) {
+		checkValid();
+		if (views.containsKey(uid))
+			throw new IllegalArgumentException("View " + uid + " is already registered.");
+		views.put(uid, view);
+	}
+
 	public String toString() {
 		return "CMS Session " + userDn + " local=" + localSessionId + ", uuid=" + uuid;
 	}