Support using subdomains with cloudflare integration (#26)

* Support using subdomains with cloudflare integration * Convert library to netstandard 2.1 and only run tests in .netcore 3.0
Kencdk · Sep 5, 2020 · 91580e6 · 91580e6
1 parent c04d78e
commit 91580e6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/Examples/CloudflareIntegration/OrderDomains.cs b/src/Examples/CloudflareIntegration/OrderDomains.cs
@@ -68,7 +68,7 @@ public OrderDomains(Options options)
 
         public async Task ValidateCloudflareConnection()
         {
-            var cleanedupDomains = options.Domains.Select(x => (x.StartsWith('*') ? x.Substring(2) : x).ToLowerInvariant())
+            var cleanedupDomains = options.Domains.Select(GetRootDomain)
                 .Distinct()
                 .ToList();
 
@@ -262,6 +262,17 @@ public async Task RetrieveCertificates(Order order)
             Program.LogLine($"Private certificate written to file {privateKeyFilename}");
         }
 
+        /// <summary>
+        /// Get the root (domain.tld) from a given domain (eg: subdomain.domain.tld)
+        /// </summary>
+        /// <param name="domain">Target domain</param>
+        /// <returns>A string with the root domain incl the top-level-domain</returns>
+        private static string GetRootDomain(string domain)
+        {
+            var parts = domain.ToLowerInvariant().Split('.');
+            return string.Join('.', parts.TakeLast(2));
+        }
+
         private static string FixFilename(string filename)
         {
             return filename.Replace("*", "");
@@ -301,7 +312,7 @@ private async Task<string> AddDNSEntry(string domain, string value)
             var dnsRecordName = $"_acme-challenge.{domain}";
 
             Program.LogLine($"Adding TXT entry {dnsRecordName} with value {value}", true);
-            Zone cloudflareZone = CloudflareZones.GetValueOrDefault(domain);
+            Zone cloudflareZone = CloudflareZones.GetValueOrDefault(GetRootDomain(domain));
 
             DNSRecord dnsRecord;
             try

diff --git a/src/Examples/CloudflareIntegration/Program.cs b/src/Examples/CloudflareIntegration/Program.cs
@@ -5,6 +5,7 @@
     using System.IO;
     using System.Threading.Tasks;
     using CommandLine;
+    using Kenc.ACMELib.ACMEEntities;
 
     class Program
     {
@@ -35,10 +36,10 @@ static async Task RunOptions(Options options)
             var orderDomains = new OrderDomains(options);
             await orderDomains.ValidateCloudflareConnection();
             await orderDomains.ValidateACMEConnection();
-            var order = await orderDomains.ValidateDomains();
+
+            Order order = await orderDomains.ValidateDomains();
             order = await orderDomains.ValidateOrder(order);
             await orderDomains.RetrieveCertificates(order);
-
         }
 
         static void HandleParseError(IEnumerable<Error> errs)

diff --git a/src/Libraries/ACMELib.Tests/Kenc.ACMELibCore.Tests.csproj b/src/Libraries/ACMELib.Tests/Kenc.ACMELibCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <LangVersion>8.0</LangVersion>

diff --git a/src/Libraries/ACMELib/Kenc.ACMELib.csproj b/src/Libraries/ACMELib/Kenc.ACMELib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <LangVersion>8.0</LangVersion>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>  
   <PropertyGroup>
     <Description>.net core library for communicating with Let’s Encrypt ACME servers for certificate management.</Description>