extract value from FileTypeAction

fixes ticket 34382084239

Author: JohnDuprey

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

@@ -75,10 +75,9 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
 
     try {
         $CurrentState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterPolicy' |
-        Where-Object -Property Name -EQ $PolicyName |
-        Select-Object Name, EnableFileFilter, FileTypeAction, FileTypes, ZapEnabled, QuarantineTag, EnableInternalSenderAdminNotifications, InternalSenderAdminAddress, EnableExternalSenderAdminNotifications, ExternalSenderAdminAddress
-    }
-    catch {
+            Where-Object -Property Name -EQ $PolicyName |
+            Select-Object Name, EnableFileFilter, FileTypeAction, FileTypes, ZapEnabled, QuarantineTag, EnableInternalSenderAdminNotifications, InternalSenderAdminAddress, EnableExternalSenderAdminNotifications, ExternalSenderAdminAddress
+    } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
         Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the MalwareFilterPolicy state for $Tenant. Error: $ErrorMessage" -Sev Error
         return
@@ -92,27 +91,29 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
         $ExpectedFileTypes = $DefaultFileTypes + @($Settings.OptionalFileTypes.Split(',').Trim())
     }
 
+    $FileTypeAction = $Settings.FileTypeAction.value ?? $Settings.FileTypeAction ?? 'Quarantine'
+
     $StateIsCorrect = ($CurrentState.Name -eq $PolicyName) -and
-                      ($CurrentState.EnableFileFilter -eq $true) -and
-                      ($CurrentState.FileTypeAction -eq $Settings.FileTypeAction) -and
-                      (!(Compare-Object -ReferenceObject $CurrentState.FileTypes -DifferenceObject $ExpectedFileTypes)) -and
-                      ($CurrentState.ZapEnabled -eq $true) -and
-                      ($CurrentState.QuarantineTag -eq $Settings.QuarantineTag) -and
-                      ($CurrentState.EnableInternalSenderAdminNotifications -eq $Settings.EnableInternalSenderAdminNotifications) -and
-                      (($null -eq $Settings.InternalSenderAdminAddress) -or ($CurrentState.InternalSenderAdminAddress -eq $Settings.InternalSenderAdminAddress)) -and
-                      ($CurrentState.EnableExternalSenderAdminNotifications -eq $Settings.EnableExternalSenderAdminNotifications) -and
-                      (($null -eq $Settings.ExternalSenderAdminAddress) -or ($CurrentState.ExternalSenderAdminAddress -eq $Settings.ExternalSenderAdminAddress))
+    ($CurrentState.EnableFileFilter -eq $true) -and
+    ($CurrentState.FileTypeAction -eq $FileTypeAction) -and
+    (!(Compare-Object -ReferenceObject $CurrentState.FileTypes -DifferenceObject $ExpectedFileTypes)) -and
+    ($CurrentState.ZapEnabled -eq $true) -and
+    ($CurrentState.QuarantineTag -eq $Settings.QuarantineTag) -and
+    ($CurrentState.EnableInternalSenderAdminNotifications -eq $Settings.EnableInternalSenderAdminNotifications) -and
+    (($null -eq $Settings.InternalSenderAdminAddress) -or ($CurrentState.InternalSenderAdminAddress -eq $Settings.InternalSenderAdminAddress)) -and
+    ($CurrentState.EnableExternalSenderAdminNotifications -eq $Settings.EnableExternalSenderAdminNotifications) -and
+    (($null -eq $Settings.ExternalSenderAdminAddress) -or ($CurrentState.ExternalSenderAdminAddress -eq $Settings.ExternalSenderAdminAddress))
 
     $AcceptedDomains = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-AcceptedDomain'
 
     $RuleState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterRule' |
-    Where-Object -Property Name -EQ $RuleName |
-    Select-Object Name, MalwareFilterPolicy, Priority, RecipientDomainIs
+        Where-Object -Property Name -EQ $RuleName |
+        Select-Object Name, MalwareFilterPolicy, Priority, RecipientDomainIs
 
     $RuleStateIsCorrect = ($RuleState.Name -eq $RuleName) -and
-                          ($RuleState.MalwareFilterPolicy -eq $PolicyName) -and
-                          ($RuleState.Priority -eq 0) -and
-                          (!(Compare-Object -ReferenceObject $RuleState.RecipientDomainIs -DifferenceObject $AcceptedDomains.Name))
+    ($RuleState.MalwareFilterPolicy -eq $PolicyName) -and
+    ($RuleState.Priority -eq 0) -and
+    (!(Compare-Object -ReferenceObject $RuleState.RecipientDomainIs -DifferenceObject $AcceptedDomains.Name))
 
     if ($Settings.remediate -eq $true) {
 
@@ -122,7 +123,7 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
             $cmdParams = @{
                 EnableFileFilter                       = $true
                 FileTypes                              = $ExpectedFileTypes
-                FileTypeAction                         = $Settings.FileTypeAction
+                FileTypeAction                         = $FileTypeAction
                 ZapEnabled                             = $true
                 QuarantineTag                          = $Settings.QuarantineTag
                 EnableInternalSenderAdminNotifications = $Settings.EnableInternalSenderAdminNotifications