Merge pull request #12134 from BLasan/fix-mtls-cert-character-issue

Fix: Reserved character Issue in Certs #12134
wso2 · Aug 1, 2024 · d0a2629 · d0a2629
2 parents de3b00c + d1c972f
commit d0a2629
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...rbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/CertificateMgtUtils.java b/...rbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/CertificateMgtUtils.java
@@ -620,8 +620,10 @@ public String getUniqueIdentifierOfCertificate(String certificate) {
             while (serverCert.available() > 0) {
                 Certificate generatedCertificate = cf.generateCertificate(serverCert);
                 X509Certificate x509Certificate = (X509Certificate) generatedCertificate;
-                uniqueIdentifier = x509Certificate.getSerialNumber() + "_" + x509Certificate.getSubjectDN();
-                uniqueIdentifier = uniqueIdentifier.replaceAll(",", "#").replaceAll("\"", "'");
+                uniqueIdentifier = x509Certificate.getSerialNumber() + "_" + x509Certificate.getIssuerDN();
+                uniqueIdentifier = uniqueIdentifier.replaceAll(",", "#").replaceAll("\"", "'")
+                        .replaceAll("&(?!amp;)", "&amp;")
+                        .replaceAll("<", "&lt;").replaceAll(">", "&gt;");
             }
         } catch (CertificateException e) {
             log.error("Error while getting serial number of the certificate.", e);