X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=4e9b4e07293188b62e31d4fcdf383e71f90ee613;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=f40c6fffd561d6315239c96109863fa2d9c35495;hpb=ae1dc3ee291e2256ba0cdd3994f3d2deab1e4a93;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 f40c6fffd..4e9b4e072 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
@@ -4,12 +4,9 @@ import java.io.Serializable;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Map;
@@ -17,8 +14,6 @@ import java.util.Set;
 import java.util.UUID;
 
 import javax.crypto.SecretKey;
-import javax.jcr.Repository;
-import javax.jcr.Session;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
@@ -29,9 +24,8 @@ import javax.security.auth.x500.X500Principal;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsSession;
 import org.argeo.api.security.NodeSecurityUtils;
-import org.argeo.cms.auth.CmsSession;
-import org.argeo.jcr.JcrUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -59,10 +53,6 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 
 	private ServiceRegistration<CmsSession> serviceRegistration;
 
-	private Map<String, Session> dataSessions = new HashMap<>();
-	private Set<String> dataSessionsInUse = new HashSet<>();
-	private Set<Session> additionalDataSessions = new HashSet<>();
-
 	private Map<String, Object> views = new HashMap<>();
 
 	public CmsSessionImpl(Subject initialSubject, Authorization authorization, Locale locale, String localSessionId) {
@@ -103,14 +93,6 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		end = ZonedDateTime.now();
 		serviceRegistration.unregister();
 
-		synchronized (this) {
-			// TODO check data session in use ?
-			for (String path : dataSessions.keySet())
-				JcrUtils.logoutQuietly(dataSessions.get(path));
-			for (Session session : additionalDataSessions)
-				JcrUtils.logoutQuietly(session);
-		}
-
 		try {
 			LoginContext lc;
 			if (isAnonymous()) {
@@ -127,7 +109,7 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		log.debug("Closed " + this);
 	}
 
-	private Subject getSubject() {
+	public Subject getSubject() {
 		return Subject.getSubject(accessControlContext);
 	}
 
@@ -136,78 +118,6 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		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;
-		String path = cn + '/' + workspace;
-		if (dataSessionsInUse.contains(path)) {
-			try {
-				wait(1000);
-				if (dataSessionsInUse.contains(path)) {
-					Session session = login(repository, workspace);
-					additionalDataSessions.add(session);
-					if (log.isTraceEnabled())
-						log.trace("Additional data session " + path + " for " + userDn);
-					return session;
-				}
-			} catch (InterruptedException e) {
-				// silent
-			}
-		}
-
-		Session session = null;
-		if (dataSessions.containsKey(path)) {
-			session = dataSessions.get(path);
-		} else {
-			session = login(repository, workspace);
-			dataSessions.put(path, session);
-			if (log.isTraceEnabled())
-				log.trace("New data session " + path + " for " + userDn);
-		}
-		dataSessionsInUse.add(path);
-		return session;
-	}
-
-	private Session login(Repository repository, String workspace) {
-		try {
-			return Subject.doAs(getSubject(), new PrivilegedExceptionAction<Session>() {
-				@Override
-				public Session run() throws Exception {
-					return repository.login(workspace);
-				}
-			});
-		} catch (PrivilegedActionException e) {
-			throw new IllegalStateException("Cannot log in " + userDn + " to JCR", e);
-		}
-	}
-
-	public synchronized void releaseDataSession(String cn, Session session) {
-		if (additionalDataSessions.contains(session)) {
-			JcrUtils.logoutQuietly(session);
-			additionalDataSessions.remove(session);
-			if (log.isTraceEnabled())
-				log.trace("Remove additional data session " + session);
-			return;
-		}
-		String path = cn + '/' + session.getWorkspace().getName();
-		if (!dataSessionsInUse.contains(path))
-			log.warn("Data session " + path + " was not in use for " + userDn);
-		dataSessionsInUse.remove(path);
-		Session registeredSession = dataSessions.get(path);
-		if (session != registeredSession)
-			log.warn("Data session " + path + " not consistent for " + userDn);
-		if (log.isTraceEnabled())
-			log.trace("Released data session " + session + " for " + path);
-		notifyAll();
-	}
-
 	@Override
 	public boolean isValid() {
 		return !isClosed();
@@ -222,12 +132,16 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		return getEnd() != null;
 	}
 
-	@Override
 	public Authorization getAuthorization() {
 		checkValid();
 		return authorization;
 	}
 
+	@Override
+	public String getDisplayName() {
+		return authorization.toString();
+	}
+
 	@Override
 	public UUID getUuid() {
 		return uuid;