Add DKIM domain exclusions

add comment

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserTenant.ps1

@@ -20,7 +20,7 @@ function Push-DomainAnalyserTenant {
         return
     } else {
         try {
-            # Remove domains that are not wanted, and used for cloud signature services
+            # Remove domains that are not wanted, and used for cloud signature services. Same exclusions also found in Invoke-CIPPStandardAddDKIM
             $ExclusionDomains = @(
                 '*.microsoftonline.com'
                 '*.exclaimer.cloud'

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAddDKIM.ps1

@@ -66,9 +66,36 @@ function Invoke-CIPPStandardAddDKIM {
         return
     }
 
+    # Same exclusions also found in Push-DomainAnalyserTenant
+    $ExclusionDomains = @(
+        '*.microsoftonline.com'
+        '*.exclaimer.cloud'
+        '*.excl.cloud'
+        '*.codetwo.online'
+        '*.call2teams.com'
+        '*.signature365.net'
+        '*.myteamsconnect.io'
+        '*.teams.dstny.com'
+    )
 
-    $AllDomains = ($BatchResults | Where-Object { $_.DomainName }).DomainName
-    $DKIM = $BatchResults | Where-Object { $_.Domain } | Select-Object Domain, Enabled, Status
+    $AllDomains = ($BatchResults | Where-Object { $_.DomainName }).DomainName | ForEach-Object {
+        $Domain = $_
+        foreach ($ExclusionDomain in $ExclusionDomains) {
+            if ($Domain -like $ExclusionDomain) {
+                $Domain = $null
+            }
+        }
+        if ($null -ne $Domain) { $Domain }
+    }
+    $DKIM = $BatchResults | Where-Object { $_.Domain } | Select-Object Domain, Enabled, Status | ForEach-Object {
+        $Domain = $_
+        foreach ($ExclusionDomain in $ExclusionDomains) {
+            if ($Domain.Domain -like $ExclusionDomain) {
+                $Domain = $null
+            }
+        }
+        if ($null -ne $Domain) { $Domain }
+    }
 
     # List of domains for each way to enable DKIM
     $NewDomains = $AllDomains | Where-Object { $DKIM.Domain -notcontains $_ }