X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=ab40e720c2eaf58b2b3d1a9457ee86c8dedbb47a;hb=9a5f846695f89d50908b8f6d7eb63e73a16d435f;hp=e6c63a4de030edfed46be5a206b05643dd0e588d;hpb=33c65b3c6eb26e65c04e8176ae73ffeb43d40c23;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index e6c63a4de..ab40e720c 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -1,6 +1,7 @@
 package org.argeo.cms.auth;
 
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
@@ -25,6 +26,9 @@ import org.argeo.node.security.AnonymousPrincipal;
 import org.argeo.node.security.DataAdminPrincipal;
 import org.argeo.node.security.NodeSecurityUtils;
 import org.argeo.osgi.useradmin.AuthenticatingUser;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.http.HttpContext;
 import org.osgi.service.useradmin.Authorization;
 
@@ -40,9 +44,10 @@ class CmsAuthUtils {
 	final static String SHARED_STATE_SPNEGO_TOKEN = "org.argeo.cms.auth.spnegoToken";
 	final static String SHARED_STATE_SPNEGO_OUT_TOKEN = "org.argeo.cms.auth.spnegoOutToken";
 	final static String SHARED_STATE_CERTIFICATE_CHAIN = "org.argeo.cms.auth.certificateChain";
+	final static String SHARED_STATE_REMOTE_ADDR = "org.argeo.cms.auth.remote.addr";
+	final static String SHARED_STATE_REMOTE_PORT = "org.argeo.cms.auth.remote.port";
 
-	static void addAuthorization(Subject subject, Authorization authorization, Locale locale,
-			HttpServletRequest request) {
+	static void addAuthorization(Subject subject, Authorization authorization) {
 		assert subject != null;
 		checkSubjectEmpty(subject);
 		assert authorization != null;
@@ -158,22 +163,46 @@ class CmsAuthUtils {
 				cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request);
 			}
 			// request.setAttribute(CmsSession.class.getName(), cmsSession);
-			CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());
-			if (subject.getPrivateCredentials(CmsSessionId.class).size() == 0)
-				subject.getPrivateCredentials().add(nodeSessionId);
-			else {
-				UUID storedSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
-				// if (storedSessionId.equals(httpSessionId.getValue()))
-				throw new CmsException(
-						"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
+			if (cmsSession != null) {
+				CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());
+				if (subject.getPrivateCredentials(CmsSessionId.class).size() == 0)
+					subject.getPrivateCredentials().add(nodeSessionId);
+				else {
+					UUID storedSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next()
+							.getUuid();
+					// if (storedSessionId.equals(httpSessionId.getValue()))
+					throw new CmsException(
+							"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
+				}
 			}
-		} else
-
-		{
+		} else {
 			// TODO desktop, CLI
 		}
 	}
 
+	public static CmsSession cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) {
+		Authorization authorization = null;
+		Collection<ServiceReference<CmsSession>> sr;
+		try {
+			sr = bc.getServiceReferences(CmsSession.class,
+					"(" + CmsSession.SESSION_LOCAL_ID + "=" + httpSessionId + ")");
+		} catch (InvalidSyntaxException e) {
+			throw new CmsException("Cannot get CMS session for id " + httpSessionId, e);
+		}
+		CmsSession cmsSession;
+		if (sr.size() == 1) {
+			cmsSession = bc.getService(sr.iterator().next());
+//			locale = cmsSession.getLocale();
+			authorization = cmsSession.getAuthorization();
+			if (authorization.getName() == null)
+				return null;// anonymous is not sufficient
+		} else if (sr.size() == 0)
+			return null;
+		else
+			throw new CmsException(sr.size() + ">1 web sessions detected for http session " + httpSessionId);
+		return cmsSession;
+	}
+
 	public static <T extends Principal> T getSinglePrincipal(Subject subject, Class<T> clss) {
 		Set<T> principals = subject.getPrincipals(clss);
 		if (principals.isEmpty())