allow checking for multiple issuers.

thomas-hammond · Jun 16, 2022 · 3bf02ad · 3bf02ad
1 parent 83d04d7
commit 3bf02ad
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Microsoft.ServiceFabric.Client/ServerCertificateValidator.cs b/src/Microsoft.ServiceFabric.Client/ServerCertificateValidator.cs
@@ -155,11 +155,11 @@ private bool ValidateServerCertificateX509Name(X509Certificate2 cert, X509Chain
 
         private bool IsServerCertIssuerThumbprintValid(X509Chain chain, string expectedIssuerThumbprint)
         {
+                var issuers = expectedIssuerThumbprint.ToLower().Split(',');
                 // SelfSigned cert matches with index 0, CA signed matches with index 1.
-                var thumbprint = chain.ChainElements[0].Certificate.Thumbprint;
+                var thumbprint = chain.ChainElements[0].Certificate.Thumbprint.ToLower();
 
-                if (thumbprint != null &&
-                    thumbprint.Equals(expectedIssuerThumbprint, StringComparison.OrdinalIgnoreCase))
+                if (thumbprint != null && issuers.Contains(thumbprint))
                 {
                     return true;
                 }
@@ -170,10 +170,9 @@ private bool IsServerCertIssuerThumbprintValid(X509Chain chain, string expectedI
                     return false;
                 }
 
-                thumbprint = chain.ChainElements[1].Certificate.Thumbprint;
+                thumbprint = chain.ChainElements[1].Certificate.Thumbprint.ToLower();
 
-                return thumbprint != null &&
-                       thumbprint.Equals(expectedIssuerThumbprint, StringComparison.OrdinalIgnoreCase);
+                return thumbprint != null && issuers.Contains(thumbprint);
         }
 
         /// <summary>