import java.io.IOException;
import java.security.cert.X509Certificate;
+import java.util.Base64;
import java.util.Collection;
+import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
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;
}
if (authorization != null) {
- CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request);
+ Locale locale = request.getLocale();
+ CmsAuthUtils.addAuthorization(subject, authorization,locale , request);
+ CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
cleanUp();
return true;
} else {
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) {
}
} 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;
}
}