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;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-//import org.apache.jackrabbit.core.security.AnonymousPrincipal;
-//import org.apache.jackrabbit.core.security.SecurityConstants;
-//import org.apache.jackrabbit.core.security.principal.AdminPrincipal;
-import org.argeo.cms.CmsException;
+import org.argeo.api.NodeConstants;
+import org.argeo.api.security.AnonymousPrincipal;
+import org.argeo.api.security.DataAdminPrincipal;
+import org.argeo.api.security.NodeSecurityUtils;
import org.argeo.cms.internal.auth.CmsSessionImpl;
import org.argeo.cms.internal.auth.ImpliedByPrincipal;
import org.argeo.cms.internal.http.WebCmsSessionImpl;
import org.argeo.cms.internal.kernel.Activator;
-import org.argeo.node.NodeConstants;
-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;
+/** Centrlaises security related registrations. */
class CmsAuthUtils {
// Standard
final static String SHARED_STATE_NAME = AuthenticatingUser.SHARED_STATE_NAME;
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;
NodeSecurityUtils.checkUserName(name);
userPrincipal = new X500Principal(name.toString());
principals.add(userPrincipal);
- // principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_USER_NAME,
- // userPrincipal));
+
+ if (Activator.isSingleUser()) {
+ principals.add(new ImpliedByPrincipal(NodeSecurityUtils.ROLE_ADMIN_NAME, userPrincipal));
+ }
}
// Add roles provided by authorization
}
} catch (InvalidNameException e) {
- throw new CmsException("Cannot commit", e);
+ throw new IllegalArgumentException("Cannot commit", e);
}
-
- registerSessionAuthorization(request, subject, authorization, locale);
}
private static void checkSubjectEmpty(Subject subject) {
// subject.getPrincipals().removeAll(subject.getPrincipals(AnonymousPrincipal.class));
}
- private synchronized static void registerSessionAuthorization(HttpServletRequest request, Subject subject,
+ @SuppressWarnings("unused")
+ synchronized static void registerSessionAuthorization(HttpServletRequest request, Subject subject,
Authorization authorization, Locale locale) {
// synchronized in order to avoid multiple registrations
// TODO move it to a service in order to avoid static synchronization
HttpSession httpSession = request.getSession(false);
assert httpSession != null;
String httpSessId = httpSession.getId();
- String remoteUser = authorization.getName() != null ? authorization.getName()
- : NodeConstants.ROLE_ANONYMOUS;
+ boolean anonymous = authorization.getName() == null;
+ String remoteUser = !anonymous ? authorization.getName() : NodeConstants.ROLE_ANONYMOUS;
request.setAttribute(HttpContext.REMOTE_USER, remoteUser);
request.setAttribute(HttpContext.AUTHORIZATION, authorization);
- CmsSessionImpl cmsSession = CmsSessionImpl.getByLocalId(httpSessId);
- if (cmsSession != null) {
- if (authorization.getName() != null) {
- if (cmsSession.getAuthorization().getName() == null) {
- cmsSession.close();
- cmsSession = null;
- } else if (!authorization.getName().equals(cmsSession.getAuthorization().getName())) {
- throw new CmsException("Inconsistent user " + authorization.getName()
- + " for existing CMS session " + cmsSession);
+ CmsSessionImpl cmsSession;
+ CmsSessionImpl currentLocalSession = CmsSessionImpl.getByLocalId(httpSessId);
+ if (currentLocalSession != null) {
+ boolean currentLocalSessionAnonymous = currentLocalSession.getAuthorization().getName() == null;
+ if (!anonymous) {
+ if (currentLocalSessionAnonymous) {
+ currentLocalSession.close();
+ // new CMS session
+ cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request);
+ } else if (!authorization.getName().equals(currentLocalSession.getAuthorization().getName())) {
+ throw new IllegalStateException("Inconsistent user " + authorization.getName()
+ + " for existing CMS session " + currentLocalSession);
+ } else {
+ // keep current session
+ cmsSession = currentLocalSession;
+ // keyring
+ subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys());
}
} else {// anonymous
- if (cmsSession.getAuthorization().getName() != null) {
- cmsSession.close();
- // TODO rather throw an exception ? log a warning ?
- cmsSession = null;
+ if (!currentLocalSessionAnonymous) {
+ currentLocalSession.close();
+ throw new IllegalStateException(
+ "Existing CMS session " + currentLocalSession + " was not logged out properly.");
}
+ // keep current session
+ cmsSession = currentLocalSession;
}
+ } else {
+ // new CMS session
+ cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request);
}
- if (cmsSession == null)
- cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request);
- // request.setAttribute(CmsSession.class.getName(), cmsSession);
+ if (cmsSession == null)// should be dead code (cf. SuppressWarning of the method)
+ throw new IllegalStateException("CMS session cannot be null");
+
CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());
- if (subject.getPrivateCredentials(CmsSessionId.class).size() == 0)
+ if (subject.getPrivateCredentials(CmsSessionId.class).size() == 0) {
subject.getPrivateCredentials().add(nodeSessionId);
- else {
+ } else {
UUID storedSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
// if (storedSessionId.equals(httpSessionId.getValue()))
- throw new CmsException(
+ throw new IllegalStateException(
"Subject already logged with session " + storedSessionId + " (not " + nodeSessionId + ")");
}
} else {
}
}
+ 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 IllegalArgumentException("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 IllegalStateException(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())
projects / lgpl / argeo-commons.git / blobdiff