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 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;
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";
- 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;
+ " for existing CMS session " + cmsSession);
}
// keyring
- subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys());
+ if (cmsSession != null)
+ subject.getPrivateCredentials().addAll(cmsSession.getSecretKeys());
} else {// anonymous
if (cmsSession.getAuthorization().getName() != null) {
cmsSession.close();
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())