Optimize DkimPublicKeyRecordParser

Author: tinohager

src/Nager.EmailAuthentication/DkimPublicKeyRecordDataFragmentParser.cs

@@ -161,7 +161,7 @@ private static ParsingResult[] ValidateGranularity(ValidateRequest validateReque
                 {
                     Status = ParsingStatus.Warning,
                     Field = validateRequest.Field,
-                    Message = "Granularity is deprecated."
+                    Message = "Granularity is deprecated. Introduced in RFC 4871 and removed in RFC 6376."
                 }
             ];
         }

src/Nager.EmailAuthentication/DkimPublicKeyRecordParser.cs

@@ -0,0 +1,80 @@
+using Nager.EmailAuthentication.Models;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Nager.EmailAuthentication
+{
+    /// <summary>
+    /// Dkim Public Key Record Parser
+    /// </summary>
+    public static class DkimPublicKeyRecordParser
+    {
+        /// <summary>
+        /// TryParse
+        /// </summary>
+        /// <param name="dkimPublicKeyRecordRaw"></param>
+        /// <param name="dkimPublicKeyRecord"></param>
+        /// <returns></returns>
+        public static bool TryParse(
+            string? dkimPublicKeyRecordRaw,
+            [NotNullWhen(true)] out DkimPublicKeyRecord? dkimPublicKeyRecord)
+        {
+            if (!DkimPublicKeyRecordDataFragmentParser.TryParse(dkimPublicKeyRecordRaw, out var dataFragment, out _))
+            {
+                dkimPublicKeyRecord = null;
+                return false;
+            }
+
+            return TryParse(dataFragment, out dkimPublicKeyRecord);
+        }
+
+        /// <summary>
+        /// TryParse
+        /// </summary>
+        /// <param name="dkimPublicKeyRecordRaw"></param>
+        /// <param name="dkimPublicKeyRecord"></param>
+        /// <param name="parsingResults"></param>
+        /// <returns></returns>
+        public static bool TryParse(
+            string? dkimPublicKeyRecordRaw,
+            [NotNullWhen(true)] out DkimPublicKeyRecord? dkimPublicKeyRecord,
+            out ParsingResult[]? parsingResults)
+        {
+            if (!DkimPublicKeyRecordDataFragmentParser.TryParse(dkimPublicKeyRecordRaw, out var dataFragment, out parsingResults))
+            {
+                dkimPublicKeyRecord = null;
+                return false;
+            }
+
+            return TryParse(dataFragment, out dkimPublicKeyRecord);
+        }
+
+        /// <summary>
+        /// TryParse
+        /// </summary>
+        /// <param name="dkimPublicKeyRecordDataFragment"></param>
+        /// <param name="dkimPublicKeyRecord"></param>
+        /// <returns></returns>
+        public static bool TryParse(
+            DkimPublicKeyRecordDataFragment? dkimPublicKeyRecordDataFragment,
+            [NotNullWhen(true)] out DkimPublicKeyRecord? dkimPublicKeyRecord)
+        {
+            dkimPublicKeyRecord = null;
+
+            if (dkimPublicKeyRecordDataFragment == null)
+            {
+                return false;
+            }
+
+            dkimPublicKeyRecord = new DkimPublicKeyRecord
+            {
+                Version = dkimPublicKeyRecordDataFragment.Version ?? "DKIM1",
+                KeyType = dkimPublicKeyRecordDataFragment.KeyType ?? "rsa",
+                PublicKeyData = dkimPublicKeyRecordDataFragment.PublicKeyData ?? string.Empty,
+                Notes = dkimPublicKeyRecordDataFragment.Notes,
+                Flags = dkimPublicKeyRecordDataFragment.Flags,
+            };
+
+            return true;
+        }
+    }
+}

src/Nager.EmailAuthentication/Models/DkimPublicKeyRecord.cs

@@ -0,0 +1,33 @@
+namespace Nager.EmailAuthentication.Models
+{
+    /// <summary>
+    /// Dkim Public Key Record
+    /// </summary>
+    public class DkimPublicKeyRecord
+    {
+        /// <summary>
+        /// Dkim Version <strong>(v=)</strong>
+        /// </summary>
+        public required string Version { get; set; } = "DKIM1";
+
+        /// <summary>
+        /// Key Type <strong>(k=)</strong>
+        /// </summary>
+        public string KeyType { get; set; } = "rsa";
+
+        /// <summary>
+        /// Notes that may be of interest to a human <strong>(n=)</strong>
+        /// </summary>
+        public string? Notes { get; set; }
+
+        /// <summary>
+        /// Public key data <strong>(p=)</strong>
+        /// </summary>
+        public required string PublicKeyData { get; set; }
+
+        /// <summary>
+        /// A set of flags that define boolean attributes <strong>(t=)</strong>
+        /// </summary>
+        public string? Flags { get; set; }
+    }
+}

src/Nager.EmailAuthentication/Models/DkimPublicKeyRecordDataFragment.cs

@@ -26,7 +26,7 @@ public class DkimPublicKeyRecordDataFragment
         public string? PublicKeyData { get; set; }
 
         /// <summary>
-        /// Granularity of the key
+        /// Granularity of the key <strong>(g=)</strong>, introduced in RFC 4871 and removed in RFC 6376.
         /// </summary>
         public string? Granularity { get; set; }
 

src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj

@@ -20,7 +20,7 @@
 
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
-    <Version>1.5.4</Version>
+    <Version>1.5.5</Version>
   </PropertyGroup>
 
   <ItemGroup>