#782 use 825 valid days to accomodate iOS 13

Author: justcoding121

src/Titanium.Web.Proxy/Certificates/BCCertificateMaker.cs

@@ -26,7 +26,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
     /// </summary>
     internal class BCCertificateMaker : ICertificateMaker
     {
-        private const int certificateValidDays = 1825;
+        private readonly int certificateValidDays;
         private const int certificateGraceDays = 366;
 
         // The FriendlyName value cannot be set on Unix.
@@ -35,9 +35,10 @@ internal class BCCertificateMaker : ICertificateMaker
 
         private readonly ExceptionHandler exceptionFunc;
 
-        internal BCCertificateMaker(ExceptionHandler exceptionFunc)
+        internal BCCertificateMaker(ExceptionHandler exceptionFunc, int certificateValidDays)
         {
-            this.exceptionFunc = exceptionFunc;
+            this.certificateValidDays = certificateValidDays;
+            this.exceptionFunc = exceptionFunc;  
         }
 
         /// <summary>

src/Titanium.Web.Proxy/Certificates/BCCertificateMakerFast.cs

@@ -26,7 +26,7 @@ namespace Titanium.Web.Proxy.Network.Certificate
     /// </summary>
     internal class BCCertificateMakerFast : ICertificateMaker
     {
-        private const int certificateValidDays = 1825;
+        private int certificateValidDays;
         private const int certificateGraceDays = 366;
 
         // The FriendlyName value cannot be set on Unix.
@@ -37,8 +37,9 @@ internal class BCCertificateMakerFast : ICertificateMaker
 
         public AsymmetricCipherKeyPair KeyPair { get; set; }
 
-        internal BCCertificateMakerFast(ExceptionHandler exceptionFunc)
+        internal BCCertificateMakerFast(ExceptionHandler exceptionFunc, int certificateValidDays)
         {
+            this.certificateValidDays = certificateValidDays;
             this.exceptionFunc = exceptionFunc;
             KeyPair = GenerateKeyPair();
         }

src/Titanium.Web.Proxy/Certificates/CertificateManager.cs

@@ -73,14 +73,14 @@ private ICertificateMaker certEngine
                     switch (engine)
                     {
                         case CertificateEngine.BouncyCastle:
-                            certEngineValue = new BCCertificateMaker(ExceptionFunc);
+                            certEngineValue = new BCCertificateMaker(ExceptionFunc, CertificateValidDays);
                             break;
                         case CertificateEngine.BouncyCastleFast:
-                            certEngineValue = new BCCertificateMakerFast(ExceptionFunc);
+                            certEngineValue = new BCCertificateMakerFast(ExceptionFunc, CertificateValidDays);
                             break;
                         case CertificateEngine.DefaultWindows:
                         default:
-                            certEngineValue = new WinCertificateMaker(ExceptionFunc);
+                            certEngineValue = new WinCertificateMaker(ExceptionFunc, CertificateValidDays);
                             break;
                     }
                 }
@@ -204,6 +204,12 @@ public CertificateEngine CertificateEngine
         /// </summary>
         public string PfxFilePath { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Number of Days generated HTTPS certificates are valid for.
+        /// Maximum allowed on iOS 13 is 825 days and it is the default.
+        /// </summary>
+        public int CertificateValidDays { get; set; } = 825;
+
         /// <summary>
         ///     Name of the root certificate issuer.
         ///     (This is valid only when RootCertificate property is not set.)

src/Titanium.Web.Proxy/Certificates/WinCertificateMaker.cs

@@ -13,6 +13,9 @@ namespace Titanium.Web.Proxy.Network.Certificate
     /// </summary>
     internal class WinCertificateMaker : ICertificateMaker
     {
+        // Validity Days for Root Certificates Generated.
+        private int certificateValidDays;
+
         private readonly ExceptionHandler exceptionFunc;
 
         private readonly string sProviderName = "Microsoft Enhanced Cryptographic Provider v1.0";
@@ -49,8 +52,9 @@ internal class WinCertificateMaker : ICertificateMaker
         /// <summary>
         ///     Constructor.
         /// </summary>
-        internal WinCertificateMaker(ExceptionHandler exceptionFunc)
+        internal WinCertificateMaker(ExceptionHandler exceptionFunc, int certificateValidDays)
         {
+            this.certificateValidDays = certificateValidDays;
             this.exceptionFunc = exceptionFunc;
 
             typeX500DN = Type.GetTypeFromProgID("X509Enrollment.CX500DistinguishedName", true);
@@ -99,16 +103,13 @@ private X509Certificate2 makeCertificate(string sSubjectCN,
             // Grace Days
             const int graceDays = -366;
 
-            // ValiDays
-            const int validDays = 1825;
-
             // KeyLength
             const int keyLength = 2048;
 
             var now = DateTime.UtcNow;
             var graceTime = now.AddDays(graceDays);
             var certificate = makeCertificate(sSubjectCN, fullSubject, keyLength, hashAlgo, graceTime,
-                now.AddDays(validDays), signingCertificate);
+                now.AddDays(certificateValidDays), signingCertificate);
             return certificate;
         }
 

src/Titanium.Web.Proxy/Helpers/RunTime.cs

@@ -88,7 +88,7 @@ private static bool isSocketReuseAvailable()
                 }
 
                 // get the currently running framework name and version (EX: .NETFramework,Version=v4.5.1) (Ex: .NETCoreApp,Version=v2.0)
-                string ver = Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName;
+                string? ver = Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName;
 
                 if (ver == null)
                     return false; // play it safe if we can not figure out what the framework is