Merge pull request #15 from JohnDuprey/dev

Dev to main

Author: JohnDuprey

DNSHealth/MailProviders/HornetSecurity.json

@@ -0,0 +1,9 @@
+{
+  "Name": "Hornet Security",
+  "MxMatch": "mx[0-9][0-9].hornetsecurity.com",
+  "SpfInclude": "spf.hornetsecurity.com",
+  "Selectors": [""],
+  "_MxComment": "https://www.hornetsecurity.com/en/onboarding-information/",
+  "_SpfComment": "https://www.hornetsecurity.com/en/onboarding-information/",
+  "_DkimComment": "https://support.hornetsecurity.com/hc/en-us/articles/15123377800593-How-to-set-up-DKIM"
+}

DNSHealth/MailProviders/Microsoft365.json

@@ -1,10 +1,10 @@
 {
-    "Name": "Microsoft 365",
-    "MxMatch": "mail.protection.outlook.com",
-    "SpfInclude": "spf.protection.outlook.com",
-    "Selectors": ["selector1","selector2"],
-    "MinimumSelectorPass": 1,
-    "_MxComment": "https://docs.microsoft.com/en-us/microsoft-365/admin/get-help-with-domains/create-dns-records-at-any-dns-hosting-provider",
-    "_SpfComment": "https://docs.microsoft.com/en-us/microsoft-365/admin/get-help-with-domains/create-dns-records-at-any-dns-hosting-provider",
-    "_DkimComment": "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/use-dkim-to-validate-outbound-email?view=o365-worldwide"
-}
+  "Name": "Microsoft 365",
+  "MxMatch": "mail.protection.outlook.com|mx.microsoft",
+  "SpfInclude": "spf.protection.outlook.com",
+  "Selectors": ["selector1", "selector2"],
+  "MinimumSelectorPass": 1,
+  "_MxComment": "https://docs.microsoft.com/en-us/microsoft-365/admin/get-help-with-domains/create-dns-records-at-any-dns-hosting-provider",
+  "_SpfComment": "https://docs.microsoft.com/en-us/microsoft-365/admin/get-help-with-domains/create-dns-records-at-any-dns-hosting-provider",
+  "_DkimComment": "https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/use-dkim-to-validate-outbound-email?view=o365-worldwide"
+}

DNSHealth/MailProviders/SymantecCloud.json

@@ -0,0 +1,9 @@
+{
+  "Name": "Symantec Cloud",
+  "MxMatch": "cluster[0-9].{3,4}.messagelabs.com",
+  "SpfInclude": "spf.messagelabs.com",
+  "Selectors": [""],
+  "_MxComment": "https://knowledge.broadcom.com/external/article/161419/mail-exchanger-mx-record-setup-with-emai.html",
+  "_SpfComment": "https://knowledge.broadcom.com/external/article/161394/implement-spf-records-for-email-security.html",
+  "_DkimComment": "https://knowledge.broadcom.com/external/article/171225/configuring-dkim-signing-for-outbound-ma.html"
+}

DNSHealth/Public/Records/Read-WhoisRecord.ps1

@@ -50,9 +50,11 @@ function Read-WhoisRecord {
     $WhoisRegex = '^(?!(?:%|>>>|-+|#|[*]))[^\S\n]*(?<PropName>.+?):(?:[\r\n]+)?(:?(?!([0-9]|[/]{2}))[^\S\r\n]*(?<PropValue>.+))?$'
 
     Write-Verbose "Querying WHOIS Server: $Server"
-    # TCP Client for Whois
-    $Client = New-Object System.Net.Sockets.TcpClient($Server, 43)
+
     try {
+        # TCP Client for Whois
+        $Client = New-Object System.Net.Sockets.TcpClient($Server, 43)
+
         # Open TCP connection and send query
         $Stream = $Client.GetStream()
         $ReferralServers = [System.Collections.Generic.List[string]]::new()
@@ -136,16 +138,18 @@ function Read-WhoisRecord {
                     $Results = $LastResult
                 }
             }
-        }
-
-        else {
+        } else {
             if ($Results._Raw -Match '(No match|Not Found|No Data)') {
                 $first, $newquery = ($Query -split '\.')
                 if (($newquery | Measure-Object).Count -gt 1) {
                     $Query = $newquery -join '.'
-                    $Results = Read-WhoisRecord -Query $Query -Server $Server -Port $Port
-                    foreach ($s in $Results._ReferralServers) {
-                        $ReferralServers.Add($s) | Out-Null
+                    try {
+                        $Results = Read-WhoisRecord -Query $Query -Server $Server -Port $Port
+                        foreach ($s in $Results._ReferralServers) {
+                            $ReferralServers.Add($s) | Out-Null
+                        }
+                    } catch {
+                        $Results = $LastResult
                     }
                 }
             }
@@ -162,10 +166,10 @@ function Read-WhoisRecord {
             $Stream.Dispose()
         }
     }
-
-    # Collect referral server list
-    $Results._ReferralServers = $ReferralServers
-
+    if ($ReferralServers) {
+        # Collect referral server list
+        $Results._ReferralServers = $ReferralServers
+    }
     # Convert to json and back to preserve object order
     $WhoisResults = $Results | ConvertTo-Json | ConvertFrom-Json
 

DNSHealth/Public/Resolver/Resolve-DnsHttpsQuery.ps1

@@ -51,18 +51,18 @@ function Resolve-DnsHttpsQuery {
     $Uri = $QueryTemplate -f $BaseUri, $Domain, $RecordType
 
     $x = 0
+    $Exception = $null
     do {
         $x++
         try {
             $Results = Invoke-RestMethod -Uri $Uri -Headers $Headers -ErrorAction Stop
-        }
-
-        catch {
+        } catch {
+            $Exception = $_
             Start-Sleep -Milliseconds 300
         }
     }
     while (-not $Results -and $x -le 3)
-    if (!$Results) { throw $_ }
+    if (!$Results) { throw 'Exception querying resolver {0}: {1}' -f $Resolver.Resolver, $Exception.Exception.Message }
 
     if ($RecordType -eq 'txt' -and $Results.Answer) {
         if ($Resolver -eq 'Cloudflare' -or $Resolver -eq 'Quad9') {

Tests/Test-Whois.ps1

@@ -0,0 +1,34 @@
+Param(
+    $Count = 100
+)
+
+$DomainList = (Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/opendns/public-domain-lists/master/opendns-top-domains.txt') -split "`n"
+$RandomDomains = $DomainList | Where-Object { $_ } | Get-Random -Count $Count
+
+
+$Jobs = $RandomDomains | ForEach-Object -Parallel {
+    Import-Module '..\Output\DNSHealth\DNSHealth.psd1'
+    $Start = Get-Date
+    try {
+        $Result = Read-WhoisRecord $_
+        $Success = $true
+    }
+
+    catch {
+        $Result = $_.Exception
+        $Success = $false
+    }
+    $End = Get-Date
+    $TimeSpan = New-TimeSpan -Start $Start -End $End
+
+    [pscustomobject]@{
+        Domain   = $_
+        Result   = $Result
+        Success  = $Success
+        TimeSpan = $TimeSpan
+    }
+
+} -ThrottleLimit 10 -AsJob
+
+$Results = $Jobs | Wait-Job | Receive-Job
+$Results