Merge branch 'PKCE' into develop

JoeShook · Sep 19, 2024 · 1712efe · 1712efe
2 parents 9ed126a + d87e6c5
commit 1712efe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Udap.Util/Extensions/X509Extensions.cs b/Udap.Util/Extensions/X509Extensions.cs
@@ -291,9 +291,15 @@ private static Asn1Object GetObject(byte[] ext)
 
     public static List<Tuple<string, string>> GetSubjectAltNames(this X509Certificate2 cert, Func<GeneralName, bool>? sanFilter = null)
     {
+        var names = new List<Tuple<string, string>>();
         var extension = cert.GetExtensionValue("2.5.29.17");
+
+        if (extension == null)
+        {
+            return names;
+        }
+
         var generalNames = GeneralNames.GetInstance(extension);
-        var names = new List<Tuple<string, string>>();
 
         foreach (var name in generalNames.GetNames().Where(sanFilter ?? (n => true)))
         {

diff --git a/_tests/Udap.Common.Tests/Util/X509ExtensionTests.cs b/_tests/Udap.Common.Tests/Util/X509ExtensionTests.cs
@@ -35,4 +35,13 @@ public void KeyUsageTest()
 
         extensions.Single().KeyUsages.ToKeyUsageToString().Should().ContainInOrder("CrlSign", "KeyCertSign");
     }
+
+    [Fact]
+    public void GetSubjectAltNames()
+    {
+        var certificate = new X509Certificate2($"{CertStore}/SurefhirCertificationLabs_Community/issued/FhirLabsAdminCertification.cer");
+
+        var subjectAltNames = certificate.GetSubjectAltNames();
+        subjectAltNames.Should().BeEmpty();
+    }
 }