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;
+import org.argeo.naming.LdapAttrs;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
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) {
if (sr.size() == 1) {
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)
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;
+ }
}
@Override
public boolean commit() throws LoginException {
- if(authorization!=null){
- CmsAuthUtils.addAuthentication(subject, authorization);
- CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorization);
- }
-
- // 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;
-// }
-// if (request == null)
-// return false;
-// CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
-
byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN);
if (outToken != null) {
response.setHeader(CmsAuthUtils.HEADER_WWW_AUTHENTICATE,
}
if (authorization != null) {
- // CmsAuthUtils.addAuthentication(subject, authorization);
+ CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request);
cleanUp();
return true;
} else {
@Override
public boolean logout() throws LoginException {
- return CmsAuthUtils.logoutSession(bc, subject);
+ cleanUp();
+ return true;
}
private void extractHttpAuth(final HttpServletRequest httpRequest) {
}
}
}
+
+ // 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) {