Check the development certificate’s valid dates

NCarlsonMSFT · Dec 6, 2022 · 49d04ad · 49d04ad
1 parent 82daf67
commit 49d04ad
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs b/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs
@@ -432,7 +432,7 @@ private void LoadDefaultCert()
             {
                 var certificate = new X509Certificate2(certificatePath, certificateConfig.Password);
 
-                if (IsDevelopmentCertificate(certificate))
+                if (IsValidDevelopmentCertificate(certificate))
                 {
                     return (certificate, certificateConfig);
                 }
@@ -450,13 +450,20 @@ private void LoadDefaultCert()
         return (null, null);
     }
 
-    private static bool IsDevelopmentCertificate(X509Certificate2 certificate)
+    private static bool IsValidDevelopmentCertificate(X509Certificate2 certificate)
     {
         if (!string.Equals(certificate.Subject, "CN=localhost", StringComparison.Ordinal))
         {
             return false;
         }
 
+        DateTimeOffset currentDate = DateTimeOffset.Now;
+        if (certificate.NotBefore > currentDate ||
+            currentDate > certificate.NotAfter)
+        {
+            return false;
+        }
+
         foreach (var ext in certificate.Extensions)
         {
             if (string.Equals(ext.Oid?.Value, CertificateManager.AspNetHttpsOid, StringComparison.Ordinal))