update dnshealth

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecCPVPermissions.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ExecCPVPermissions {
+function Invoke-ExecCPVPermissions {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -15,7 +15,7 @@ Function Invoke-ExecCPVPermissions {
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
     $TenantFilter = $Request.Body.tenantFilter
 
-    $Tenant = Get-Tenants -IncludeAll | Where-Object -Property customerId -EQ $TenantFilter | Select-Object -First 1
+    $Tenant = Get-Tenants -TenantFilter $TenantFilter -IncludeErrors
 
     if ($Tenant) {
         Write-Host "Our tenant is $($Tenant.displayName) - $($Tenant.defaultDomainName)"

Modules/DNSHealth/1.0.7/MailProviders/Microsoft365.json

@@ -12,7 +12,7 @@
     RootModule        = 'DNSHealth.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.0.7'
+    ModuleVersion     = '1.1.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

Modules/DNSHealth/1.0.7/DNSHealth.psd1 renamed to Modules/DNSHealth/1.1.0/DNSHealth.psd1

@@ -1179,7 +1179,7 @@ function Read-MXRecord {
 
             catch { Write-Verbose $_.Exception.Message }
         }
-        $ValidationPasses.Add('Mail exchanger record(s) are present for this domain.') | Out-Null
+        $ValidationPasses.Add('Mail exchanger records record(s) are present for this domain.') | Out-Null
         $MXRecords = $MXRecords | Sort-Object -Property Priority
 
         # Attempt to identify mail provider based on MX record
@@ -2073,9 +2073,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()
@@ -2159,16 +2161,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
                     }
                 }
             }
@@ -2185,17 +2189,17 @@ 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
 
     # Return Whois results as PSObject
     $WhoisResults
 }
-#EndRegion './Public/Records/Read-WhoisRecord.ps1' 175
+#EndRegion './Public/Records/Read-WhoisRecord.ps1' 179
 #Region './Public/Resolver/Resolve-DnsHttpsQuery.ps1' -1
 
 function Resolve-DnsHttpsQuery {
@@ -2221,7 +2225,7 @@ function Resolve-DnsHttpsQuery {
 
     #>
     [cmdletbinding()]
-    Param(
+    param(
         [Parameter(Mandatory = $true)]
         [string]$Domain,
 
@@ -2251,23 +2255,23 @@ 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') {
             $Results.Answer | ForEach-Object {
-                $_.data = $_.data -replace '"' -replace '\s+', ' '
+                $_.data = $_.data -replace '" "' -replace '"', ''
             }
         }
         $Results.Answer = $Results.Answer | Where-Object { $_.type -eq 16 }

Modules/DNSHealth/1.0.7/DNSHealth.psm1 renamed to Modules/DNSHealth/1.1.0/DNSHealth.psm1

@@ -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"
+}

Modules/DNSHealth/1.0.7/MailProviders/AppRiver.json renamed to Modules/DNSHealth/1.1.0/MailProviders/AppRiver.json

@@ -0,0 +1,10 @@
+{
+  "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"
+}