Merge pull request #328 from Snozzberries/exoFix

Fixes for EXO 3, 4 in #325
maester365 · Jul 13, 2024 · 0f4108f · 0f4108f
2 parents d46a97b + 17112ba
commit 0f4108f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/powershell/public/CISA/exchange/ConvertFrom-MailAuthenticationRecordDkim.ps1 b/powershell/public/CISA/exchange/ConvertFrom-MailAuthenticationRecordDkim.ps1
@@ -104,9 +104,14 @@ Function ConvertFrom-MailAuthenticationRecordDkim {
                         NameServer  = $dkimSplat.Server
                         ErrorAction = $dkimSplat.ErrorAction
                     }
-                    $dkimRecord = [DKIMRecord]::new(((Resolve-Dns @dkimSplatAlt).Answers | `
+                    $record = ((Resolve-Dns @dkimSplatAlt).Answers | `
                         Where-Object {$_.RecordType -eq "TXT"} | `
-                        Where-Object {$_.Text -imatch $matchRecord}).Text)
+                        Where-Object {$_.Text -imatch $matchRecord}).Text
+                    if($record){
+                        $dkimRecord = [DKIMRecord]::new($record)
+                    }else{
+                        return "Failure to obtain record"
+                    }
                 }else{
                     Write-Error "`nFor non-Windows platforms, please install DnsClient-PS module."
                     Write-Host "`n    Install-Module DnsClient-PS -Scope CurrentUser`n" -ForegroundColor Yellow

diff --git a/powershell/public/CISA/exchange/ConvertFrom-MailAuthenticationRecordDmarc.ps1 b/powershell/public/CISA/exchange/ConvertFrom-MailAuthenticationRecordDmarc.ps1
@@ -235,9 +235,14 @@ Function ConvertFrom-MailAuthenticationRecordDmarc {
                         NameServer  = $dmarcSplat.Server
                         ErrorAction = $dmarcSplat.ErrorAction
                     }
-                    $dmarcRecord = [DMARCRecord]::new(((Resolve-Dns @dmarcSplatAlt).Answers | `
+                    $record = ((Resolve-Dns @dmarcSplatAlt).Answers | `
                         Where-Object {$_.RecordType -eq "TXT"} | `
-                        Where-Object {$_.Text -imatch $matchRecord}).Text)
+                        Where-Object {$_.Text -imatch $matchRecord}).Text
+                    if($record){
+                        $dmarcRecord = [DMARCRecord]::new($record)
+                    }else{
+                        return "Failure to obtain record"
+                    }
                 }else{
                     Write-Error "`nFor non-Windows platforms, please install DnsClient-PS module."
                     Write-Host "`n    Install-Module DnsClient-PS -Scope CurrentUser`n" -ForegroundColor Yellow