Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EXOMalwareFilterRule: Fix for issue #1213 #1215

Merged
merged 6 commits into from
May 26, 2021
Merged

EXOMalwareFilterRule: Fix for issue #1213 #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1ad0f9
Create MSFT_EXOOfflineAddressBook.psm1
stvnmbr1 May 12, 2021
719b1b3
Merge branch 'microsoft:Dev' into Dev
stvnmbr1 May 19, 2021
c3f55a1
Update MSFT_EXOMalwareFilterRule.psm1
stvnmbr1 May 19, 2021
61f79e3
Merge branch 'microsoft:Dev' into Dev
stvnmbr1 May 19, 2021
9c7f703
Update MSFT_EXOSafeAttachmentRule.psm1
stvnmbr1 May 19, 2021
0b9a463
Update MSFT_EXOSafeLinksRule.psm1
stvnmbr1 May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...les/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,15 @@ function Set-TargetResource
{
$MalwareFilterRuleParams.Remove('Enabled') | Out-Null
Write-Verbose -Message "Setting MalwareFilterRule $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $MalwareFilterRuleParams)"
Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
if ($MalwareFilterRuleParams.MalwareFilterPolicy -ne $MalwareFilterRule.MalwareFilterPolicy)
{
Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
}
else
{
$MalwareFilterRuleParams.Remove('MalwareFilterPolicy')
Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false
}
}
elseif (('Absent' -eq $Ensure ) -and ($null -ne $MalwareFilterRule))
{
Expand Down
29 changes: 22 additions & 7 deletions ...s/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,31 +283,46 @@ function Set-TargetResource
-InboundParameters $PSBoundParameters

$SafeAttachmentRules = Get-SafeAttachmentRule

$SafeAttachmentRule = $SafeAttachmentRules | Where-Object -FilterScript { $_.Identity -eq $Identity }
$SafeAttachmentRuleParams = [System.Collections.Hashtable]($PSBoundParameters)
$SafeAttachmentRuleParams.Remove('Ensure') | Out-Null
$SafeAttachmentRuleParams.Remove('GlobalAdminAccount') | Out-Null
$SafeAttachmentRuleParams.Remove('ApplicationId') | Out-Null
$SafeAttachmentRuleParams.Remove('TenantId') | Out-Null
$SafeAttachmentRuleParams.Remove('CertificateThumbprint') | Out-Null
$SafeAttachmentRuleParams.Remove('CertificatePath') | Out-Null
$SafeAttachmentRuleParams.Remove('CertificatePassword') | Out-Null

if (('Present' -eq $Ensure ) -and (-not $SafeAttachmentRule))
{
New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
}

if (('Present' -eq $Ensure ) -and ($SafeAttachmentRule))
elseif (('Present' -eq $Ensure ) -and ($SafeAttachmentRule))
{
if ($PSBoundParameters.Enabled -and ('Disabled' -eq $SafeAttachmentRule.State))
if ($SafeAttachmentRuleParams.Enabled -and ('Disabled' -eq $SafeAttachmentRule.State))
{
# New-SafeAttachmentRule has the Enabled parameter, Set-SafeAttachmentRule does not.
# There doesn't appear to be any way to change the Enabled state of a rule once created.
Write-Verbose -Message "Removing SafeAttachmentRule $($Identity) in order to change Enabled state."
Remove-SafeAttachmentRule -Identity $Identity -Confirm:$false
New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
New-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
}
else
{
Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $PSBoundParameters
}
if ($SafeAttachmentRuleParams.SafeAttachmentPolicy -ne $SafeAttachmentRule.SafeAttachmentPolicy)
{
Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
}
else
{
$SafeAttachmentRuleParams.Remove('SafeAttachmentPolicy')
Set-EXOSafeAttachmentRule -SafeAttachmentRuleParams $SafeAttachmentRuleParams
}
}
}

if (('Absent' -eq $Ensure ) -and ($SafeAttachmentRule))
elseif (('Absent' -eq $Ensure ) -and ($SafeAttachmentRule))
{
Write-Verbose -Message "Removing SafeAttachmentRule $($Identity)"
Remove-SafeAttachmentRule -Identity $Identity -Confirm:$false
Expand Down
20 changes: 18 additions & 2 deletions Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,16 @@ function Set-TargetResource
-InboundParameters $PSBoundParameters

$SafeLinksRules = Get-SafeLinksRule

$SafeLinksRule = $SafeLinksRules | Where-Object -FilterScript { $_.Identity -eq $Identity }
$SafeLinksRuleParams = [System.Collections.Hashtable]($PSBoundParameters)
$SafeLinksRuleParams.Remove('Ensure') | Out-Null
$SafeLinksRuleParams.Remove('GlobalAdminAccount') | Out-Null
$SafeLinksRuleParams.Remove('ApplicationId') | Out-Null
$SafeLinksRuleParams.Remove('TenantId') | Out-Null
$SafeLinksRuleParams.Remove('CertificateThumbprint') | Out-Null
$SafeLinksRuleParams.Remove('CertificatePath') | Out-Null
$SafeLinksRuleParams.Remove('CertificatePassword') | Out-Null


if (('Present' -eq $Ensure ) -and (-not $SafeLinksRule))
{
Expand All @@ -292,7 +300,15 @@ function Set-TargetResource
}
else
{
Set-EXOSafeLinksRule -SafeLinksRuleParams $PSBoundParameters
if ($SafeLinksRuleParams.SafeLinksPolicy -ne $SafeLinksRule.SafeLinksPolicy)
{
Set-EXOSafeLinksRule -SafeLinksRuleParams $SafeLinksRuleParams
}
else
{
$SafeLinksRuleParams.Remove('SafeLinksPolicy')
Set-EXOSafeLinksRule -SafeLinksRuleParams $SafeLinksRuleParams
}
}
}

Expand Down