Skip to content

Commit 3ba75b7

Browse files
KelvinTegelaarKelvinTegelaar
committed
pushing
1 parent a4a1e15 commit 3ba75b7

16 files changed

+44
-22
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,16 @@ function Invoke-CIPPStandardDisableOutlookAddins {
7171

7272
if ($Settings.alert -eq $true) {
7373
if ($RolesToRemove) {
74-
Write-StandardsAlert -message "Users are not disabled from installing Outlook add-ins." -object @{RolesToRemove = $RolesToRemove} -tenant $tenant -standardName 'DisableOutlookAddins' -standardId $Settings.standardId
74+
Write-StandardsAlert -message 'Users are not disabled from installing Outlook add-ins.' -object @{RolesToRemove = $RolesToRemove } -tenant $tenant -standardName 'DisableOutlookAddins' -standardId $Settings.standardId
7575
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are not disabled from installing Outlook add-ins.' -sev Info
7676
} else {
7777
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are disabled from installing Outlook add-ins.' -sev Info
7878
}
7979
}
8080
if ($Settings.report -eq $true) {
8181
$State = if ($RolesToRemove) { $false } else { $true }
82+
$StateForCompare = if ($RolesToRemove) { $RolesToRemove } else { $true }
83+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableOutlookAddins' -FieldValue $StateForCompare -TenantFilter $Tenant
8284
Add-CIPPBPAField -FieldName 'DisabledOutlookAddins' -FieldValue $State -StoreAs bool -Tenant $tenant
8385
}
8486
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ function Invoke-CIPPStandardDisableQRCodePin {
4747
if ($StateIsCorrect -eq $true) {
4848
Write-LogMessage -API 'Standards' -tenant $tenant -message 'QR Code Pin authentication method is not enabled' -sev Info
4949
} else {
50-
Write-StandardsAlert -message "QR Code Pin authentication method is enabled" -object $CurrentState -tenant $tenant -standardName 'DisableQRCodePin' -standardId $Settings.standardId
50+
Write-StandardsAlert -message 'QR Code Pin authentication method is enabled' -object $CurrentState -tenant $tenant -standardName 'DisableQRCodePin' -standardId $Settings.standardId
5151
Write-LogMessage -API 'Standards' -tenant $tenant -message 'QR Code Pin authentication method is enabled' -sev Info
5252
}
5353
}
5454

5555
if ($Settings.report -eq $true) {
56+
$state = $StateIsCorrect -eq $true ? $true : $CurrentState
57+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableQRCodePin' -FieldValue $state -TenantFilter $Tenant
5658
Add-CIPPBPAField -FieldName 'DisableQRCodePin' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
5759
}
5860
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ function Invoke-CIPPStandardDisableReshare {
5353
if ($Settings.alert -eq $true) {
5454

5555
if ($CurrentInfo.isResharingByExternalUsersEnabled) {
56-
Write-StandardsAlert -message "Guests are allowed to reshare files" -object $CurrentInfo -tenant $tenant -standardName 'DisableReshare' -standardId $Settings.standardId
56+
Write-StandardsAlert -message 'Guests are allowed to reshare files' -object $CurrentInfo -tenant $tenant -standardName 'DisableReshare' -standardId $Settings.standardId
5757
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Guests are allowed to reshare files' -sev Info
5858
} else {
5959
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Guests are not allowed to reshare files' -sev Info
6060
}
6161
}
6262

6363
if ($Settings.report -eq $true) {
64+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableReshare' -FieldValue $CurrentInfo.isResharingByExternalUsersEnabled -TenantFilter $Tenant
6465
Add-CIPPBPAField -FieldName 'DisableReshare' -FieldValue $CurrentInfo.isResharingByExternalUsersEnabled -StoreAs bool -Tenant $tenant
6566
}
6667
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ function Invoke-CIPPStandardDisableSMS {
4949
if ($StateIsCorrect -eq $true) {
5050
Write-LogMessage -API 'Standards' -tenant $tenant -message 'SMS authentication method is not enabled' -sev Info
5151
} else {
52-
Write-StandardsAlert -message "SMS authentication method is enabled" -object $CurrentState -tenant $tenant -standardName 'DisableSMS' -standardId $Settings.standardId
52+
Write-StandardsAlert -message 'SMS authentication method is enabled' -object $CurrentState -tenant $tenant -standardName 'DisableSMS' -standardId $Settings.standardId
5353
Write-LogMessage -API 'Standards' -tenant $tenant -message 'SMS authentication method is enabled' -sev Info
5454
}
5555
}
5656

5757
if ($Settings.report -eq $true) {
58+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableSMS' -FieldValue $StateIsCorrect -TenantFilter $Tenant
5859
Add-CIPPBPAField -FieldName 'DisableSMS' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
5960
}
6061
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ function Invoke-CIPPStandardDisableSecurityGroupUsers {
5353
if ($CurrentInfo.defaultUserRolePermissions.allowedToCreateSecurityGroups -eq $false) {
5454
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are not allowed to create Security Groups.' -sev Info
5555
} else {
56-
Write-StandardsAlert -message "Users are allowed to create Security Groups" -object $CurrentInfo -tenant $tenant -standardName 'DisableSecurityGroupUsers' -standardId $Settings.standardId
56+
Write-StandardsAlert -message 'Users are allowed to create Security Groups' -object $CurrentInfo -tenant $tenant -standardName 'DisableSecurityGroupUsers' -standardId $Settings.standardId
5757
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are allowed to create Security Groups.' -sev Info
5858
}
5959
}
6060

6161
if ($Settings.report -eq $true) {
62+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableSecurityGroupUsers' -FieldValue $CurrentInfo.defaultUserRolePermissions.allowedToCreateSecurityGroups -Tenant $tenant
6263
Add-CIPPBPAField -FieldName 'DisableSecurityGroupUsers' -FieldValue $CurrentInfo.defaultUserRolePermissions.allowedToCreateSecurityGroups -StoreAs bool -Tenant $tenant
6364
}
6465
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ function Invoke-CIPPStandardDisableSharePointLegacyAuth {
5555
if ($Settings.alert -eq $true) {
5656

5757
if ($CurrentInfo.isLegacyAuthProtocolsEnabled) {
58-
Write-StandardsAlert -message "SharePoint basic authentication is enabled" -object $CurrentInfo -tenant $tenant -standardName 'DisableSharePointLegacyAuth' -standardId $Settings.standardId
58+
Write-StandardsAlert -message 'SharePoint basic authentication is enabled' -object $CurrentInfo -tenant $tenant -standardName 'DisableSharePointLegacyAuth' -standardId $Settings.standardId
5959
Write-LogMessage -API 'Standards' -tenant $tenant -message 'SharePoint basic authentication is enabled' -sev Info
6060
} else {
6161
Write-LogMessage -API 'Standards' -tenant $tenant -message 'SharePoint basic authentication is disabled' -sev Info
6262
}
6363
}
6464
if ($Settings.report -eq $true) {
65-
65+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableSharePointLegacyAuth' -FieldValue $CurrentInfo.isLegacyAuthProtocolsEnabled -TenantFilter $Tenant
6666
Add-CIPPBPAField -FieldName 'SharePointLegacyAuthEnabled' -FieldValue $CurrentInfo.isLegacyAuthProtocolsEnabled -StoreAs bool -Tenant $tenant
6767
}
6868
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ function Invoke-CIPPStandardDisableSharedMailbox {
6464
}
6565

6666
if ($Settings.report -eq $true) {
67+
$state = $SharedMailboxList ? $SharedMailboxList : $true
68+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableSharedMailbox' -FieldValue $state -Tenant $tenant
6769
Add-CIPPBPAField -FieldName 'DisableSharedMailbox' -FieldValue $SharedMailboxList -StoreAs json -Tenant $tenant
6870
}
6971
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,14 @@ 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+
Write-StandardsAlert -message 'TNEF is not disabled for Default Remote Domain' -object $CurrentState -tenant $tenant -standardName 'DisableTNEF' -standardId $Settings.standardId
5757
Write-LogMessage -API 'Standards' -tenant $tenant -message 'TNEF is not disabled for Default Remote Domain' -sev Info
5858
}
5959
}
6060

6161
if ($Settings.report -eq $true) {
6262
$State = if ($CurrentState.TNEFEnabled -ne $false) { $false } else { $true }
63+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableTNEF' -FieldValue $State -Tenant $tenant
6364
Add-CIPPBPAField -FieldName 'TNEFDisabled' -FieldValue $State -StoreAs bool -Tenant $tenant
6465
}
6566

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ function Invoke-CIPPStandardDisableTenantCreation {
4242
} else {
4343
try {
4444
$GraphRequest = @{
45-
tenantid = $tenant
46-
uri = 'https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy'
47-
AsApp = $false
48-
Type = 'PATCH'
45+
tenantid = $tenant
46+
uri = 'https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy'
47+
AsApp = $false
48+
Type = 'PATCH'
4949
ContentType = 'application/json'
50-
Body = '{"defaultUserRolePermissions":{"allowedToCreateTenants":false}}'
50+
Body = '{"defaultUserRolePermissions":{"allowedToCreateTenants":false}}'
5151
}
5252
New-GraphPostRequest @GraphRequest
5353
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Disabled users from creating tenants.' -sev Info
5454
} catch {
55-
Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to disable users from creating tenants" -sev 'Error' -LogData $_
55+
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Failed to disable users from creating tenants' -sev 'Error' -LogData $_
5656
}
5757
}
5858
}
@@ -61,12 +61,13 @@ function Invoke-CIPPStandardDisableTenantCreation {
6161
if ($StateIsCorrect -eq $true) {
6262
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are not allowed to create tenants.' -sev Info
6363
} else {
64-
Write-StandardsAlert -message "Users are allowed to create tenants" -object $CurrentState -tenant $tenant -standardName 'DisableTenantCreation' -standardId $Settings.standardId
64+
Write-StandardsAlert -message 'Users are allowed to create tenants' -object $CurrentState -tenant $tenant -standardName 'DisableTenantCreation' -standardId $Settings.standardId
6565
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Users are allowed to create tenants.' -sev Info
6666
}
6767
}
6868

