Fixed hostnames binding mismatch (#192)

shibayan · Jun 12, 2020 · 532a478 · 532a478
1 parent bd64915
commit 532a478
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/AppService.Acmebot/RenewCertificatesFunctions.cs b/AppService.Acmebot/RenewCertificatesFunctions.cs
@@ -84,7 +84,9 @@ public async Task RenewSiteCertificates([OrchestrationTrigger] IDurableOrchestra
                     log.LogInformation($"Subject name: {certificate.SubjectName}");
 
                     // IDN に対して証明書を発行すると SANs に Punycode 前の DNS 名が入るので除外
-                    var dnsNames = certificate.HostNames.Where(x => !x.Contains(" (")).ToArray();
+                    var dnsNames = certificate.HostNames
+                                              .Where(x => !x.Contains(" (") && site.HostNames.Contains(x))
+                                              .ToArray();
 
                     // 証明書を発行し Azure にアップロード
                     var newCertificate = await context.CallSubOrchestratorAsync<Certificate>(nameof(SharedFunctions.IssueCertificate), (site, dnsNames));

diff --git a/AppService.Acmebot/SharedFunctions.cs b/AppService.Acmebot/SharedFunctions.cs
@@ -145,7 +145,7 @@ public async Task<IList<Site>> GetSites([ActivityTrigger] object input)
             }
 
             return list.Where(x => x.State == "Running")
-                       .Where(x => x.HostNameSslStates.Any(xs => !xs.Name.EndsWith(".azurewebsites.net") && !xs.Name.EndsWith(".trafficmanager.net")))
+                       .Where(x => x.HostNames.Any(xs => !xs.EndsWith(".azurewebsites.net") && !xs.EndsWith(".trafficmanager.net")))
                        .ToArray();
         }