Merge pull request #1108 from madawas/master

This commit fixes the unable to parse the DN issue
revert-70aa11f8
inoshperera 7 years ago committed by GitHub
commit 04f6ca51b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -323,22 +323,28 @@ public class CertificateGenerator {
CertificateResponse lookUpCertificate = null;
KeyStoreReader keyStoreReader = new KeyStoreReader();
if (distinguishedName != null && !distinguishedName.isEmpty()) {
if (distinguishedName.contains("/CN=")) {
String[] dnSplits = distinguishedName.split("/CN=");
String commonNameExtracted = dnSplits[dnSplits.length - 1];
lookUpCertificate = keyStoreReader.getCertificateBySerial(commonNameExtracted);
} else {
LdapName ldapName;
try {
ldapName = new LdapName(distinguishedName);
} catch (InvalidNameException e) {
throw new KeystoreException(
"Invalid name exception while trying to create a LDAP name using the distinguished name ", e);
"Invalid name exception while trying to create a LDAP name using the distinguished name ",
e);
}
for (Rdn relativeDistinuguishedNames : ldapName.getRdns()) {
if (relativeDistinuguishedNames.getType().equalsIgnoreCase("CN")) {
System.err.println("CN is: " + relativeDistinuguishedNames.getValue());
for (Rdn relativeDistinguishedNames : ldapName.getRdns()) {
if (relativeDistinguishedNames.getType().equalsIgnoreCase("CN")) {
lookUpCertificate = keyStoreReader
.getCertificateBySerial(String.valueOf(relativeDistinuguishedNames.getValue()));
.getCertificateBySerial(String.valueOf(relativeDistinguishedNames.getValue()));
break;
}
}
}
}
return lookUpCertificate;
}

Loading…
Cancel
Save