Skip to content

Commit 606c026

Browse files
JohnDupreyJohnDuprey
committed
updated standard alert objects
1 parent e7bc5be commit 606c026

8 files changed

+27
-16
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ function Invoke-CIPPStandardDisableAdditionalStorageProviders {
5454

5555
if ($Settings.alert -eq $true) {
5656
if ($AdditionalStorageProvidersState.AdditionalStorageProvidersAvailable) {
57-
Write-StandardsAlert -message 'OWA additional storage providers are enabled' -object $AdditionalStorageProvidersState -tenant $tenant -standardName 'DisableAdditionalStorageProviders' -standardId $Settings.standardId
57+
$Object = $AdditionalStorageProvidersState | Select-Object -Property AdditionalStorageProvidersAvailable
58+
Write-StandardsAlert -message 'OWA additional storage providers are enabled' -object $Object -tenant $tenant -standardName 'DisableAdditionalStorageProviders' -standardId $Settings.standardId
5859
Write-LogMessage -API 'Standards' -tenant $tenant -message 'OWA additional storage providers are enabled' -sev Info
5960
} else {
6061
Write-LogMessage -API 'Standards' -tenant $tenant -message 'OWA additional storage providers are disabled' -sev Info

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ function Invoke-CIPPStandardDisableTNEF {
5353
if ($CurrentState.TNEFEnabled -eq $false) {
5454
Write-LogMessage -API 'Standards' -tenant $tenant -message 'TNEF is disabled for Default Remote Domain' -sev Info
5555
} else {
56-
Write-StandardsAlert -message 'TNEF is not disabled for Default Remote Domain' -object $CurrentState -tenant $tenant -standardName 'DisableTNEF' -standardId $Settings.standardId
56+
$Object = $CurrentState | Select-Object -Property TNEFEnabled
57+
Write-StandardsAlert -message 'TNEF is not disabled for Default Remote Domain' -object $Object -tenant $tenant -standardName 'DisableTNEF' -standardId $Settings.standardId
5758
Write-LogMessage -API 'Standards' -tenant $tenant -message 'TNEF is not disabled for Default Remote Domain' -sev Info
5859
}
5960
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardGlobalQuarantineNotifications {
4040
'PT4H' { New-TimeSpan -Hours 4 }
4141
'P1D' { New-TimeSpan -Days 1 }
4242
'P7D' { New-TimeSpan -Days 7 }
43-
Default { $null }
43+
default { $null }
4444
}
4545

4646

@@ -53,7 +53,7 @@ function Invoke-CIPPStandardGlobalQuarantineNotifications {
5353
} catch {
5454
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
5555
Write-LogMessage -API 'Standards' -tenant $Tenant -message "GlobalQuarantineNotifications: Invalid NotificationInterval parameter set. Error: $ErrorMessage" -sev Error
56-
Return
56+
return
5757
}
5858

5959
if ($Settings.remediate -eq $true) {
@@ -77,7 +77,8 @@ function Invoke-CIPPStandardGlobalQuarantineNotifications {
7777
if ($CurrentState.EndUserSpamNotificationFrequency -eq $WantedState) {
7878
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Global Quarantine Notifications are set to the desired value of $WantedState" -sev Info
7979
} else {
80-
Write-StandardsAlert -message "Global Quarantine Notifications are not set to the desired value of $WantedState" -object $CurrentState -tenant $Tenant -standardName 'GlobalQuarantineNotifications' -standardId $Settings.standardId
80+
$Object = $CurrentState | Select-Object -Property * -ExcludeProperty '*@odata.type'
81+
Write-StandardsAlert -message "Global Quarantine Notifications are not set to the desired value of $WantedState" -object $Object -tenant $Tenant -standardName 'GlobalQuarantineNotifications' -standardId $Settings.standardId
8182
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Global Quarantine Notifications are not set to the desired value of $WantedState" -sev Info
8283
}
8384
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ function Invoke-CIPPStandardGuestInvite {
6868
if ($StateIsCorrect -eq $true) {
6969
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Guest Invite settings is enabled.' -sev Info
7070
} else {
71-
Write-StandardsAlert -message 'Guest Invite settings is not enabled' -object $CurrentState -tenant $tenant -standardName 'GuestInvite' -standardId $Settings.standardId
71+
$Object = $CurrentState | Select-Object -Property allowInvitesFrom
72+
Write-StandardsAlert -message 'Guest Invite settings is not enabled' -object $Object -tenant $tenant -standardName 'GuestInvite' -standardId $Settings.standardId
7273
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Guest Invite settings is not enabled.' -sev Info
7374
}
7475
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Invoke-CIPPStandardMailContacts {
3939
$contacts = $settings
4040
$TechAndSecurityContacts = @($Contacts.SecurityContact, $Contacts.TechContact)
4141

42-
If ($Settings.remediate -eq $true) {
42+
if ($Settings.remediate -eq $true) {
4343
$state = $CurrentInfo.marketingNotificationEmails -eq $Contacts.MarketingContact -and `
4444
($CurrentInfo.securityComplianceNotificationMails -in $TechAndSecurityContacts -or
4545
$CurrentInfo.technicalNotificationMails -in $TechAndSecurityContacts) -and `
@@ -70,25 +70,29 @@ function Invoke-CIPPStandardMailContacts {
7070
if ($CurrentInfo.marketingNotificationEmails -eq $Contacts.MarketingContact) {
7171
Write-LogMessage -API 'Standards' -tenant $tenant -message "Marketing contact email is set to $($Contacts.MarketingContact)" -sev Info
7272
} else {
73-
Write-StandardsAlert -message "Marketing contact email is not set to $($Contacts.MarketingContact)" -object $CurrentInfo -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
73+
$Object = $CurrentInfo | Select-Object marketingNotificationEmails
74+
Write-StandardsAlert -message "Marketing contact email is not set to $($Contacts.MarketingContact)" -object $Object -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
7475
Write-LogMessage -API 'Standards' -tenant $tenant -message "Marketing contact email is not set to $($Contacts.MarketingContact)" -sev Info
7576
}
7677
if ($CurrentInfo.securityComplianceNotificationMails -eq $Contacts.SecurityContact) {
7778
Write-LogMessage -API 'Standards' -tenant $tenant -message "Security contact email is set to $($Contacts.SecurityContact)" -sev Info
7879
} else {
79-
Write-StandardsAlert -message "Security contact email is not set to $($Contacts.SecurityContact)" -object $CurrentInfo -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
80+
$Object = $CurrentInfo | Select-Object securityComplianceNotificationMails
81+
Write-StandardsAlert -message "Security contact email is not set to $($Contacts.SecurityContact)" -object $Object -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
8082
Write-LogMessage -API 'Standards' -tenant $tenant -message "Security contact email is not set to $($Contacts.SecurityContact)" -sev Info
8183
}
8284
if ($CurrentInfo.technicalNotificationMails -eq $Contacts.TechContact) {
8385
Write-LogMessage -API 'Standards' -tenant $tenant -message "Technical contact email is set to $($Contacts.TechContact)" -sev Info
8486
} else {
85-
Write-StandardsAlert -message "Technical contact email is not set to $($Contacts.TechContact)" -object $CurrentInfo -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
87+
$Object = $CurrentInfo | Select-Object technicalNotificationMails
88+
Write-StandardsAlert -message "Technical contact email is not set to $($Contacts.TechContact)" -object $Object -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
8689
Write-LogMessage -API 'Standards' -tenant $tenant -message "Technical contact email is not set to $($Contacts.TechContact)" -sev Info
8790
}
8891
if ($CurrentInfo.privacyProfile.contactEmail -eq $Contacts.GeneralContact) {
8992
Write-LogMessage -API 'Standards' -tenant $tenant -message "General contact email is set to $($Contacts.GeneralContact)" -sev Info
9093
} else {
91-
Write-StandardsAlert -message "General contact email is not set to $($Contacts.GeneralContact)" -object $CurrentInfo -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
94+
$Object = $CurrentInfo | Select-Object privacyProfile
95+
Write-StandardsAlert -message "General contact email is not set to $($Contacts.GeneralContact)" -object $Object -tenant $tenant -standardName 'MailContacts' -standardId $Settings.standardId
9296
Write-LogMessage -API 'Standards' -tenant $tenant -message "General contact email is not set to $($Contacts.GeneralContact)" -sev Info
9397
}
9498

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function Invoke-CIPPStandardMessageExpiration {
3232

3333
$MessageExpiration = (New-ExoRequest -tenantid $Tenant -cmdlet 'Get-TransportConfig').messageExpiration
3434

35-
If ($Settings.remediate -eq $true) {
35+
if ($Settings.remediate -eq $true) {
3636
Write-Host 'Time to remediate'
3737
if ($MessageExpiration -ne '12:00:00') {
3838
try {
@@ -51,7 +51,8 @@ function Invoke-CIPPStandardMessageExpiration {
5151
if ($MessageExpiration -eq '12:00:00') {
5252
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Transport configuration message expiration is set to 12 hours' -sev Info
5353
} else {
54-
Write-StandardsAlert -message 'Transport configuration message expiration is not set to 12 hours' -object $MessageExpiration -tenant $tenant -standardName 'MessageExpiration' -standardId $Settings.standardId
54+
$Object = [PSCustomObject]@{ MessageExpiration = $MessageExpiration }
55+
Write-StandardsAlert -message 'Transport configuration message expiration is not set to 12 hours' -object $Object -tenant $tenant -standardName 'MessageExpiration' -standardId $Settings.standardId
5556
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Transport configuration message expiration is not set to 12 hours' -sev Info
5657
}
5758
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ function Invoke-CIPPStandardOutBoundSpamAlert {
5555
if ($CurrentInfo.NotifyOutboundSpam -eq $true) {
5656
Write-LogMessage -API 'Standards' -tenant $tenant -message "Outbound spam filter alert is set to $($CurrentInfo.NotifyOutboundSpamRecipients)" -sev Info
5757
} else {
58-
Write-StandardsAlert -message 'Outbound spam filter alert is not set' -object $CurrentInfo -tenant $tenant -standardName 'OutBoundSpamAlert' -standardId $Settings.standardId
58+
$Object = $CurrentInfo | Select-Object -Property NotifyOutboundSpamRecipients, NotifyOutboundSpam
59+
Write-StandardsAlert -message 'Outbound spam filter alert is not set' -object $Object -tenant $tenant -standardName 'OutBoundSpamAlert' -standardId $Settings.standardId
5960
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Outbound spam filter alert is not set' -sev Info
6061
}
6162
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Invoke-CIPPStandardTAP {
3939
if ($null -eq $config) { $config = $True }
4040

4141
$StateIsCorrect = ($CurrentState.state -eq 'enabled') -and
42-
([System.Convert]::ToBoolean($CurrentState.isUsableOnce) -eq [System.Convert]::ToBoolean($config))
42+
([System.Convert]::ToBoolean($CurrentState.isUsableOnce) -eq [System.Convert]::ToBoolean($config))
4343

4444
if ($Settings.remediate -eq $true) {
4545
if ($StateIsCorrect -eq $true) {
@@ -56,7 +56,8 @@ function Invoke-CIPPStandardTAP {
5656
if ($StateIsCorrect -eq $true) {
5757
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Temporary Access Passwords is enabled.' -sev Info
5858
} else {
59-
Write-StandardsAlert -message 'Temporary Access Passwords is not enabled.' -object $CurrentState -tenant $Tenant -standardName 'TAP' -standardId $Settings.standardId
59+
$Object = $CurrentState | Select-Object -Property state, isUsableOnce, defaultLifetimeInMinutes, defaultLength, maximumLifetimeInMinutes
60+
Write-StandardsAlert -message 'Temporary Access Passwords is not enabled.' -object $Object -tenant $Tenant -standardName 'TAP' -standardId $Settings.standardId
6061
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Temporary Access Passwords is not enabled.' -sev Info
6162
}
6263
}

0 commit comments

Comments
 (0)