community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1108 from madawas/master

Browse Source 
This commit fixes the unable to parse the DN issue
This commit is contained in:
inoshperera 2017-11-13 09:22:34 +05:30 committed by GitHub
commit 04f6ca51b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
View File

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