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 branch 'master' into 'master'

Browse Source 
Fix CN extraction issue

See merge request entgra/carbon-device-mgt!199
This commit is contained in:
Charitha Goonetilleke 2019-08-15 12:56:53 +00:00
commit a1330daf24
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,9 +324,14 @@ public class CertificateGenerator {
KeyStoreReader keyStoreReader = new KeyStoreReader(); KeyStoreReader keyStoreReader = new KeyStoreReader();
if (distinguishedName != null && !distinguishedName.isEmpty()) { if (distinguishedName != null && !distinguishedName.isEmpty()) {
if (distinguishedName.contains("/CN=")) { if (distinguishedName.contains("/CN=")) {
String[] dnSplits = distinguishedName.split("/CN="); String[] dnSplits = distinguishedName.split("/");
String commonNameExtracted = dnSplits[dnSplits.length - 1]; for (String dnPart : dnSplits) {
lookUpCertificate = keyStoreReader.getCertificateBySerial(commonNameExtracted); if (dnPart.contains("CN=")) {
String commonNameExtracted = dnPart.replace("CN=", "");
lookUpCertificate = keyStoreReader.getCertificateBySerial(commonNameExtracted);
break;
}
}
} else { } else {
LdapName ldapName; LdapName ldapName;
try { try {
@ -711,4 +716,4 @@ public class CertificateGenerator {
return generateCertificateFromCSR(privateKeyCA, certificationRequest, return generateCertificateFromCSR(privateKeyCA, certificationRequest,
certCA.getIssuerX500Principal().getName()); certCA.getIssuerX500Principal().getName());
} }
} }