More work on zone mutation logic.

alanedwardes · Feb 13, 2024 · 386690b · 386690b
1 parent 86e45b8
commit 386690b
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 12 deletions.
diff --git a/src/Ae.Dns.Client/DnsZoneUpdateClient.cs b/src/Ae.Dns.Client/DnsZoneUpdateClient.cs
@@ -47,8 +47,15 @@ public async Task<DnsMessage> Query(DnsMessage query, CancellationToken token =
             var hostnames = query.Nameservers.Select(x => x.Host.ToString()).ToArray();
             var addresses = query.Nameservers.Select(x => x.Resource).OfType<DnsIpAddressResource>().Select(x => x.IPAddress).ToArray();
 
-            void ChangeRecords(ICollection<DnsResourceRecord> records)
+            DnsResponseCode ChangeRecords(ICollection<DnsResourceRecord> records)
             {
+                var preRequisitesResponseCode = _dnsZone.TestZoneUpdatePreRequisites(query);
+                if (preRequisitesResponseCode != DnsResponseCode.NoError)
+                {
+                    _logger.LogWarning("Pre-requisites check resulted in {ResponseCode} for {Update}", preRequisitesResponseCode, query);
+                    return preRequisitesResponseCode;
+                }
+
                 foreach (var recordToRemove in records.Where(x => hostnames.Contains(x.Host.ToString())).ToArray())
                 {
                     records.Remove(recordToRemove);
@@ -63,12 +70,14 @@ void ChangeRecords(ICollection<DnsResourceRecord> records)
                 {
                     records.Add(nameserver);
                 }
+
+                return DnsResponseCode.NoError;
             };
 
             if (query.Nameservers.Count > 0 && hostnames.All(x => !Regex.IsMatch(x, @"\s")) && hostnames.All(x => x.ToString().EndsWith(_dnsZone.Origin)))
             {
-                await _dnsZone.Update(ChangeRecords);
-                return query.CreateAnswerMessage(DnsResponseCode.NoError, ToString());
+                var responseCode = await _dnsZone.Update(ChangeRecords);
+                return query.CreateAnswerMessage(responseCode, ToString());
             }
 
             return query.CreateAnswerMessage(DnsResponseCode.Refused, ToString());

diff --git a/src/Ae.Dns.Protocol/Zone/DnsZone.cs b/src/Ae.Dns.Protocol/Zone/DnsZone.cs
@@ -51,13 +51,14 @@ public DnsZone(IEnumerable<DnsResourceRecord> records)
         public override string ToString() => Origin;
 
         /// <inheritdoc/>
-        public async Task Update(Action<IList<DnsResourceRecord>> modification)
+        public async Task<TResult> Update<TResult>(Func<IList<DnsResourceRecord>, TResult> modification)
         {
             await _semaphore.WaitAsync();
             try
             {
-                modification(_records);
+                var result = modification(_records);
                 await ZoneUpdated(this);
+                return result;
             }
             finally
             {

diff --git a/src/Ae.Dns.Protocol/Zone/DnsZoneExtensions.cs b/src/Ae.Dns.Protocol/Zone/DnsZoneExtensions.cs
@@ -1,4 +1,7 @@
 using Ae.Dns.Protocol.Enums;
+using Ae.Dns.Protocol.Records;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Ae.Dns.Protocol.Zone
@@ -73,7 +76,7 @@ public static DnsResponseCode TestZoneUpdatePreRequisites(this IDnsZone zone, Dn
                         }
                     }
                 }
-                else if (rr.Class == zone.Records.First().Class)
+                else if (rr.Class == zone.GetZoneClass())
                 {
                     if (!zone.Records.Any(x => x.Host == rr.Host && x.Type == rr.Type && Equals(x.Resource, rr.Resource)))
                     {
@@ -88,5 +91,60 @@ public static DnsResponseCode TestZoneUpdatePreRequisites(this IDnsZone zone, Dn
 
             return DnsResponseCode.NoError;
         }
+
+        /// <summary>
+        /// Perform record updates for the specified <see cref="IDnsZone"/>.
+        /// </summary>
+        /// <param name="zone"></param>
+        /// <param name="records"></param>
+        /// <param name="updateMessage"></param>
+        public static void PerformZoneUpdates(this IDnsZone zone, ICollection<DnsResourceRecord> records, DnsMessage updateMessage)
+        {
+            foreach (var rr in updateMessage.Nameservers)
+            {
+                if (rr.Class == zone.GetZoneClass())
+                {
+                    var existingRecords = zone.Records.Where(x => x.Host == rr.Host && x.Type == rr.Type).ToArray();
+                    if (existingRecords.Any())
+                    {
+                        foreach (var existingRecord in existingRecords)
+                        {
+                            existingRecord.Resource = rr.Resource;
+                            existingRecord.TimeToLive = rr.TimeToLive;
+                        }
+                    }
+                    else
+                    {
+                        records.Add(rr);
+                    }
+                }
+
+                if (rr.Class == DnsQueryClass.QCLASS_ANY)
+                {
+
+                }
+
+                if (rr.Class == DnsQueryClass.QCLASS_NONE)
+                {
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the class of the <see cref="IDnsZone"/>.
+        /// </summary>
+        /// <param name="zone"></param>
+        /// <returns></returns>
+        public static DnsQueryClass GetZoneClass(this IDnsZone zone)
+        {
+            // TODO: force SOA in IDnsZone and use that...
+            if (zone.Records.Any())
+            {
+                return zone.Records.First().Class;
+            }
+
+            return DnsQueryClass.IN;
+        }
     }
 }
diff --git a/src/Ae.Dns.Protocol/Zone/IDnsZone.cs b/src/Ae.Dns.Protocol/Zone/IDnsZone.cs
@@ -37,7 +37,7 @@ public interface IDnsZone
         /// </summary>
         /// <param name="modification"></param>
         /// <returns></returns>
-        Task Update(Action<IList<DnsResourceRecord>> modification);
+        Task<TResult> Update<TResult>(Func<IList<DnsResourceRecord>, TResult> modification);
 
         /// <summary>
         /// Serialize the zone to a string.

diff --git a/tests/Ae.Dns.Tests/Client/DnsUpdateClientTests.cs b/tests/Ae.Dns.Tests/Client/DnsUpdateClientTests.cs
@@ -25,10 +25,9 @@ public sealed class TestDnsZone : IDnsZone
         public string FromFormattedHost(string host) => throw new NotImplementedException();
         public string SerializeZone() => throw new NotImplementedException();
         public string ToFormattedHost(string host) => throw new NotImplementedException();
-        public Task Update(Action<IList<DnsResourceRecord>> modification)
+        public Task<TResult> Update<TResult>(Func<IList<DnsResourceRecord>, TResult> modification)
         {
-            modification(_records);
-            return Task.CompletedTask;
+            return Task.FromResult(modification(_records));
         }
     }
 

diff --git a/tests/Ae.Dns.Tests/Client/Lookup/DnsZoneLookupTests.cs b/tests/Ae.Dns.Tests/Client/Lookup/DnsZoneLookupTests.cs
@@ -59,7 +59,7 @@ public string ToFormattedHost(string host)
                 throw new NotImplementedException();
             }
 
-            public Task Update(Action<IList<DnsResourceRecord>> modification)
+            public Task<TResult> Update<TResult>(Func<IList<DnsResourceRecord>, TResult> modification)
             {
                 throw new NotImplementedException();
             }
@@ -125,7 +125,7 @@ public string ToFormattedHost(string host)
                 throw new NotImplementedException();
             }
 
-            public Task Update(Action<IList<DnsResourceRecord>> modification)
+            public Task<TResult> Update<TResult>(Func<IList<DnsResourceRecord>, TResult> modification)
             {
                 throw new NotImplementedException();
             }

diff --git a/tests/Ae.Dns.Tests/Zone/DnsZoneTests.cs b/tests/Ae.Dns.Tests/Zone/DnsZoneTests.cs
@@ -225,6 +225,8 @@ await originalZone.Update(recordsToUpdate =>
                 {
                     recordsToUpdate.Add(record);
                 }
+
+                return true;
             });
 
             var serialized = originalZone.SerializeZone();