Merge pull request #69 from shibayan/feature/replace-certificate

Adding certificate replacement
shibayan · Apr 5, 2019 · c5c52e8 · c5c52e8
2 parents fdca25d + 56996c2
commit c5c52e8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/AzureAppService.LetsEncrypt/GetSitesInformation.cs b/AzureAppService.LetsEncrypt/GetSitesInformation.cs
@@ -23,6 +23,7 @@ public static async Task<IList<ResourceGroupInformation>> RunOrchestrator([Orche
         {
             // App Service を取得
             var sites = await context.CallActivityAsync<IList<Site>>(nameof(SharedFunctions.GetSites), null);
+            var certificates = await context.CallActivityAsync<IList<Certificate>>(nameof(SharedFunctions.GetAllCertificates), null);
 
             var result = new List<ResourceGroupInformation>();
 
@@ -46,13 +47,17 @@ public static async Task<IList<ResourceGroupInformation>> RunOrchestrator([Orche
                     {
                         var (_, slotName) = slot.SplitName();
 
+                        var hostNameSslStates = slot.HostNameSslStates
+                                                    .Where(x => !x.Name.EndsWith(".azurewebsites.net"));
+
                         var slotInformation = new SlotInformation
                         {
                             Name = slotName ?? "production",
-                            Domains = slot.HostNameSslStates
-                                          .Where(x => x.SslState == SslState.Disabled && !x.Name.EndsWith(".azurewebsites.net"))
-                                          .Select(x => x.Name)
-                                          .ToArray()
+                            Domains = hostNameSslStates.Select(x => new DomainInformation
+                            {
+                                Name = x.Name,
+                                Issuer = certificates.FirstOrDefault(xs => xs.Thumbprint == x.Thumbprint)?.Issuer ?? "None"
+                            }).ToArray()
                         };
 
                         if (slotInformation.Domains.Count != 0)
@@ -120,6 +125,15 @@ public class SlotInformation
         public string Name { get; set; }
 
         [JsonProperty("domains")]
-        public IList<string> Domains { get; set; }
+        public IList<DomainInformation> Domains { get; set; }
+    }
+
+    public class DomainInformation
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("issuer")]
+        public string Issuer { get; set; }
     }
 }
diff --git a/AzureAppService.LetsEncrypt/SharedFunctions.cs b/AzureAppService.LetsEncrypt/SharedFunctions.cs
@@ -88,6 +88,18 @@ public static async Task<IList<Certificate>> GetCertificates([ActivityTrigger] D
                    .Where(x => (x.ExpirationDate.Value - currentDateTime).TotalDays < 30).ToArray();
         }
 
+        [FunctionName(nameof(GetAllCertificates))]
+        public static async Task<IList<Certificate>> GetAllCertificates([ActivityTrigger] DurableActivityContext context, ILogger log)
+        {
+            var websiteClient = await CreateWebSiteManagementClientAsync();
+
+            // TODO: https://github.com/Azure/azure-rest-api-specs/issues/3526
+            //var certificates = await websiteClient.Certificates.ListAsync();
+            var certificates = await websiteClient.ListCertificatesAsync();
+
+            return certificates.ToArray();
+        }
+
         [FunctionName(nameof(Order))]
         public static async Task<OrderDetails> Order([ActivityTrigger] DurableActivityContext context, ILogger log)
         {

diff --git a/AzureAppService.LetsEncrypt/proxies.json b/AzureAppService.LetsEncrypt/proxies.json
@@ -5,7 +5,7 @@
       "matchCondition": {
         "route": "add-certificate"
       },
-      "backendUri": "https://shibayan.blob.core.windows.net/azure-appservice-letsencrypt/index.html"
+      "backendUri": "https://shibayan.blob.core.windows.net/azure-appservice-letsencrypt/index.v2.html"
     }
   }
 }