Optimize DkimPublicKey model

Author: tinohager

src/Nager.EmailAuthentication/DkimPublicKeyRecordParser.cs

@@ -116,6 +116,8 @@ public static bool TryParseV1(
                 PublicKeyData = dkimPublicKeyRecordDataFragment.PublicKeyData ?? string.Empty,
                 Notes = dkimPublicKeyRecordDataFragment.Notes,
                 Flags = dkimPublicKeyRecordDataFragment.Flags,
+                AcceptableHashAlgorithms = dkimPublicKeyRecordDataFragment.AcceptableHashAlgorithms,
+                ServiceType = dkimPublicKeyRecordDataFragment.ServiceType ?? "*"
             };
 
             return true;

src/Nager.EmailAuthentication/FragmentParsers/DkimPublicKeyRecordDataFragmentParserV1.cs

@@ -84,7 +84,20 @@ public static bool TryParse(
                         Map = (dataFragment, value) => dataFragment.Granularity = value,
                         Validate = ValidateGranularity
                     }
-                }
+                },
+                {
+                    "h", new MappingHandler<DkimPublicKeyRecordDataFragmentV1>
+                    {
+                        Map = (dataFragment, value) => dataFragment.AcceptableHashAlgorithms = value
+                    }
+                },
+                {
+                    "s", new MappingHandler<DkimPublicKeyRecordDataFragmentV1>
+                    {
+                        Map = (dataFragment, value) => dataFragment.ServiceType = value,
+                        Validate = ValidateServiceType
+                    }
+                },
             };
 
             var parserBase = new KeyValueParserBase<DkimPublicKeyRecordDataFragmentV1>(handlers);
@@ -183,5 +196,25 @@ private static ParsingResult[] ValidateKeyType(ValidateRequest validateRequest)
                 }
             ];
         }
+
+        private static ParsingResult[] ValidateServiceType(ValidateRequest validateRequest)
+        {
+            var allowedServiceTypes = new string[] { "*", "email" };
+
+            if (allowedServiceTypes.Contains(validateRequest.Value, StringComparer.CurrentCultureIgnoreCase))
+            {
+                return [];
+            }
+
+            return
+            [
+                new ParsingResult
+                {
+                    Status = ParsingStatus.Critical,
+                    Field = validateRequest.Field,
+                    Message = "The ServiceType is invalid"
+                }
+            ];
+        }
     }
 }

src/Nager.EmailAuthentication/Models/DkimPublicKeyRecordDataFragmentV1.cs

@@ -23,11 +23,22 @@ public class DkimPublicKeyRecordDataFragmentV1 : DkimPublicKeyRecordDataFragment
         /// <summary>
         /// Granularity of the key <strong>(g=)</strong>, introduced in RFC 4871 and removed in RFC 6376.
         /// </summary>
+        /// <remarks>set to obsolete</remarks>
         public string? Granularity { get; set; }
 
         /// <summary>
         /// A set of flags that define boolean attributes <strong>(t=)</strong>
         /// </summary>
         public string? Flags { get; set; }
+
+        /// <summary>
+        /// A colon-separated list of service types to which this record applies <strong>(s=)</strong>
+        /// </summary>
+        public string? ServiceType { get; set; }
+
+        /// <summary>
+        /// Acceptable hash algorithms <strong>(h=)</strong>
+        /// </summary>
+        public string? AcceptableHashAlgorithms { get; set; }
     }
 }

src/Nager.EmailAuthentication/Models/DkimPublicKeyRecordV1.cs

@@ -24,5 +24,15 @@ public class DkimPublicKeyRecordV1 : DkimPublicKeyRecordBase
         /// A set of flags that define boolean attributes <strong>(t=)</strong>
         /// </summary>
         public string? Flags { get; set; }
+
+        /// <summary>
+        /// A colon-separated list of service types to which this record applies <strong>(s=)</strong>
+        /// </summary>
+        public string ServiceType { get; set; } = "*";
+
+        /// <summary>
+        /// Acceptable hash algorithms <strong>(h=)</strong>
+        /// </summary>
+        public string? AcceptableHashAlgorithms { get; set; }
     }
 }

src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj

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