6969
if ($Settings.report -eq $true) {
70+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableTenantCreation' -FieldValue $StateIsCorrect -TenantFilter $Tenant
7071
Add-CIPPBPAField -FieldName 'DisableTenantCreation' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
7172
}
7273
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ function Invoke-CIPPStandardDisableUserSiteCreate {
5454
if ($CurrentInfo.isSiteCreationEnabled -eq $false -and $CurrentInfo.isSiteCreationUIEnabled -eq $false) {
5555
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Standard users are not allowed to create sites and UI setting is disabled' -sev Info
5656
} else {
57-
Write-StandardsAlert -message "Standard users are allowed to create sites or UI setting is enabled" -object $CurrentInfo -tenant $tenant -standardName 'DisableUserSiteCreate' -standardId $Settings.standardId
57+
Write-StandardsAlert -message 'Standard users are allowed to create sites or UI setting is enabled' -object $CurrentInfo -tenant $tenant -standardName 'DisableUserSiteCreate' -standardId $Settings.standardId
5858
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Standard users are allowed to create sites or UI setting is enabled' -sev Info
5959
}
6060
}
6161

6262
if ($Settings.report -eq $true) {
63+
$state = $CurrentInfo.isSiteCreationEnabled -and $CurrentInfo.isSiteCreationUIEnabled ? $true : $CurrentInfo
64+
Set-CIPPStandardsCompareField -FieldName 'standards.DisableTNEF' -FieldValue $State -Tenant $tenant
6365
Add-CIPPBPAField -FieldName 'DisableUserSiteCreate' -FieldValue $CurrentInfo.isSiteCreationEnabled -StoreAs bool -Tenant $tenant
6466
Add-CIPPBPAField -FieldName 'DisableUserSiteCreateUI' -FieldValue $CurrentInfo.isSiteCreationUIEnabled -StoreAs bool -Tenant $tenant
6567
}

0 commit comments

Comments
 (0)