feat: macro expansion support in include method in Test-SpfHost

GreyCorbel · Dec 29, 2024 · b8722e0 · b8722e0
1 parent d4a60cd
commit b8722e0
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/Commands/Public/Test-SpfIHost.ps1 b/Commands/Public/Test-SpfIHost.ps1
@@ -73,6 +73,27 @@ More about SPF, see http://www.openspf.org/ and https://tools.ietf.org/html/rfc7
                     #silently ignore not found expanded macro
                 }
             }
+            $record.Entries `
+            | Where-Object { $_.Prefix -eq 'include' } `
+            | Where-Object { $_.Value -match '%{.' } `
+            | ForEach-Object {
+                $macro =  Expand-SpfMacro -Macro $_.Value -Domain $spfRecords[0].Source -IpAddress $ip -SenderAddress $SenderAddress
+                if($macro -match '%{.' ) {
+                    throw "Unsupported macro $macro after expansion of $( $_.Value )"
+                }
+                try {
+                    $rawRecord = [Dns]::GetRecord($macro, [DnsClient.QueryType]::TXT)
+                    if($null -ne $rawRecord)
+                    {
+                        $additionalRecord = [SpfRecord]::Parse($_.Source, $rawRecord)
+                        $additionalRecord `
+                        | Test-SpfHost -IpAddress $IpAddress -SenderAddress $SenderAddress
+                    }
+                }
+                catch {
+                    #silently ignore not found expanded macro
+                }
+            }
         }
     }
 }
diff --git a/Module/SpfAnalyzer/SpfAnalyzer.psd1 b/Module/SpfAnalyzer/SpfAnalyzer.psd1
@@ -12,7 +12,7 @@
 RootModule = '.\SpfAnalyzer.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.0.1'
+ModuleVersion = '1.0.2'
 
 # Supported PSEditions
 CompatiblePSEditions = @('Core')

diff --git a/Module/SpfAnalyzer/SpfAnalyzer.psm1 b/Module/SpfAnalyzer/SpfAnalyzer.psm1
@@ -637,6 +637,27 @@ More about SPF, see http://www.openspf.org/ and https://tools.ietf.org/html/rfc7
                     #silently ignore not found expanded macro
                 }
             }
+            $record.Entries `
+            | Where-Object { $_.Prefix -eq 'include' } `
+            | Where-Object { $_.Value -match '%{.' } `
+            | ForEach-Object {
+                $macro =  Expand-SpfMacro -Macro $_.Value -Domain $spfRecords[0].Source -IpAddress $ip -SenderAddress $SenderAddress
+                if($macro -match '%{.' ) {
+                    throw "Unsupported macro $macro after expansion of $( $_.Value )"
+                }
+                try {
+                    $rawRecord = [Dns]::GetRecord($macro, [DnsClient.QueryType]::TXT)
+                    if($null -ne $rawRecord)
+                    {
+                        $additionalRecord = [SpfRecord]::Parse($_.Source, $rawRecord)
+                        $additionalRecord `
+                        | Test-SpfHost -IpAddress $IpAddress -SenderAddress $SenderAddress
+                    }
+                }
+                catch {
+                    #silently ignore not found expanded macro
+                }
+            }
         }
     }
 }

diff --git a/README.md b/README.md
@@ -50,4 +50,4 @@ Module provides additional helper commands that return list of IP addresses and
 IPv4 and IPv6 addresses are supported.  
 Only Powershell Core edition is supported.  
 Macro expansion in `exists` mechanism does not yet cover complete specification in RFC 7208 - looking for collaborators to enhance parsing.
-Macros in `include` method aren't currently expanded and such record is not tried to be parsed
+Macros in `include` method aren't currently expanded and such record is not tried to be parsed. Hoever, such record is processed by `Test-SpfHost` command