X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=ccd02b5b2783f8a26535958e7ebdcf5c89b5480b;hb=2980adcfb0c8778426cd0f2176b86ba00e9697ab;hp=b450401ff015bd5aaf268f9b000b065f5e87296f;hpb=cf53e939cabed54ee2a3074afcf22417fbdf364d;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 b450401ff..ccd02b5b2 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java @@ -2,6 +2,7 @@ package org.argeo.cms.auth; import java.io.IOException; import java.security.cert.X509Certificate; +import java.util.Base64; import java.util.Collection; import java.util.Map; import java.util.StringTokenizer; @@ -13,8 +14,9 @@ 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.HttpServletResponse; +import javax.servlet.http.HttpSession; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; @@ -33,6 +35,7 @@ public class HttpSessionLoginModule implements LoginModule { private Map sharedState = null; private HttpServletRequest request = null; + private HttpServletResponse response = null; private BundleContext bc; @@ -66,20 +69,29 @@ public class HttpSessionLoginModule implements LoginModule { return false; authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION); if (authorization == null) {// search by session ID - String httpSessionId = request.getSession().getId(); + HttpSession httpSession = request.getSession(false); + if (httpSession == null) { + // TODO make sure this is always safe + if (log.isTraceEnabled()) + log.trace("Create http session"); + httpSession = request.getSession(true); + } + String httpSessionId = httpSession.getId(); // authorization = (Authorization) // request.getSession().getAttribute(HttpContext.AUTHORIZATION); // if (authorization == null) { - Collection> sr; + Collection> sr; try { - sr = bc.getServiceReferences(WebCmsSession.class, - "(" + WebCmsSession.CMS_SESSION_ID + "=" + httpSessionId + ")"); + sr = bc.getServiceReferences(CmsSession.class, + "(" + CmsSession.SESSION_LOCAL_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()); + CmsSession cmsSession = bc.getService(sr.iterator().next()); authorization = cmsSession.getAuthorization(); + if (authorization.getName() == null) + authorization = null;// anonymous is not sufficient if (log.isTraceEnabled()) log.trace("Retrieved authorization from " + cmsSession); } else if (sr.size() == 0) @@ -91,66 +103,23 @@ public class HttpSessionLoginModule implements LoginModule { sharedState.put(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST, request); extractHttpAuth(request); extractClientCertificate(request); - if (authorization == null) + if (authorization == null) { return false; - sharedState.put(CmsAuthUtils.SHARED_STATE_AUTHORIZATION, authorization); - return true; + } else { + 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; - // } - @Override public boolean commit() throws LoginException { - // TODO create CmsSession in another module - Authorization authorizationToRegister; - if (authorization == null) { - authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION); - } else { // this login module did the authorization - CmsAuthUtils.addAuthentication(subject, authorization); - authorizationToRegister = authorization; - } - if (authorizationToRegister == null) { - return false; + byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN); + if (outToken != null) { + response.setHeader(CmsAuthUtils.HEADER_WWW_AUTHENTICATE, + "Negotiate " + java.util.Base64.getEncoder().encodeToString(outToken)); } - if (request == null) - return false; - CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister); if (authorization != null) { - // CmsAuthUtils.addAuthentication(subject, authorization); + CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request); cleanUp(); return true; } else { @@ -172,7 +141,8 @@ public class HttpSessionLoginModule implements LoginModule { @Override public boolean logout() throws LoginException { - return CmsAuthUtils.logoutSession(bc, subject); + cleanUp(); + return true; } private void extractHttpAuth(final HttpServletRequest httpRequest) { @@ -184,7 +154,8 @@ public class HttpSessionLoginModule implements LoginModule { if (basic.equalsIgnoreCase("Basic")) { try { // TODO manipulate char[] - String credentials = new String(Base64.decodeBase64(st.nextToken()), "UTF-8"); + Base64.Decoder decoder = Base64.getDecoder(); + String credentials = new String(decoder.decode(st.nextToken()), "UTF-8"); // log.debug("Credentials: " + credentials); int p = credentials.indexOf(":"); if (p != -1) { @@ -200,19 +171,29 @@ public class HttpSessionLoginModule implements LoginModule { } } else if (basic.equalsIgnoreCase("Negotiate")) { String spnegoToken = st.nextToken(); - byte[] authToken = Base64.decodeBase64(spnegoToken); + Base64.Decoder decoder = Base64.getDecoder(); + byte[] authToken = decoder.decode(spnegoToken); sharedState.put(CmsAuthUtils.SHARED_STATE_SPNEGO_TOKEN, authToken); } } } + + // auth token + // String mail = request.getParameter(LdapAttrs.mail.name()); + // String authPassword = request.getParameter(LdapAttrs.authPassword.name()); + // if (authPassword != null) { + // sharedState.put(CmsAuthUtils.SHARED_STATE_PWD, authPassword); + // if (mail != null) + // sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, mail); + // } } - private X509Certificate[] extractClientCertificate(HttpServletRequest req) { + private void extractClientCertificate(HttpServletRequest req) { X509Certificate[] certs = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate"); if (null != certs && certs.length > 0) { - return certs; + sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName()); + sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs); } - return null; } }