private void extractClientCertificate(HttpServletRequest req) {
X509Certificate[] certs = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");
if (null != certs && certs.length > 0) {// Servlet container verified the client certificate
- sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certs[0].getSubjectX500Principal().getName());
+ String certDn = certs[0].getSubjectX500Principal().getName();
+ sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, certs);
+ if (log.isDebugEnabled())
+ log.debug("Client certificate " + certDn + " verified by servlet container");
} // Reverse proxy verified the client certificate
String clientDnHttpHeader = Activator.getHttpProxySslHeader();
if (clientDnHttpHeader != null) {
String certDn = req.getHeader(clientDnHttpHeader);
// TODO retrieve more cf. https://httpd.apache.org/docs/current/mod/mod_ssl.html
// String issuerDn = req.getHeader("SSL_CLIENT_I_DN");
- if (certDn != null) {
+ if (certDn != null && !certDn.trim().equals("")) {
sharedState.put(CmsAuthUtils.SHARED_STATE_NAME, certDn);
sharedState.put(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN, "");
+ if (log.isDebugEnabled())
+ log.debug("Client certificate " + certDn + " verified by reverse proxy");
}
}
}
import java.util.Map;
import java.util.Set;
-import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
// // TODO locale?
} else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN)) {
- String certificateName = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
- LdapName ldapName;
- try {
- ldapName = new LdapName(certificateName);
- } catch (InvalidNameException e) {
- e.printStackTrace();
- return false;
- }
- username = ldapName.getRdn(ldapName.size() - 1).getValue().toString();
+ String certDn = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
+// LdapName ldapName;
+// try {
+// ldapName = new LdapName(certificateName);
+// } catch (InvalidNameException e) {
+// e.printStackTrace();
+// return false;
+// }
+// username = ldapName.getRdn(ldapName.size() - 1).getValue().toString();
+ username = certDn;
certificateChain = sharedState.get(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN);
password = null;
} else if (singleUser) {