import java.io.IOException;
import java.security.PrivilegedAction;
-import java.security.cert.X509Certificate;
import java.time.Instant;
import java.util.Arrays;
import java.util.HashSet;
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;
UserAdmin userAdmin = Activator.getUserAdmin();
final String username;
final char[] password;
- X509Certificate[] certificateChain = null;
+ Object certificateChain = null;
if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_PWD)) {
// NB: required by Basic http auth
// // TODO locale?
} else if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
&& sharedState.containsKey(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN)) {
- // NB: required by Basic http auth
- username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
- certificateChain = (X509Certificate[]) sharedState.get(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();
+ certificateChain = sharedState.get(CmsAuthUtils.SHARED_STATE_CERTIFICATE_CHAIN);
password = null;
} else if (singleUser) {
username = OsUserUtils.getOsUsername();