Skip to content

Commit 6eed3e7

Browse files
OfficialEscoOfficialEsco
committed
fix: SafeLinks,SafeAttachment,Malware policy tweaks
1 parent 9351db8 commit 6eed3e7

4 files changed

Lines changed: 106 additions & 70 deletions

File tree

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

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,24 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
4141
param($Tenant, $Settings)
4242
##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'MalwareFilterPolicy'
4343

44-
$PolicyName = 'Default Malware Policy'
44+
$PolicyList = @('CIPP Default Malware Policy','Default Malware Policy')
45+
$ExistingPolicy = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterPolicy' | Where-Object -Property Name -In $PolicyList
46+
if ($null -eq $ExistingPolicy.Name) {
47+
$PolicyName = $PolicyList[0]
48+
} else {
49+
$PolicyName = $ExistingPolicy.Name
50+
}
51+
$RuleList = @( 'CIPP Default Malware Rule','CIPP Default Malware Policy')
52+
$ExistingRule = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterRule' | Where-Object -Property Name -In $RuleList
53+
if ($null -eq $ExistingRule.Name) {
54+
$RuleName = $RuleList[0]
55+
} else {
56+
$RuleName = $ExistingRule.Name
57+
}
4558

4659
$CurrentState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterPolicy' |
47-
Where-Object -Property Name -EQ $PolicyName |
48-
Select-Object Name, EnableFileFilter, FileTypeAction, FileTypes, ZapEnabled, QuarantineTag, EnableInternalSenderAdminNotifications, InternalSenderAdminAddress, EnableExternalSenderAdminNotifications, ExternalSenderAdminAddress
60+
Where-Object -Property Name -EQ $PolicyName |
61+
Select-Object Name, EnableFileFilter, FileTypeAction, FileTypes, ZapEnabled, QuarantineTag, EnableInternalSenderAdminNotifications, InternalSenderAdminAddress, EnableExternalSenderAdminNotifications, ExternalSenderAdminAddress
4962

5063
$DefaultFileTypes = @('ace', 'ani', 'apk', 'app', 'appx', 'arj', 'bat', 'cab', 'cmd', 'com', 'deb', 'dex', 'dll', 'docm', 'elf', 'exe', 'hta', 'img', 'iso', 'jar', 'jnlp', 'kext', 'lha', 'lib', 'library', 'lnk', 'lzh', 'macho', 'msc', 'msi', 'msix', 'msp', 'mst', 'pif', 'ppa', 'ppam', 'reg', 'rev', 'scf', 'scr', 'sct', 'sys', 'uif', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh', 'xll', 'xz', 'z')
5164

@@ -69,10 +82,10 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
6982
$AcceptedDomains = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-AcceptedDomain'
7083

7184
$RuleState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MalwareFilterRule' |
72-
Where-Object -Property Name -EQ "CIPP $PolicyName" |
73-
Select-Object Name, MalwareFilterPolicy, Priority, RecipientDomainIs
85+
Where-Object -Property Name -EQ $RuleName |
86+
Select-Object Name, MalwareFilterPolicy, Priority, RecipientDomainIs
7487

75-
$RuleStateIsCorrect = ($RuleState.Name -eq "CIPP $PolicyName") -and
88+
$RuleStateIsCorrect = ($RuleState.Name -eq $RuleName) -and
7689
($RuleState.MalwareFilterPolicy -eq $PolicyName) -and
7790
($RuleState.Priority -eq 0) -and
7891
(!(Compare-Object -ReferenceObject $RuleState.RecipientDomainIs -DifferenceObject $AcceptedDomains.Name))
@@ -98,47 +111,46 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
98111
try {
99112
$cmdparams.Add('Identity', $PolicyName)
100113
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-MalwareFilterPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
101-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Updated Malware Filter Policy' -sev Info
114+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Malware Filter policy $PolicyName." -sev Info
102115
} catch {
103-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
104-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Malware Filter Policy. Error: $ErrorMessage" -sev Error
116+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Malware Filter policy $PolicyName." -sev Error -LogData $_
105117
}
106118
} else {
107119
try {
108120
$cmdparams.Add('Name', $PolicyName)
109121
New-ExoRequest -tenantid $Tenant -cmdlet 'New-MalwareFilterPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
110-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Created Malware Filter Policy' -sev Info
122+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Malware Filter policy $PolicyName." -sev Info
111123
} catch {
112-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
113-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Malware Filter Policy. Error: $ErrorMessage" -sev Error
124+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Malware Filter policy $PolicyName." -sev Error -LogData $_
114125
}
115126
}
116127
}
117128

