Fix bug: Failed to get cert name when key vault name include "certificates" (#42522)

Author: rujche

sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md

@@ -7,7 +7,8 @@
 ### Breaking Changes
 
 ### Bugs Fixed
-- Fixed bug about intermediate certificate not loaded. [#39715](https://github.com/Azure/azure-sdk-for-java/issues/39715).
+- Fixed bug: Intermediate certificate not loaded. [#39715](https://github.com/Azure/azure-sdk-for-java/issues/39715).
+- Fixed bug: Failed to get cert name when key vault name include "certificates". [#42162](https://github.com/Azure/azure-sdk-for-java/issues/42162).
 
 ### Other Changes
 

sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/KeyVaultClient.java

@@ -43,6 +43,7 @@
 import java.util.logging.Logger;
 
 import static com.azure.security.keyvault.jca.implementation.utils.AccessTokenUtil.getLoginUri;
+import static com.azure.security.keyvault.jca.implementation.utils.CertificateUtil.getCertificateNameFromCertificateItemId;
 import static com.azure.security.keyvault.jca.implementation.utils.CertificateUtil.loadCertificatesFromSecretBundleValue;
 import static com.azure.security.keyvault.jca.implementation.utils.HttpUtil.API_VERSION_POSTFIX;
 import static com.azure.security.keyvault.jca.implementation.utils.HttpUtil.HTTPS_PREFIX;
@@ -235,11 +236,9 @@ public List<String> getAliases() {
 
             if (certificateListResult != null) {
                 uri = certificateListResult.getNextLink();
-
                 for (CertificateItem certificateItem : certificateListResult.getValue()) {
                     String id = certificateItem.getId();
-                    String alias = id.substring(id.indexOf("certificates") + "certificates".length() + 1);
-
+                    String alias = getCertificateNameFromCertificateItemId(id);
                     result.add(alias);
                 }
             } else {

sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/implementation/utils/CertificateUtil.java

@@ -104,4 +104,13 @@ public static Certificate[] loadX509CertificatesFromFile(InputStream inputStream
             .collect(Collectors.toList())
             .toArray(new Certificate[0]);
     }
+
+    public static String getCertificateNameFromCertificateItemId(String id) {
+        // Example id: https://mycertificates.vault.azure.net/certificates/mycert
+        // Here, vault name is mycertificates.
+        // Vault name must be a 3-24 character string, containing only 0-9, a-z, A-Z, and not consecutive -.
+        String keyWord = "/certificates/";
+        return id.substring(id.indexOf(keyWord) + keyWord.length());
+    }
+
 }

sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/CertificateUtilTest.java

@@ -18,6 +18,7 @@
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 
+import static com.azure.security.keyvault.jca.implementation.utils.CertificateUtil.getCertificateNameFromCertificateItemId;
 import static com.azure.security.keyvault.jca.implementation.utils.CertificateUtil.loadX509CertificateFromFile;
 import static com.azure.security.keyvault.jca.implementation.utils.CertificateUtil.loadX509CertificatesFromFile;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -79,4 +80,11 @@ private void assertCertificateNumberInInFile(String file, int expectedCertificat
         Certificate[] certificates = loadX509CertificatesFromFile(inputStream);
         assertEquals(expectedCertificateNumber, certificates.length);
     }
+
+    @Test
+    public void getCertificateNameFromCertificateItemIdTest() {
+        assertEquals("mycert", getCertificateNameFromCertificateItemId("https://test.vault.azure.net/certificates/mycert"));
+        assertEquals("mycert", getCertificateNameFromCertificateItemId("https://test-certificates.vault.azure.net/certificates/mycert"));
+        assertEquals("mycert", getCertificateNameFromCertificateItemId("https://mycertificates.vault.azure.net/certificates/mycert"));
+    }
 }