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 (authorization != null) {
- CmsAuthUtils.addAuthorization(subject, authorization, request);
+ CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request);
cleanUp();
return true;
} else {
}
}
}
+
+ // 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) {