118129
if ($RuleStateIsCorrect -eq $false) {
119130
$cmdparams = @{
120-
MalwareFilterPolicy = $PolicyName
121131
Priority = 0
122132
RecipientDomainIs = $AcceptedDomains.Name
123133
}
124134

125-
if ($RuleState.Name -eq "CIPP $PolicyName") {
135+
if ($RuleState.MalwareFilterPolicy -ne $PolicyName) {
136+
$cmdparams.Add('MalwareFilterPolicy', $PolicyName)
137+
}
138+
139+
if ($RuleState.Name -eq $RuleName) {
126140
try {
127-
$cmdparams.Add('Identity', "CIPP $PolicyName")
141+
$cmdparams.Add('Identity', $RuleName)
128142
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-MalwareFilterRule' -cmdparams $cmdparams -UseSystemMailbox $true
129-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Updated Malware Filter Rule' -sev Info
143+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Malware Filter rule $RuleName." -sev Info
130144
} catch {
131-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
132-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Malware Filter Rule. Error: $ErrorMessage" -sev Error
145+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Malware Filter Rule $RuleName." -sev Error -LogData $_
133146
}
134147
} else {
135148
try {
136-
$cmdparams.Add('Name', "CIPP $PolicyName")
149+
$cmdparams.Add('Name', $RuleName)
137150
New-ExoRequest -tenantid $Tenant -cmdlet 'New-MalwareFilterRule' -cmdparams $cmdparams -UseSystemMailbox $true
138-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Created Malware Filter Rule' -sev Info
151+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Malware Filter rule $RuleName." -sev Info
139152
} catch {
140-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
141-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Malware Filter Rule. Error: $ErrorMessage" -sev Error
153+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Malware Filter rule $RuleName." -sev Error -LogData $_
142154
}
143155
}
144156
}

‎Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,24 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
3838
param($Tenant, $Settings)
3939
##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'SafeAttachmentPolicy'
4040

41-
$PolicyName = 'Default Safe Attachment Policy'
41+
$PolicyList = @('CIPP Default Safe Attachment Policy','Default Safe Attachment Policy')
42+
$ExistingPolicy = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentPolicy' | Where-Object -Property Name -In $PolicyList
43+
if ($null -eq $ExistingPolicy.Name) {
44+
$PolicyName = $PolicyList[0]
45+
} else {
46+
$PolicyName = $ExistingPolicy.Name
47+
}
48+
$RuleList = @( 'CIPP Default Safe Attachment Rule','CIPP Default Safe Attachment Policy')
49+
$ExistingRule = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentRule' | Where-Object -Property Name -In $RuleList
50+
if ($null -eq $ExistingRule.Name) {
51+
$RuleName = $RuleList[0]
52+
} else {
53+
$RuleName = $ExistingRule.Name
54+
}
4255

4356
$CurrentState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentPolicy' |
44-
Where-Object -Property Name -EQ $PolicyName |
45-
Select-Object Name, Enable, Action, QuarantineTag, Redirect, RedirectAddress
57+
Where-Object -Property Name -EQ $PolicyName |
58+
Select-Object Name, Enable, Action, QuarantineTag, Redirect, RedirectAddress
4659

4760
$StateIsCorrect = ($CurrentState.Name -eq $PolicyName) -and
4861
($CurrentState.Enable -eq $true) -and
@@ -54,10 +67,10 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
5467
$AcceptedDomains = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-AcceptedDomain'
5568

5669
$RuleState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentRule' |
57-
Where-Object -Property Name -EQ "CIPP $PolicyName" |
58-
Select-Object Name, SafeAttachmentPolicy, Priority, RecipientDomainIs
70+
Where-Object -Property Name -EQ $RuleName |
71+
Select-Object Name, SafeAttachmentPolicy, Priority, RecipientDomainIs
5972

60-
$RuleStateIsCorrect = ($RuleState.Name -eq "CIPP $PolicyName") -and
73+
$RuleStateIsCorrect = ($RuleState.Name -eq $RuleName) -and
6174
($RuleState.SafeAttachmentPolicy -eq $PolicyName) -and
6275
($RuleState.Priority -eq 0) -and
6376
(!(Compare-Object -ReferenceObject $RuleState.RecipientDomainIs -DifferenceObject $AcceptedDomains.Name))
@@ -79,47 +92,46 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
7992
try {
8093
$cmdparams.Add('Identity', $PolicyName)
8194
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-SafeAttachmentPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
82-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Updated Safe Attachment Policy' -sev Info
95+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Safe Attachment policy $PolicyName." -sev Info
8396
} catch {
84-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
85-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Safe Attachment Policy. Error: $ErrorMessage" -sev Error
97+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Safe Attachment policy $PolicyName." -sev Error -LogData $_
8698
}
8799
} else {
88100
try {
89101
$cmdparams.Add('Name', $PolicyName)
90102
New-ExoRequest -tenantid $Tenant -cmdlet 'New-SafeAttachmentPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
91-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Created Safe Attachment Policy' -sev Info
103+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Safe Attachment policy $PolicyName." -sev Info
92104
} catch {
93-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
94-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Safe Attachment Policy. Error: $ErrorMessage" -sev Error
105+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Safe Attachment policy $PolicyName." -sev Error -LogData $_
95106
}
96107
}
97108
}
98109

