ThrowOnRenewalFailure field added, skip if renewal fails in foreach - only for webjob

LetsEncrypt-SiteExtension/Models/AuthenticationModel.cs

@@ -46,6 +46,11 @@ public bool UseIPBasedSSL
             get; set;
         }
 
+        public bool ThrowOnRenewalFailure
+        {
+            get; set;
+        }
+
         [Required]
         public string DashboardConnectionString
         {

LetsEncrypt.SiteExtension.Core/AppSettingsAuthConfig.cs

@@ -35,6 +35,7 @@ public class AppSettingsAuthConfig : IAzureWebAppEnvironment, IAcmeConfig
         public const string authorizationChallengeBlobStorageAccount = "letsencrypt:AuthorizationChallengeBlobStorageAccount";
         public const string authorizationChallengeBlobStorageContainer = "letsencrypt:AuthorizationChallengeBlobStorageContainer";
         public const string disableVirtualApplication = "letsencrypt:DisableVirtualApplication";
+        public const string throwOnRenewalFailure = "letsencrypt:ThrowOnRenewalFailure";
         public const string webjobDashboard = "AzureWebJobsDashboard";
         public const string webjobStorage = "AzureWebJobsStorage";
 
@@ -195,6 +196,20 @@ public bool UseIPBasedSSL
             }
         }
 
+        public bool ThrowOnRenewalFailure
+        {
+            get
+            {
+                bool b;
+                if (bool.TryParse(ConfigurationManager.AppSettings[throwOnRenewalFailure], out b))
+                {
+                    return b;
+                }
+
+                return true;
+            }
+        }
+
         public bool DisableWebConfigUpdate
         {
             get

LetsEncrypt.SiteExtension.Core/CertificateManager.cs

@@ -26,10 +26,10 @@ public class CertificateManager
         /// <param name="config"></param>
         public CertificateManager(AppSettingsAuthConfig config)
         {
-
             this.settings = config;
             this.acmeConfig = config;
             string storageAccount = AuthorizationChallengeBlobStorageAccount();
+
             if (string.IsNullOrEmpty(storageAccount))
             {
                 this.challengeProvider = new KuduFileSystemAuthorizationChallengeProvider(this.settings, new AuthorizationChallengeProviderConfig()
@@ -46,7 +46,7 @@ public CertificateManager(AppSettingsAuthConfig config)
                 UseIPBasedSSL = config.UseIPBasedSSL
             });
 
-        } 
+        }
 
         public CertificateManager(IAzureWebAppEnvironment settings, IAcmeConfig acmeConfig, ICertificateService certificateService, IAuthorizationChallengeProvider challengeProvider)
         {
@@ -117,7 +117,10 @@ public async Task<CertificateInstallModel> AddCertificate()
             return null;
         }
 
