Move logic to function implemented from OpenDistroSecurityKeyStore

jksmth · jksmth · commit 40da1f7bd65e · 2021-04-12T23:46:01.000Z
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/DefaultOpenDistroSecurityKeyStore.java b/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/DefaultOpenDistroSecurityKeyStore.java
@@ -582,28 +582,7 @@ private boolean hasValidDNs(final X509Certificate[] currentX509Certs, final X509
         final Function<? super X509Certificate, String> formatDNString = cert -> {
             final String issuerDn = cert !=null && cert.getIssuerX500Principal() != null ? cert.getIssuerX500Principal().getName() : "";
             final String subjectDn = cert !=null && cert.getSubjectX500Principal() != null ? cert.getSubjectX500Principal().getName() : "";
-            String san = "";
-            try {
-                Collection<List<?>> altNames = cert !=null && cert.getSubjectAlternativeNames() != null ? cert.getSubjectAlternativeNames() : null;
-                if (altNames != null) {
-                    Collection<List<?>> sans = new ArrayList<>();
-                    for (List<?> altName : altNames) {
-                        Integer type = (Integer) altName.get(0);
-                        // otherName requires parsing to string
-                        if (type == 0) {
-                            List<?> otherName = getOtherName(altName);
-                            if (otherName != null) {
-                                sans.add(Arrays.asList(type, otherName));
-                            }
-                        } else {
-                            sans.add(altName);
-                        }
-                    }
-                    san = sans.toString();
-                }
-            } catch (CertificateParsingException e) {
-                log.error("Issue parsing SubjectAlternativeName:", e);
-            }
+            final String san = getSubjectAlternativeNames(cert);
             return String.format("%s/%s/%s", issuerDn, subjectDn, san);
         };
 
@@ -977,6 +956,34 @@ private static void checkPath(String keystoreFilePath, String fileNameLogOnly) {
         }
     }
 
+    @Override
+    public String getSubjectAlternativeNames(X509Certificate cert) {
+        String san = "";
+        try {
+            Collection<List<?>> altNames = cert !=null && cert.getSubjectAlternativeNames() != null ? cert.getSubjectAlternativeNames() : null;
+            if (altNames != null) {
+                Collection<List<?>> sans = new ArrayList<>();
+                for (List<?> altName : altNames) {
+                    Integer type = (Integer) altName.get(0);
+                    // otherName requires parsing to string
+                    if (type == 0) {
+                        List<?> otherName = getOtherName(altName);
+                        if (otherName != null) {
+                            sans.add(Arrays.asList(type, otherName));
+                        }
+                    } else {
+                        sans.add(altName);
+                    }
+                }
+                san = sans.toString();
+            }
+        } catch (CertificateParsingException e) {
+            log.error("Issue parsing SubjectAlternativeName:", e);
+        }
+
+        return san;
+    }
+
     private List<String> getOtherName(List<?> altName) {
         ASN1Primitive oct =  null;
         try {
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/ExternalOpenDistroSecurityKeyStore.java b/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/ExternalOpenDistroSecurityKeyStore.java
@@ -127,6 +127,12 @@ public X509Certificate[] getHttpCerts() {
         return null;
     }
 
+    @Override
+    public String getSubjectAlternativeNames(X509Certificate cert) {
+        // NO-OP: since this class uses externalSslContext there is no cert
+        return null;
+    }
+
     public static void registerExternalSslContext(String id, SSLContext externalSsslContext) {
         contextMap.put(Objects.requireNonNull(id), Objects.requireNonNull(externalSsslContext));
     }
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/OpenDistroSecurityKeyStore.java b/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/OpenDistroSecurityKeyStore.java
@@ -32,6 +32,7 @@ public interface OpenDistroSecurityKeyStore {
     public String getHTTPProviderName();
     public String getTransportServerProviderName();
     public String getTransportClientProviderName();
+    public String getSubjectAlternativeNames(X509Certificate cert); 
 
     public void initHttpSSLConfig();
     public void initTransportSSLConfig();
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/rest/OpenDistroSecuritySSLCertsInfoAction.java b/src/main/java/com/amazon/opendistroforelasticsearch/security/ssl/rest/OpenDistroSecuritySSLCertsInfoAction.java
@@ -168,12 +168,7 @@ private List<Map<String, String>> generateCertDetailList(final X509Certificate[]
                         final String issuerDn = cert != null && cert.getIssuerX500Principal() != null ? cert.getIssuerX500Principal().getName(): "";
                         final String subjectDn = cert != null && cert.getSubjectX500Principal() != null ? cert.getSubjectX500Principal().getName(): "";
 
-                        String san = "";
-                        try {
-                            san = cert !=null && cert.getSubjectAlternativeNames() != null ? cert.getSubjectAlternativeNames().toString() : "";
-                        } catch (CertificateParsingException e) {
-                            log.error("Issue parsing SubjectAlternativeName:", e);
-                        }
+                        final String san = odsks.getSubjectAlternativeNames(cert);
 
                         final String notBefore = cert != null && cert.getNotBefore() != null ? cert.getNotBefore().toInstant().toString(): "";
                         final String notAfter = cert != null && cert.getNotAfter() != null ? cert.getNotAfter().toInstant().toString(): "";

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,12 @@ public X509Certificate[] getHttpCerts() {`
`127`	`127`	`return null;`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ @Override`
	`131`	`+ public String getSubjectAlternativeNames(X509Certificate cert) {`
	`132`	`+ // NO-OP: since this class uses externalSslContext there is no cert`
	`133`	`+ return null;`
	`134`	`+ }`
	`135`	`+`
`130`	`136`	`public static void registerExternalSslContext(String id, SSLContext externalSsslContext) {`
`131`	`137`	`contextMap.put(Objects.requireNonNull(id), Objects.requireNonNull(externalSsslContext));`
`132`	`138`	`}`