X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=eac68036d51c2862bec9db79bfbb08c05cc94c7a;hb=255654a72d48b875d71cea637532784953d80499;hp=491acf9bc4cbfc75863bdbc0a77401bbbd44751a;hpb=7e333073d07b780efe681306a1842a750cbea83c;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java index 491acf9bc..eac68036d 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java @@ -11,7 +11,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +23,7 @@ import org.osgi.framework.ServiceReference; import org.osgi.service.http.HttpContext; import org.osgi.service.useradmin.Authorization; -public class HttpSessionLoginModule implements LoginModule, AuthConstants { +public class HttpSessionLoginModule implements LoginModule { private final static Log log = LogFactory.getLog(HttpSessionLoginModule.class); private Subject subject = null; @@ -50,6 +49,8 @@ public class HttpSessionLoginModule implements LoginModule, AuthConstants { @Override public boolean login() throws LoginException { + if (callbackHandler == null) + return false; HttpRequestCallback httpCallback = new HttpRequestCallback(); try { callbackHandler.handle(new Callback[] { httpCallback }); @@ -61,140 +62,113 @@ public class HttpSessionLoginModule implements LoginModule, AuthConstants { request = httpCallback.getRequest(); if (request == null) return false; - authorization = checkHttp(); + authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION); + if (authorization == null) {// search by session ID + String httpSessionId = request.getSession().getId(); + // authorization = (Authorization) + // request.getSession().getAttribute(HttpContext.AUTHORIZATION); + // if (authorization == null) { + Collection> sr; + try { + sr = bc.getServiceReferences(WebCmsSession.class, + "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); + } catch (InvalidSyntaxException e) { + throw new CmsException("Cannot get CMS session for id " + httpSessionId, e); + } + if (sr.size() == 1) { + WebCmsSession cmsSession = bc.getService(sr.iterator().next()); + authorization = cmsSession.getAuthorization(); + if (log.isTraceEnabled()) + log.trace("Retrieved authorization from " + cmsSession); + } else if (sr.size() == 0) + authorization = null; + else + throw new CmsException(sr.size() + ">1 web sessions detected for http session " + httpSessionId); + + } + sharedState.put(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST, request); if (authorization == null) return false; - sharedState.put(SHARED_STATE_AUTHORIZATION, authorization); + sharedState.put(CmsAuthUtils.SHARED_STATE_AUTHORIZATION, authorization); return true; } - private Authorization checkHttp() { - Authorization authorization = null; - if (request != null) { - authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION); - if (authorization == null) { - String httpSessionId = request.getSession().getId(); - authorization = (Authorization) request.getSession().getAttribute(HttpContext.AUTHORIZATION); - if (authorization == null) { - Collection> sr; - try { - sr = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); - } catch (InvalidSyntaxException e) { - throw new CmsException("Cannot get CMS session for id " + httpSessionId, e); - } - if (sr.size() == 1) { - WebCmsSession cmsSession = bc.getService(sr.iterator().next()); - authorization = cmsSession.getAuthorization(); - if (log.isTraceEnabled()) - log.trace("Retrieved authorization from " + cmsSession); - } else if (sr.size() == 0) - return null; - else - throw new CmsException( - sr.size() + ">1 web sessions detected for http session " + httpSessionId); - } - } - } - return authorization; - } + // private Authorization checkHttp() { + // Authorization authorization = null; + // if (request != null) { + // authorization = (Authorization) + // request.getAttribute(HttpContext.AUTHORIZATION); + // if (authorization == null) { + // String httpSessionId = request.getSession().getId(); + // authorization = (Authorization) + // request.getSession().getAttribute(HttpContext.AUTHORIZATION); + // if (authorization == null) { + // Collection> sr; + // try { + // sr = bc.getServiceReferences(WebCmsSession.class, + // "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); + // } catch (InvalidSyntaxException e) { + // throw new CmsException("Cannot get CMS session for id " + httpSessionId, + // e); + // } + // if (sr.size() == 1) { + // WebCmsSession cmsSession = bc.getService(sr.iterator().next()); + // authorization = cmsSession.getAuthorization(); + // if (log.isTraceEnabled()) + // log.trace("Retrieved authorization from " + cmsSession); + // } else if (sr.size() == 0) + // return null; + // else + // throw new CmsException( + // sr.size() + ">1 web sessions detected for http session " + + // httpSessionId); + // } + // } + // } + // return authorization; + // } @Override public boolean commit() throws LoginException { // TODO create CmsSession in another module + Authorization authorizationToRegister; if (authorization == null) { - authorization = (Authorization) sharedState.get(SHARED_STATE_AUTHORIZATION); + authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION); } else { // this login module did the authorization CmsAuthUtils.addAuthentication(subject, authorization); + authorizationToRegister = authorization; } - if (authorization == null) { + if (authorizationToRegister == null) { return false; } if (request == null) return false; - String httpSessionId = request.getSession().getId(); - if (authorization.getName() != null) { - request.setAttribute(HttpContext.REMOTE_USER, authorization.getName()); - request.setAttribute(HttpContext.AUTHORIZATION, authorization); - - HttpSession httpSession = request.getSession(); - if (httpSession.getAttribute(HttpContext.AUTHORIZATION) == null) { - - Collection> sr; - try { - sr = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); - } catch (InvalidSyntaxException e) { - throw new CmsException("Cannot get CMS session for id " + httpSessionId, e); - } - ServiceReference cmsSessionRef; - if (sr.size() == 1) { - cmsSessionRef = sr.iterator().next(); - } else if (sr.size() == 0) { - WebCmsSessionImpl cmsSessionImpl = new WebCmsSessionImpl(httpSessionId, authorization); - cmsSessionRef = cmsSessionImpl.getServiceRegistration().getReference(); - if (log.isDebugEnabled()) - log.debug("Initialized " + cmsSessionImpl + " for " + authorization.getName()); - } else - throw new CmsException(sr.size() + " CMS sessions registered for " + httpSessionId); - - WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) bc.getService(cmsSessionRef); - cmsSession.addHttpSession(request); - if (log.isTraceEnabled()) - log.trace("Added " + request.getServletPath() + " to " + cmsSession + " (" + request.getRequestURI() - + ")"); - httpSession.setAttribute(HttpContext.REMOTE_USER, authorization.getName()); - httpSession.setAttribute(HttpContext.AUTHORIZATION, authorization); - } - } - if (subject.getPrivateCredentials(HttpSessionId.class).size() == 0) - subject.getPrivateCredentials().add(new HttpSessionId(httpSessionId)); - else { - String storedSessionId = subject.getPrivateCredentials(HttpSessionId.class).iterator().next().getValue(); - if (storedSessionId.equals(httpSessionId)) - throw new LoginException( - "Subject already logged with session " + storedSessionId + " (not " + httpSessionId + ")"); - } + CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister); if (authorization != null) { - CmsAuthUtils.addAuthentication(subject, authorization); + // CmsAuthUtils.addAuthentication(subject, authorization); + cleanUp(); return true; } else { + cleanUp(); return false; } } @Override public boolean abort() throws LoginException { + cleanUp(); return false; } + private void cleanUp() { + authorization = null; + request = null; + } + @Override public boolean logout() throws LoginException { - String httpSessionId; - if (subject.getPrivateCredentials(HttpSessionId.class).size() == 1) - httpSessionId = subject.getPrivateCredentials(HttpSessionId.class).iterator().next().getValue(); - else - return false; - Collection> srs; - try { - srs = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); - } catch (InvalidSyntaxException e) { - throw new CmsException("Cannot retrieve CMS session #" + httpSessionId, e); - } - - if (srs.size() == 0) - throw new CmsException("No CMS web session found for http session " + httpSessionId); - else if (srs.size() > 1) - throw new CmsException(srs.size() + " CMS web sessions found for http session " + httpSessionId); - - WebCmsSessionImpl cmsSession = (WebCmsSessionImpl) bc.getService(srs.iterator().next()); - cmsSession.cleanUp(); - subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(HttpSessionId.class)); - if (log.isDebugEnabled()) - log.debug("Cleaned up " + cmsSession); - return true; + return CmsAuthUtils.logoutSession(bc, subject); } }