Skip to content

[pull] master from KelvinTegelaar:master #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Apr 24, 2026
Merged

[pull] master from KelvinTegelaar:master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2195e4
fix: dnshealth
JohnDuprey Apr 24, 2026
e07e70b
dev to hotfix (#2018)
JohnDuprey Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/DNSHealth/1.1.5/DNSHealth.psd1 → Modules/DNSHealth/1.1.6/DNSHealth.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'DNSHealth.psm1'

# Version number of this module.
ModuleVersion = '1.1.5'
ModuleVersion = '1.1.6'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
37 changes: 13 additions & 24 deletions Modules/DNSHealth/1.1.5/DNSHealth.psm1 → Modules/DNSHealth/1.1.6/DNSHealth.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,13 +1398,13 @@ function Read-MXRecord {
if ($Result.Status -eq 3) {
$ValidationFails.Add($NoMxValidation) | Out-Null
$MXResults.MailProvider = Get-Content "$($MyInvocation.MyCommand.Module.ModuleBase)\MailProviders\Null.json" | ConvertFrom-Json
$MXResults.Selectors = $MXRecords.MailProvider.Selectors
$MXResults.Selectors = $MXResults.MailProvider.Selectors
}

else {
$ValidationFails.Add($NoMxValidation) | Out-Null
$MXResults.MailProvider = Get-Content "$($MyInvocation.MyCommand.Module.ModuleBase)\MailProviders\Null.json" | ConvertFrom-Json
$MXResults.Selectors = $MXRecords.MailProvider.Selectors
$MXResults.Selectors = $MXResults.MailProvider.Selectors
}
$MXRecords = $null
}
Expand Down Expand Up @@ -1439,8 +1439,8 @@ function Read-MXRecord {
try { Get-Content $_ | ConvertFrom-Json -ErrorAction Stop }
catch { Write-Verbose $_.Exception.Message }
}
$ProviderMatched = $false
foreach ($Record in $MXRecords) {
$ProviderMatched = $false
foreach ($Provider in $ProviderList) {
try {
if ($Record.Hostname -match $Provider.MxMatch) {
Expand All @@ -1450,35 +1450,24 @@ function Read-MXRecord {
foreach ($Var in $Provider.SpfReplace) {
if ($ReservedVariables.Keys -contains $Var) {
$ReplaceList.Add($ReservedVariables.$Var) | Out-Null
}

else {
} else {
$ReplaceList.Add($Matches.$Var) | Out-Null
}
}

else {
$ReplaceList.Add($Matches.$Var) | Out-Null
}
}

$ExpectedInclude = $Provider.SpfInclude -f ($ReplaceList -join ', ')
# Set ExpectedInclude and Selector fields based on provider details
$MXResults.ExpectedInclude = $ExpectedInclude
$MXResults.Selectors = $Provider.Selectors
$ProviderMatched = $true
break
}

else {
$ExpectedInclude = $Provider.SpfInclude
}

# Set ExpectedInclude and Selector fields based on provider details
$MXResults.ExpectedInclude = $ExpectedInclude
$MXResults.Selectors = $Provider.Selectors
$ProviderMatched = $true
break
} catch { Write-Verbose $_.Exception.Message }
}
}
if ($ProviderMatched) {
break
if ($ProviderMatched) {
break
}
}
}
}
Expand All @@ -1489,7 +1478,7 @@ function Read-MXRecord {
$MXResults.Records = @($MXResults.Records)
$MXResults
}
#EndRegion './Public/Records/Read-MXRecord.ps1' 155
#EndRegion './Public/Records/Read-MXRecord.ps1' 144
#Region './Public/Records/Read-NSRecord.ps1' -1

