X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=734b874efff24743c9dc998f5c6aab0db9d67f16;hb=03f646fd0d7e7ce393694c836c779bc67a4eef55;hp=c18348385587e4ac956160779a3235f36b0626e9;hpb=a4dac2851e23533c64a23a056da0d82574d8e300;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 c18348385..734b874ef 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
@@ -1,14 +1,12 @@
 package org.argeo.cms.internal.auth;
 
+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;
@@ -16,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;
@@ -30,7 +26,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 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;
@@ -39,15 +34,16 @@ import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.useradmin.Authorization;
 
 /** Default CMS session implementation. */
-public class CmsSessionImpl implements CmsSession {
+public class CmsSessionImpl implements CmsSession, Serializable {
+	private static final long serialVersionUID = 1867719354246307225L;
 	private final static BundleContext bc = FrameworkUtil.getBundle(CmsSessionImpl.class).getBundleContext();
 	private final static Log log = LogFactory.getLog(CmsSessionImpl.class);
 
 	// private final Subject initialSubject;
-	private final AccessControlContext initialContext;
+	private transient AccessControlContext accessControlContext;
 	private final UUID uuid;
 	private final String localSessionId;
-	private final Authorization authorization;
+	private Authorization authorization;
 	private final LdapName userDn;
 	private final boolean anonymous;
 
@@ -57,16 +53,12 @@ public class CmsSessionImpl implements CmsSession {
 
 	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) {
 		this.creationTime = ZonedDateTime.now();
 		this.locale = locale;
-		this.initialContext = Subject.doAs(initialSubject, new PrivilegedAction<AccessControlContext>() {
+		this.accessControlContext = Subject.doAs(initialSubject, new PrivilegedAction<AccessControlContext>() {
 
 			@Override
 			public AccessControlContext run() {
@@ -101,13 +93,6 @@ public class CmsSessionImpl implements CmsSession {
 		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;
@@ -119,12 +104,14 @@ public class CmsSessionImpl implements CmsSession {
 			lc.logout();
 		} catch (LoginException e) {
 			log.warn("Could not logout " + getSubject() + ": " + e);
+		} finally {
+			accessControlContext = null;
 		}
 		log.debug("Closed " + this);
 	}
 
-	private Subject getSubject() {
-		return Subject.getSubject(initialContext);
+	public Subject getSubject() {
+		return Subject.getSubject(accessControlContext);
 	}
 
 	public Set<SecretKey> getSecretKeys() {
@@ -132,78 +119,6 @@ public class CmsSessionImpl implements CmsSession {
 		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();