Adding managed by acmebot certificate list (#404)

* Adding managed by acmebot certificate list * Fixed Dns01Precondition and SANs validation error * Remove renew histories entry
shibayan · Nov 24, 2021 · bba5a40 · bba5a40
1 parent 298822b
commit bba5a40
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 355 deletions.
diff --git a/KeyVault.Acmebot.sln b/KeyVault.Acmebot.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyVault.Acmebot", "KeyVault.Acmebot\KeyVault.Acmebot.csproj", "{81F62D09-D16D-4B0C-9DAE-C075580F5021}"
 EndProject

diff --git a/KeyVault.Acmebot/Functions/RevokeCertificate.cs b/KeyVault.Acmebot/Functions/RevokeCertificate.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 using Azure.WebJobs.Extensions.HttpApi;
 
@@ -47,7 +48,7 @@ public async Task<IActionResult> HttpStart(
 
             log.LogInformation($"Started orchestration with ID = '{instanceId}'.");
 
-            return AcceptedAtFunction(nameof(GetInstanceState) + "_" + nameof(GetInstanceState.HttpStart), new { instanceId }, null);
+            return await starter.WaitForCompletionOrCreateCheckStatusResponseAsync(req, instanceId, TimeSpan.FromMinutes(1), returnInternalServerErrorOnFailure: true);
         }
     }
 }
diff --git a/KeyVault.Acmebot/Functions/SharedActivity.cs b/KeyVault.Acmebot/Functions/SharedActivity.cs
@@ -61,7 +61,7 @@ public async Task<IReadOnlyList<CertificateItem>> GetExpiringCertificates([Activ
 
             await foreach (var certificate in certificates)
             {
-                if (!certificate.TagsFilter(IssuerName, _options.Endpoint))
+                if (!certificate.IsAcmebotManaged(IssuerName, _options.Endpoint))
                 {
                     continue;
                 }
@@ -86,7 +86,11 @@ public async Task<IReadOnlyList<CertificateItem>> GetAllCertificates([ActivityTr
 
             await foreach (var certificate in certificates)
             {
-                result.Add((await _certificateClient.GetCertificateAsync(certificate.Name)).Value.ToCertificateItem());
+                var certificateItem = (await _certificateClient.GetCertificateAsync(certificate.Name)).Value.ToCertificateItem();
+
+                certificateItem.IsManaged = certificate.IsAcmebotManaged(IssuerName, _options.Endpoint);
+
+                result.Add(certificateItem);
             }
 
             return result;
@@ -112,10 +116,12 @@ public async Task<CertificatePolicyItem> GetCertificatePolicy([ActivityTrigger]
         {
             CertificatePolicy certificatePolicy = await _certificateClient.GetCertificatePolicyAsync(certificateName);
 
+            var dnsNames = certificatePolicy.SubjectAlternativeNames.DnsNames.ToArray();
+
             return new CertificatePolicyItem
             {
                 CertificateName = certificateName,
-                DnsNames = certificatePolicy.SubjectAlternativeNames.DnsNames.ToArray(),
+                DnsNames = dnsNames.Length > 0 ? dnsNames : new[] { certificatePolicy.Subject[3..] },
                 KeyType = certificatePolicy.KeyType?.ToString(),
                 KeySize = certificatePolicy.KeySize,
                 KeyCurveName = certificatePolicy.KeyCurveName?.ToString(),

diff --git a/KeyVault.Acmebot/Internal/CertificateExtensions.cs b/KeyVault.Acmebot/Internal/CertificateExtensions.cs
@@ -10,7 +10,7 @@ namespace KeyVault.Acmebot.Internal
 {
     internal static class CertificateExtensions
     {
-        public static bool TagsFilter(this CertificateProperties properties, string issuer, string endpoint)
+        public static bool IsAcmebotManaged(this CertificateProperties properties, string issuer, string endpoint)
         {
             var tags = properties.Tags;
 

diff --git a/KeyVault.Acmebot/Models/CertificateItem.cs b/KeyVault.Acmebot/Models/CertificateItem.cs
@@ -36,5 +36,8 @@ public class CertificateItem
 
         [JsonProperty("reuseKey")]
         public bool? ReuseKey { get; set; }
+
+        [JsonProperty("isManaged")]
+        public bool IsManaged { get; set; }
     }
 }