function Read-NSRecord {
Expand Down
0 ...SHealth/1.1.5/MailProviders/AppRiver.json → ...SHealth/1.1.6/MailProviders/AppRiver.json
View file
Open in desktop
File renamed without changes.
0 ...lth/1.1.5/MailProviders/BarracudaESS.json → ...lth/1.1.6/MailProviders/BarracudaESS.json
View file
Open in desktop
File renamed without changes.
0 ...DNSHealth/1.1.5/MailProviders/Google.json → ...DNSHealth/1.1.6/MailProviders/Google.json
View file
Open in desktop
File renamed without changes.
0 ...h/1.1.5/MailProviders/HornetSecurity.json → ...h/1.1.6/MailProviders/HornetSecurity.json
View file
Open in desktop
File renamed without changes.
0 ...ealth/1.1.5/MailProviders/Intermedia.json → ...ealth/1.1.6/MailProviders/Intermedia.json
View file
Open in desktop
File renamed without changes.
0 ...lth/1.1.5/MailProviders/Microsoft365.json → ...lth/1.1.6/MailProviders/Microsoft365.json
View file
Open in desktop
File renamed without changes.
0 ...SHealth/1.1.5/MailProviders/Mimecast.json → ...SHealth/1.1.6/MailProviders/Mimecast.json
View file
Open in desktop
File renamed without changes.
0 ...s/DNSHealth/1.1.5/MailProviders/Null.json → ...s/DNSHealth/1.1.6/MailProviders/Null.json
View file
Open in desktop
File renamed without changes.
0 ...ealth/1.1.5/MailProviders/Proofpoint.json → ...ealth/1.1.6/MailProviders/Proofpoint.json
View file
Open in desktop
File renamed without changes.
0 ...Health/1.1.5/MailProviders/Reflexion.json → ...Health/1.1.6/MailProviders/Reflexion.json
View file
Open in desktop
File renamed without changes.
0 ...DNSHealth/1.1.5/MailProviders/Sophos.json → ...DNSHealth/1.1.6/MailProviders/Sophos.json
View file
Open in desktop
File renamed without changes.
0 ...Health/1.1.5/MailProviders/SpamTitan.json → ...Health/1.1.6/MailProviders/SpamTitan.json
View file
Open in desktop
File renamed without changes.
0 ...th/1.1.5/MailProviders/SymantecCloud.json → ...th/1.1.6/MailProviders/SymantecCloud.json
View file
Open in desktop
File renamed without changes.
0 ...Health/1.1.5/MailProviders/_template.json → ...Health/1.1.6/MailProviders/_template.json
View file
Open in desktop
File renamed without changes.
25 changes: 12 additions & 13 deletions Modules/DNSHealth/1.1.5/PSGetModuleInfo.xml → Modules/DNSHealth/1.1.6/PSGetModuleInfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
</TN>
<MS>
<S N="Name">DNSHealth</S>
<S N="Version">1.1.5</S>
<S N="Version">1.1.6</S>
<S N="Type">Module</S>
<S N="Description">CIPP DNS Health Check Module</S>
<S N="Author">John Duprey</S>
<S N="CompanyName">johnduprey</S>
<S N="Copyright">2023 John Duprey</S>
<DT N="PublishedDate">2026-04-24T15:04:48-04:00</DT>
<DT N="PublishedDate">2026-04-24T17:42:26-04:00</DT>
<Nil N="InstalledDate" />
<Nil N="UpdatedDate" />
<Nil N="LicenseUri" />
Expand Down Expand Up @@ -127,25 +127,24 @@
<S N="isLatestVersion">True</S>
<S N="isAbsoluteLatestVersion">True</S>
<S N="versionDownloadCount">0</S>
<S N="downloadCount">470</S>
<S N="packageSize">31576</S>
<S N="published">4/24/2026 3:04:48 PM -04:00</S>
<S N="created">4/24/2026 3:04:48 PM -04:00</S>
<S N="lastUpdated">4/24/2026 3:04:48 PM -04:00</S>
<S N="tags">PSModule</S>
<S N="downloadCount">477</S>
<S N="packageSize">31557</S>
<S N="published">4/24/2026 5:42:26 PM -04:00</S>
<S N="created">4/24/2026 5:42:26 PM -04:00</S>
<S N="lastUpdated">4/24/2026 5:42:26 PM -04:00</S>
<S N="tags">PSModule PSFunction_Read-DmarcPolicy PSCommand_Read-DmarcPolicy PSFunction_Read-MtaStsPolicy PSCommand_Read-MtaStsPolicy PSFunction_Add-MailProvider PSCommand_Add-MailProvider PSFunction_Get-MailProvider PSCommand_Get-MailProvider PSFunction_Read-DkimRecord PSCommand_Read-DkimRecord PSFunction_Read-MtaStsRecord PSCommand_Read-MtaStsRecord PSFunction_Read-MXRecord PSCommand_Read-MXRecord PSFunction_Read-NSRecord PSCommand_Read-NSRecord PSFunction_Read-SPFRecord PSCommand_Read-SPFRecord PSFunction_Read-TlsRptRecord PSCommand_Read-TlsRptRecord PSFunction_Read-WhoisRecord PSCommand_Read-WhoisRecord PSFunction_Remove-MailProvider PSCommand_Remove-MailProvider PSFunction_Resolve-DnsHttpsQuery PSCommand_Resolve-DnsHttpsQuery PSFunction_Set-DnsResolver PSCommand_Set-DnsResolver PSFunction_Test-DNSSEC PSCommand_Test-DNSSEC PSFunction_Test-HttpsCertificate PSCommand_Test-HttpsCertificate PSFunction_Test-MtaSts PSCommand_Test-MtaSts PSIncludes_Function</S>
<S N="developmentDependency">False</S>
<S N="updated">2026-04-24T15:04:48Z</S>
<S N="NormalizedVersion">1.1.5</S>
<S N="updated">2026-04-24T17:42:26Z</S>
<S N="NormalizedVersion">1.1.6</S>
<S N="Authors">John Duprey</S>
<S N="IsPrerelease">false</S>
<S N="ItemType">Module</S>
<S N="FileList">DNSHealth.nuspec|DNSHealth.psd1|DNSHealth.psm1|MailProviders\SymantecCloud.json|MailProviders\Microsoft365.json|MailProviders\Sophos.json|MailProviders\Intermedia.json|MailProviders\SpamTitan.json|MailProviders\AppRiver.json|MailProviders\Proofpoint.json|MailProviders\Reflexion.json|MailProviders\_template.json|MailProviders\BarracudaESS.json|MailProviders\Mimecast.json|MailProviders\Null.json|MailProviders\HornetSecurity.json|MailProviders\Google.json</S>
<S N="Functions">Read-DmarcPolicy Read-MtaStsPolicy Add-MailProvider Get-MailProvider Read-DkimRecord Read-MtaStsRecord Read-MXRecord Read-NSRecord Read-SPFRecord Read-TlsRptRecord Read-WhoisRecord Remove-MailProvider Resolve-DnsHttpsQuery Set-DnsResolver Test-DNSSEC Test-HttpsCertificate Test-MtaSts</S>
<S N="FileList">DNSHealth.nuspec|MailProviders\Microsoft365.json|MailProviders\Sophos.json|DNSHealth.psd1|MailProviders\SymantecCloud.json|MailProviders\SpamTitan.json|MailProviders\AppRiver.json|DNSHealth.psm1|MailProviders\Intermedia.json|MailProviders\_template.json|MailProviders\BarracudaESS.json|MailProviders\Reflexion.json|MailProviders\HornetSecurity.json|MailProviders\Google.json|MailProviders\Proofpoint.json|MailProviders\Null.json|MailProviders\Mimecast.json</S>
<S N="GUID">a300d2b0-d468-46d1-88a3-e442a76b655b</S>
<S N="PowerShellVersion">7.0</S>
</MS>
</Obj>
<S N="InstalledLocation">/Users/johnduprey/GitHub/CIPP Workspace/CIPP-API/Modules/DNSHealth/1.1.5</S>
<S N="InstalledLocation">/Users/johnduprey/GitHub/CIPP Workspace/CIPP-API/Modules/DNSHealth/1.1.6</S>
</MS>
</Obj>
</Objs>