99110
if ($RuleStateIsCorrect -eq $false) {
100111
$cmdparams = @{
101-
SafeAttachmentPolicy = $PolicyName
102112
Priority = 0
103113
RecipientDomainIs = $AcceptedDomains.Name
104114
}
105115

106-
if ($RuleState.Name -eq "CIPP $PolicyName") {
116+
if ($RuleState.SafeAttachmentPolicy -ne $PolicyName) {
117+
$cmdparams.Add('SafeAttachmentPolicy', $PolicyName)
118+
}
119+
120+
if ($RuleState.Name -eq $RuleName) {
107121
try {
108-
$cmdparams.Add('Identity', "CIPP $PolicyName")
122+
$cmdparams.Add('Identity', $RuleName)
109123
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-SafeAttachmentRule' -cmdparams $cmdparams -UseSystemMailbox $true
110-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Updated Safe Attachment Rule' -sev Info
124+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Safe Attachment rule $RuleName." -sev Info
111125
} catch {
112-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
113-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Safe Attachment Rule. Error: $ErrorMessage" -sev Error
126+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Safe Attachment rule $RuleName." -sev Error -LogData $_
114127
}
115128
} else {
116129
try {
117-
$cmdparams.Add('Name', "CIPP $PolicyName")
130+
$cmdparams.Add('Name', $RuleName)
118131
New-ExoRequest -tenantid $Tenant -cmdlet 'New-SafeAttachmentRule' -cmdparams $cmdparams -UseSystemMailbox $true
119-
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Created Safe Attachment Rule' -sev Info
132+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Safe Attachment rule $RuleName." -sev Info
120133
} catch {
121-
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
122-
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Safe Attachment Rule. Error: $ErrorMessage" -sev Error
134+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Safe Attachment rule $RuleName." -sev Error -LogData $_
123135
}
124136
}
125137
}

0 commit comments

Comments
 (0)