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;
private BundleContext bc;
private Authorization authorization;
+ private Locale locale;
@SuppressWarnings("unchecked")
@Override
}
if (sr.size() == 1) {
CmsSession cmsSession = bc.getService(sr.iterator().next());
+ locale = cmsSession.getLocale();
authorization = cmsSession.getAuthorization();
if (authorization.getName() == null)
authorization = null;// anonymous is not sufficient
}
if (authorization != null) {
- CmsAuthUtils.addAuthorization(subject, authorization, request.getLocale(), request);
+ // Locale locale = request.getLocale();
+ if (locale == null)
+ locale = request.getLocale();
+ subject.getPublicCredentials().add(locale);
+ 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);
}
}
if (null != certs && certs.length > 0) {
sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs);
+ } else {
+ // When client has been verified by reverse proxy
+ String certDn = req.getHeader("SSL_CLIENT_S_DN");
+ if (certDn != null) {
+ sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
+ String issuerDn = req.getHeader("SSL_CLIENT_I_DN");
+ sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, issuerDn);
+ }
}
}