If SN and/or G are missing in the Subject, then set to "Unknown"

microsoft · Jul 7, 2024 · c535290 · c535290
1 parent 02fa0f6
commit c535290
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/WebApps/CNS.Auth.Web/Services/CNSCertificateService.cs b/WebApps/CNS.Auth.Web/Services/CNSCertificateService.cs
@@ -55,8 +55,26 @@ public Task<ClaimsPrincipal> GetClaimsPrincipal(X509Certificate2 cert, Cancellat
 			Claim commonName = new Claim("commonName", CN);
 			var subjectRawData = cert.SubjectName.RawData;
 
-			var SN = new AsnEncodedData("SN", subjectRawData).Format(false);
-			var G = new AsnEncodedData("G", subjectRawData).Format(false);
+			string SN, G;
+
+			if (!cert.Subject.Contains("SN="))
+			{
+				SN = "Unknown";
+			}
+			else
+			{
+				SN = new AsnEncodedData("SN", subjectRawData).Format(false);
+			}
+
+			if (!cert.Subject.Contains("G="))
+			{
+				G = "Unknown";
+			}
+			else
+			{
+				G = new AsnEncodedData("G", subjectRawData).Format(false);
+			}
+
 			var OU = new AsnEncodedData("OU", subjectRawData).Format(false);
 			var O = new AsnEncodedData("O", subjectRawData).Format(false);
 			var C = new AsnEncodedData("C", subjectRawData).Format(false);