-        public async Task<List<CertificateInstallModel>> RenewCertificate(bool skipInstallCertificate = false, int renewXNumberOfDaysBeforeExpiration = 0)
+        public async Task<List<CertificateInstallModel>> RenewCertificate(
+            bool skipInstallCertificate = false, 
+            int renewXNumberOfDaysBeforeExpiration = 0,
+            bool throwOnRenewalFailure = true)
         {
             Trace.TraceInformation("Checking certificate");
             var ss = SettingsStore.Instance.Load();
@@ -131,8 +134,6 @@ public async Task<List<CertificateInstallModel>> RenewCertificate(bool skipInsta
                 var response = await retryPolicy.ExecuteAsync(async () =>
                 {
                     return await httpClient.GetAsync($"/subscriptions/{settings.SubscriptionId}/providers/Microsoft.Web/certificates?api-version=2016-03-01");
-
-
                 });
                 response.EnsureSuccessStatusCode();
                 body = await response.Content.ReadAsStringAsync();
@@ -157,7 +158,6 @@ public async Task<List<CertificateInstallModel>> RenewCertificate(bool skipInsta
                     }
                     var target = new AcmeConfig()
                     {
-
                         RegistrationEmail = this.acmeConfig.RegistrationEmail ?? ss.FirstOrDefault(s => s.Name == "email").Value,
                         Host = sslStates.First().Name,
                         BaseUri = this.acmeConfig.BaseUri,
@@ -169,7 +169,16 @@ public async Task<List<CertificateInstallModel>> RenewCertificate(bool skipInsta
                     };
                     if (!skipInstallCertificate)
                     {
-                        res.Add(await RequestAndInstallInternalAsync(target));
+                        try
+                        {
+                            res.Add(await RequestAndInstallInternalAsync(target));
+                        }
+                        catch (Exception e) when (throwOnRenewalFailure)
+                        {
+                            Console.WriteLine($"Error during Request or install certificate {e.ToString()}");
+                            Trace.TraceError($"Error during Request or install certificate {e.ToString()}");
+                            throw;
+                        }
                     }
                 }
                 return res;
@@ -178,7 +187,7 @@ public async Task<List<CertificateInstallModel>> RenewCertificate(bool skipInsta
 
         internal static IEnumerable<Certificate> ExtractCertificates(string body)
         {
-            
+
             var json = JToken.Parse(body);
             var certs = Enumerable.Empty<Certificate>();
             // Handle issue #269
@@ -196,7 +205,7 @@ internal static IEnumerable<Certificate> ExtractCertificates(string body)
 
         internal CertificateInstallModel RequestAndInstallInternal(IAcmeConfig config)
         {
-           return RequestAndInstallInternalAsync(config).GetAwaiter().GetResult();
+            return RequestAndInstallInternalAsync(config).GetAwaiter().GetResult();
         }
 
         internal async Task<CertificateInstallModel> RequestInternalAsync(IAcmeConfig config)

LetsEncrypt.SiteExtension.Core/IAzureEnvironment.cs

@@ -20,9 +20,9 @@ public interface IAzureEnvironment
     }
 
     public interface IAzureWebAppEnvironment : IAzureEnvironment
-    {
-
+    {       
         string WebAppName { get; }
+
         string ResourceGroupName { get; }
 
         string ServicePlanResourceGroupName { get; }
@@ -31,6 +31,8 @@ public interface IAzureWebAppEnvironment : IAzureEnvironment
 
         string AzureWebSitesDefaultDomainName { get; }
 
+        bool ThrowOnRenewalFailure { get; }
+
         string WebRootPath { get; }
 
         bool RunFromPackage { get; }
@@ -212,5 +214,10 @@ public bool RunFromPackage
         {
             get;set;
         }
+
+        public bool ThrowOnRenewalFailure
+        {
+            get; set;
+        } = true;
     }
 }

LetsEncrypt.SiteExtension.WebJob/Functions.cs

@@ -65,8 +65,11 @@ public static async Task RenewCertificate([TimerTrigger(typeof(MyDailySchedule),
         {
             Console.WriteLine("Renew certificate");
             var config = new AppSettingsAuthConfig();
-            var count = (await new CertificateManager(new AppSettingsAuthConfig()).RenewCertificate(renewXNumberOfDaysBeforeExpiration: config.RenewXNumberOfDaysBeforeExpiration)).Count();
-            Console.WriteLine($"Completed renewal of '{count}' certificates");
+            var certManager = new CertificateManager(new AppSettingsAuthConfig());
+
+            var renewedCerts = await certManager.RenewCertificate(renewXNumberOfDaysBeforeExpiration: config.RenewXNumberOfDaysBeforeExpiration, throwOnRenewalFailure: config.ThrowOnRenewalFailure);
+
+            Console.WriteLine($"Completed renewal of '{renewedCerts.Count()}' certificates");
         }   
 
         public static async Task Cleanup([TimerTrigger(typeof(MyDailySchedule), RunOnStartup = true)] TimerInfo timerInfo)