X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=f8d5863e69321f530ca818fc89c86b23b5f9ed64;hb=5b3108fe285bca50565b58b63fa4feddc96c0765;hp=af29d25945c9eb6b34a084b31f0b6a48b892b83f;hpb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;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 af29d2594..f8d5863e6 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,10 +10,12 @@ 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;
 import java.util.UUID;
 
+import javax.crypto.SecretKey;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 import javax.naming.InvalidNameException;
@@ -24,11 +26,11 @@ import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
+import org.argeo.api.security.NodeSecurityUtils;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CmsSession;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.security.NodeSecurityUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -50,6 +52,7 @@ public class CmsSessionImpl implements CmsSession {
 
 	private final ZonedDateTime creationTime;
 	private ZonedDateTime end;
+	private final Locale locale;
 
 	private ServiceRegistration<CmsSession> serviceRegistration;
 
@@ -57,8 +60,9 @@ public class CmsSessionImpl implements CmsSession {
 	private Set<String> dataSessionsInUse = new HashSet<>();
 	private LinkedHashSet<Session> additionalDataSessions = new LinkedHashSet<>();
 
-	public CmsSessionImpl(Subject initialSubject, Authorization authorization, String localSessionId) {
+	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>() {
 
 			@Override
@@ -90,15 +94,17 @@ public class CmsSessionImpl implements CmsSession {
 		serviceRegistration = bc.registerService(CmsSession.class, this, props);
 	}
 
-	public synchronized void close() {
+	public void close() {
 		end = ZonedDateTime.now();
 		serviceRegistration.unregister();
 
-		// TODO check data session in use ?
-		for (String path : dataSessions.keySet())
-			JcrUtils.logoutQuietly(dataSessions.get(path));
-		for (Session session : additionalDataSessions)
-			JcrUtils.logoutQuietly(session);
+		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;
@@ -111,13 +117,21 @@ public class CmsSessionImpl implements CmsSession {
 		} catch (LoginException e) {
 			log.warn("Could not logout " + getSubject() + ": " + e);
 		}
-		notifyAll();
+		log.debug("Closed " + this);
 	}
 
 	private Subject getSubject() {
 		return Subject.getSubject(initialContext);
 	}
 
+	public Set<SecretKey> getSecretKeys() {
+		return getSubject().getPrivateCredentials(SecretKey.class);
+	}
+
+	public Session newDataSession(String cn, String workspace, Repository repository) {
+		return login(repository, workspace);
+	}
+
 	public synchronized Session getDataSession(String cn, String workspace, Repository repository) {
 		// FIXME make it more robust
 		if (workspace == null)
@@ -168,6 +182,8 @@ public class CmsSessionImpl implements CmsSession {
 		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();
@@ -177,6 +193,8 @@ public class CmsSessionImpl implements CmsSession {
 		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();
 	}
 
@@ -199,14 +217,6 @@ public class CmsSessionImpl implements CmsSession {
 		return uuid;
 	}
 
-	public String getLocalSessionId() {
-		return localSessionId;
-	}
-
-	public ServiceRegistration<CmsSession> getServiceRegistration() {
-		return serviceRegistration;
-	}
-
 	@Override
 	public LdapName getUserDn() {
 		return userDn;
@@ -217,10 +227,16 @@ public class CmsSessionImpl implements CmsSession {
 		return localSessionId;
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return anonymous;
 	}
 
+	@Override
+	public Locale getLocale() {
+		return locale;
+	}
+
 	@Override
 	public ZonedDateTime getCreationTime() {
 		return creationTime;
@@ -235,7 +251,7 @@ public class CmsSessionImpl implements CmsSession {
 		return "CMS Session " + userDn + " local=" + localSessionId + ", uuid=" + uuid;
 	}
 
-	public static CmsSession getByLocalId(String localId) {
+	public static CmsSessionImpl getByLocalId(String localId) {
 		Collection<ServiceReference<CmsSession>> sr;
 		try {
 			sr = bc.getServiceReferences(CmsSession.class, "(" + CmsSession.SESSION_LOCAL_ID + "=" + localId + ")");
@@ -245,7 +261,7 @@ public class CmsSessionImpl implements CmsSession {
 		ServiceReference<CmsSession> cmsSessionRef;
 		if (sr.size() == 1) {
 			cmsSessionRef = sr.iterator().next();
-			return bc.getService(cmsSessionRef);
+			return (CmsSessionImpl) bc.getService(cmsSessionRef);
 		} else if (sr.size() == 0) {
 			return null;
 		} else
@@ -253,7 +269,7 @@ public class CmsSessionImpl implements CmsSession {
 
 	}
 
-	public static CmsSession getByUuid(String uuid) {
+	public static CmsSessionImpl getByUuid(Object uuid) {
 		Collection<ServiceReference<CmsSession>> sr;
 		try {
 			sr = bc.getServiceReferences(CmsSession.class, "(" + CmsSession.SESSION_UUID + "=" + uuid + ")");
@@ -263,7 +279,7 @@ public class CmsSessionImpl implements CmsSession {
 		ServiceReference<CmsSession> cmsSessionRef;
 		if (sr.size() == 1) {
 			cmsSessionRef = sr.iterator().next();
-			return bc.getService(cmsSessionRef);
+			return (CmsSessionImpl) bc.getService(cmsSessionRef);
 		} else if (sr.size() == 0) {
 			return null;
 		} else