Merge pull request #95 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -56,6 +56,15 @@ function Invoke-CIPPStandardSpamFilterPolicy {
     $PhishQuarantineTag = $Settings.PhishQuarantineTag.value ?? $Settings.PhishQuarantineTag
     $HighConfidencePhishQuarantineTag = $Settings.HighConfidencePhishQuarantineTag.value ?? $Settings.HighConfidencePhishQuarantineTag
 
+    $IncreaseScoreWithImageLinks = if ($Settings.IncreaseScoreWithImageLinks) { 'On' } else { 'Off' }
+    $IncreaseScoreWithBizOrInfoUrls = if ($Settings.IncreaseScoreWithBizOrInfoUrls) { 'On' } else { 'Off' }
+    $MarkAsSpamFramesInHtml = if ($Settings.MarkAsSpamFramesInHtml) { 'On' } else { 'Off' }
+    $MarkAsSpamObjectTagsInHtml = if ($Settings.MarkAsSpamObjectTagsInHtml) { 'On' } else { 'Off' }
+    $MarkAsSpamEmbedTagsInHtml = if ($Settings.MarkAsSpamEmbedTagsInHtml) { 'On' } else { 'Off' }
+    $MarkAsSpamFormTagsInHtml = if ($Settings.MarkAsSpamFormTagsInHtml) { 'On' } else { 'Off' }
+    $MarkAsSpamWebBugsInHtml = if ($Settings.MarkAsSpamWebBugsInHtml) { 'On' } else { 'Off' }
+    $MarkAsSpamSensitiveWordList = if ($Settings.MarkAsSpamSensitiveWordList) { 'On' } else { 'Off' }
+
     $StateIsCorrect = ($CurrentState.Name -eq $PolicyName) -and
                         ($CurrentState.SpamAction -eq $SpamAction) -and
                         ($CurrentState.SpamQuarantineTag -eq $SpamQuarantineTag) -and
@@ -69,17 +78,29 @@ function Invoke-CIPPStandardSpamFilterPolicy {
                         ($CurrentState.HighConfidencePhishQuarantineTag -eq $HighConfidencePhishQuarantineTag) -and
                         ($CurrentState.BulkThreshold -eq $Settings.BulkThreshold) -and
                         ($CurrentState.QuarantineRetentionPeriod -eq 30) -and
+                        ($CurrentState.IncreaseScoreWithImageLinks -eq $IncreaseScoreWithImageLinks) -and
                         ($CurrentState.IncreaseScoreWithNumericIps -eq 'On') -and
                         ($CurrentState.IncreaseScoreWithRedirectToOtherPort -eq 'On') -and
+                        ($CurrentState.IncreaseScoreWithBizOrInfoUrls -eq $IncreaseScoreWithBizOrInfoUrls) -and
                         ($CurrentState.MarkAsSpamEmptyMessages -eq 'On') -and
                         ($CurrentState.MarkAsSpamJavaScriptInHtml -eq 'On') -and
+                        ($CurrentState.MarkAsSpamFramesInHtml -eq $MarkAsSpamFramesInHtml) -and
+                        ($CurrentState.MarkAsSpamObjectTagsInHtml -eq $MarkAsSpamObjectTagsInHtml) -and
+                        ($CurrentState.MarkAsSpamEmbedTagsInHtml -eq $MarkAsSpamEmbedTagsInHtml) -and
+                        ($CurrentState.MarkAsSpamFormTagsInHtml -eq $MarkAsSpamFormTagsInHtml) -and
+                        ($CurrentState.MarkAsSpamWebBugsInHtml -eq $MarkAsSpamWebBugsInHtml) -and
+                        ($CurrentState.MarkAsSpamSensitiveWordList -eq $MarkAsSpamSensitiveWordList) -and
                         ($CurrentState.MarkAsSpamSpfRecordHardFail -eq 'On') -and
                         ($CurrentState.MarkAsSpamFromAddressAuthFail -eq 'On') -and
                         ($CurrentState.MarkAsSpamNdrBackscatter -eq 'On') -and
                         ($CurrentState.MarkAsSpamBulkMail -eq 'On') -and
                         ($CurrentState.InlineSafetyTipsEnabled -eq $true) -and
                         ($CurrentState.PhishZapEnabled -eq $true) -and
-                        ($CurrentState.SpamZapEnabled -eq $true)
+                        ($CurrentState.SpamZapEnabled -eq $true) -and
+                        ($CurrentState.EnableLanguageBlockList -eq $Settings.EnableLanguageBlockList) -and
+                        ((-not $CurrentState.LanguageBlockList -and -not $Settings.LanguageBlockList.value) -or (!(Compare-Object -ReferenceObject $CurrentState.LanguageBlockList -DifferenceObject $Settings.LanguageBlockList.value))) -and
+                        ($CurrentState.EnableRegionBlockList -eq $Settings.EnableRegionBlockList) -and
+                        ((-not $CurrentState.RegionBlockList -and -not $Settings.RegionBlockList.value) -or (!(Compare-Object -ReferenceObject $CurrentState.RegionBlockList -DifferenceObject $Settings.RegionBlockList.value)))
 
     $AcceptedDomains = New-ExoRequest -TenantId $Tenant -cmdlet 'Get-AcceptedDomain'
 
@@ -109,20 +130,30 @@ function Invoke-CIPPStandardSpamFilterPolicy {
                 HighConfidencePhishQuarantineTag     = $HighConfidencePhishQuarantineTag
                 BulkThreshold                        = $Settings.BulkThreshold
                 QuarantineRetentionPeriod            = 30
+                IncreaseScoreWithImageLinks          = $IncreaseScoreWithImageLinks
                 IncreaseScoreWithNumericIps          = 'On'
                 IncreaseScoreWithRedirectToOtherPort = 'On'
+                IncreaseScoreWithBizOrInfoUrls       = $IncreaseScoreWithBizOrInfoUrls
                 MarkAsSpamEmptyMessages              = 'On'
                 MarkAsSpamJavaScriptInHtml           = 'On'
+                MarkAsSpamFramesInHtml               = $MarkAsSpamFramesInHtml
+                MarkAsSpamObjectTagsInHtml           = $MarkAsSpamObjectTagsInHtml
+                MarkAsSpamEmbedTagsInHtml            = $MarkAsSpamEmbedTagsInHtml
+                MarkAsSpamFormTagsInHtml             = $MarkAsSpamFormTagsInHtml
+                MarkAsSpamWebBugsInHtml              = $MarkAsSpamWebBugsInHtml
+                MarkAsSpamSensitiveWordList          = $MarkAsSpamSensitiveWordList
                 MarkAsSpamSpfRecordHardFail          = 'On'
                 MarkAsSpamFromAddressAuthFail        = 'On'
                 MarkAsSpamNdrBackscatter             = 'On'
                 MarkAsSpamBulkMail                   = 'On'
                 InlineSafetyTipsEnabled              = $true
                 PhishZapEnabled                      = $true
                 SpamZapEnabled                       = $true
+                EnableLanguageBlockList              = $Settings.EnableLanguageBlockList
+                LanguageBlockList                    = $Settings.LanguageBlockList.value
+                EnableRegionBlockList                = $Settings.EnableRegionBlockList
+                RegionBlockList                      = $Settings.RegionBlockList.value
             }
-            Write-Host '================== DEBUG =================='
-            Write-Host $cmdParams
 
             if ($CurrentState.Name -eq $PolicyName) {
                 try {