Skip to content

Commit 270b54c

Browse files
Merge pull request KelvinTegelaar#1381 from Ren-Roros-Digital/spelling
chore: Standards capitalization and spelling
2 parents 6d53fcd + 2765cc0 commit 270b54c

File tree

36 files changed

+203
-143
lines changed

36 files changed

+203
-143
lines changed

Config/standards.json

Lines changed: 54 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
"name": "standards.DisableBasicAuthSMTP",
218218
"cat": "Global Standards",
219219
"tag": [],
220-
"helpText": "Disables SMTP AUTH for the organization and all users. This is the default for new tenants. ",
220+
"helpText": "Disables SMTP AUTH for the organization and all users. This is the default for new tenants.",
221221
"docsDescription": "Disables SMTP basic authentication for the tenant and all users with it explicitly enabled.",
222222
"addedComponent": [],
223223
"label": "Disable SMTP Basic Authentication",
@@ -546,7 +546,7 @@
546546
"name": "standards.DisableTenantCreation",
547547
"cat": "Entra (AAD) Standards",
548548
"tag": ["CIS"],
549-
"helpText": "Restricts creation of M365 tenants to the Global Administrator or Tenant Creator roles. ",
549+
"helpText": "Restricts creation of M365 tenants to the Global Administrator or Tenant Creator roles.",
550550
"docsDescription": "Users by default are allowed to create M365 tenants. This disables that so only admins can create new M365 tenants.",
551551
"addedComponent": [],
552552
"label": "Disable M365 Tenant creation by users",
@@ -772,7 +772,7 @@
772772
"impact": "Medium Impact",
773773
"impactColour": "warning",
774774
"addedDate": "2024-11-12",
775-
"powershellEquivalent": "",
775+
"powershellEquivalent": "Graph API",
776776
"recommendedBy": []
777777
},
778778
{
@@ -785,7 +785,7 @@
785785
{
786786
"type": "number",
787787
"name": "standards.StaleEntraDevices.deviceAgeThreshold",
788-
"label": "Days before stale(Dont set below 30)"
788+
"label": "Days before stale(Do not set below 30)"
789789
}
790790
],
791791
"disabledFeatures": {
@@ -1687,11 +1687,46 @@
16871687
"powershellEquivalent": "New-ProtectionAlert and Set-ProtectionAlert",
16881688
"recommendedBy": []
16891689
},
1690+
{
1691+
"name": "standards.SharePointMassDeletionAlert",
1692+
"cat": "Defender Standards",
1693+
"tag": [],
1694+
"helpText": "Sets a e-mail address to alert when a User deletes more than 20 SharePoint files within 60 minutes. NB: Requires a Office 365 E5 subscription, Office 365 E3 with Threat Intelligence or Office 365 EquivioAnalytics add-on.",
1695+
"docsDescription": "Sets a e-mail address to alert when a User deletes more than 20 SharePoint files within 60 minutes. This is useful for monitoring and ensuring that the correct SharePoint files are deleted. NB: Requires a Office 365 E5 subscription, Office 365 E3 with Threat Intelligence or Office 365 EquivioAnalytics add-on.",
1696+
"addedComponent": [
1697+
{
1698+
"type": "number",
1699+
"name": "standards.SharePointMassDeletionAlert.Threshold",
1700+
"label": "Max files to delete within the time frame",
1701+
"defaultValue": 20
1702+
},
1703+
{
1704+
"type": "number",
1705+
"name": "standards.SharePointMassDeletionAlert.TimeWindow",
1706+
"label": "Time frame in minutes",
1707+
"defaultValue": 60
1708+
},
1709+
{
1710+
"type": "autoComplete",
1711+
"multiple": true,
1712+
"creatable": true,
1713+
"required": true,
1714+
"name": "standards.SharePointMassDeletionAlert.NotifyUser",
1715+
"label": "E-mail to receive the alert"
1716+
}
1717+
],
1718+
"label": "SharePoint Mass Deletion Alert",
1719+
"impact": "Low Impact",
1720+
"impactColour": "info",
1721+
"addedDate": "2025-04-07",
1722+
"powershellEquivalent": "New-ProtectionAlert and Set-ProtectionAlert",
1723+
"recommendedBy": []
1724+
},
16901725
{
16911726
"name": "standards.SafeLinksPolicy",
16921727
"cat": "Defender Standards",
16931728
"tag": ["CIS", "mdo_safelinksforemail", "mdo_safelinksforOfficeApps"],
1694-
"helpText": "This creates a safelink policy that automatically scans, tracks, and and enables safe links for Email, Office, and Teams for both external and internal senders",
1729+
"helpText": "This creates a Safe Links policy that automatically scans, tracks, and and enables safe links for Email, Office, and Teams for both external and internal senders",
16951730
"addedComponent": [
16961731
{
16971732
"type": "switch",
@@ -1717,7 +1752,7 @@
17171752
"label": "Do not rewrite the following URLs in email"
17181753
}
17191754
],
1720-
"label": "Default SafeLinks Policy",
1755+
"label": "Default Safe Links Policy",
17211756
"impact": "Low Impact",
17221757
"impactColour": "info",
17231758
"addedDate": "2024-03-25",
@@ -1737,7 +1772,7 @@
17371772
"mdo_antiphishingpolicies",
17381773
"mdo_phishthresholdlevel"
17391774
],
1740-
"helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mailtips.",
1775+
"helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mail tips.",
17411776
"addedComponent": [
17421777
{
17431778
"type": "number",
@@ -1930,18 +1965,13 @@
19301965
"impact": "Low Impact",
19311966
"impactColour": "info",
19321967
"addedDate": "2024-03-25",
1933-
"powershellEquivalent": "Set-AntiphishPolicy or New-AntiphishPolicy",
1968+
"powershellEquivalent": "Set-AntiPhishPolicy or New-AntiPhishPolicy",
19341969
"recommendedBy": ["CIS"]
19351970
},
19361971
{
19371972
"name": "standards.SafeAttachmentPolicy",
19381973
"cat": "Defender Standards",
1939-
"tag": [
1940-
"CIS",
1941-
"mdo_safedocuments",
1942-
"mdo_commonattachmentsfilter",
1943-
"mdo_safeattachmentpolicy"
1944-
],
1974+
"tag": ["CIS", "mdo_safedocuments", "mdo_commonattachmentsfilter", "mdo_safeattachmentpolicy"],
19451975
"helpText": "This creates a Safe Attachment policy",
19461976
"addedComponent": [
19471977
{
@@ -2576,7 +2606,7 @@
25762606
"impact": "Low Impact",
25772607
"impactColour": "info",
25782608
"addedDate": "2024-11-12",
2579-
"powershellEquivalent": "",
2609+
"powershellEquivalent": "Graph API",
25802610
"recommendedBy": []
25812611
},
25822612
{
@@ -2709,7 +2739,7 @@
27092739
"cat": "Intune Standards",
27102740
"tag": [],
27112741
"helpText": "Requires MFA for all users to register devices with Intune. This is useful when not using Conditional Access.",
2712-
"label": "Require Multifactor Authentication to register or join devices with Microsoft Entra",
2742+
"label": "Require Multi-factor Authentication to register or join devices with Microsoft Entra",
27132743
"impact": "Medium Impact",
27142744
"impactColour": "warning",
27152745
"addedDate": "2023-10-23",
@@ -2817,7 +2847,7 @@
28172847
"impactColour": "info",
28182848
"addedDate": "2024-07-09",
28192849
"powershellEquivalent": "Set-SPOTenant -EnableAzureADB2BIntegration $true",
2820-
"recommendedBy": ["CIS 3.0"]
2850+
"recommendedBy": ["CIS"]
28212851
},
28222852
{
28232853
"name": "standards.SPDisallowInfectedFiles",
@@ -2875,7 +2905,7 @@
28752905
"impactColour": "warning",
28762906
"addedDate": "2024-07-09",
28772907
"powershellEquivalent": "Set-SPOTenant -ExternalUserExpireInDays 30 -ExternalUserExpirationRequired $True",
2878-
"recommendedBy": ["CIS 3.0"]
2908+
"recommendedBy": ["CIS"]
28792909
},
28802910
{
28812911
"name": "standards.SPEmailAttestation",
@@ -3017,7 +3047,7 @@
30173047
"helpText": "Disables the ability for external users to share files they don't own. Sharing links can only be made for People with existing access",
30183048
"docsDescription": "Disables the ability for external users to share files they don't own. Sharing links can only be made for People with existing access. This is a tenant wide setting and overrules any settings set on the site level",
30193049
"addedComponent": [],
3020-
"label": "Disable Resharing by External Users",
3050+
"label": "Disable Re-sharing by External Users",
30213051
"impact": "High Impact",
30223052
"impactColour": "danger",
30233053
"addedDate": "2022-06-15",
@@ -3193,7 +3223,7 @@
31933223
"impactColour": "info",
31943224
"addedDate": "2024-11-12",
31953225
"powershellEquivalent": "Set-CsTeamsMeetingPolicy -AllowAnonymousUsersToJoinMeeting $false -AllowAnonymousUsersToStartMeeting $false -AutoAdmittedUsers EveryoneInCompanyExcludingGuests -AllowPSTNUsersToBypassLobby $false -MeetingChatEnabledType EnabledExceptAnonymous -DesignatedPresenterRoleMode $DesignatedPresenterRoleMode -AllowExternalParticipantGiveRequestControl $false",
3196-
"recommendedBy": ["CIS 3.0"]
3226+
"recommendedBy": ["CIS"]
31973227
},
31983228
{
31993229
"name": "standards.TeamsEmailIntegration",
@@ -3213,7 +3243,7 @@
32133243
"impactColour": "info",
32143244
"addedDate": "2024-07-30",
32153245
"powershellEquivalent": "Set-CsTeamsClientConfiguration -AllowEmailIntoChannel $false",
3216-
"recommendedBy": ["CIS 3.0"]
3246+
"recommendedBy": ["CIS"]
32173247
},
32183248
{
32193249
"name": "standards.TeamsExternalFileSharing",
@@ -3252,7 +3282,7 @@
32523282
"impactColour": "info",
32533283
"addedDate": "2024-07-28",
32543284
"powershellEquivalent": "Set-CsTeamsClientConfiguration -AllowGoogleDrive $false -AllowShareFile $false -AllowBox $false -AllowDropBox $false -AllowEgnyte $false",
3255-
"recommendedBy": ["CIS 3.0"]
3285+
"recommendedBy": ["CIS"]
32563286
},
32573287
{
32583288
"name": "standards.TeamsEnrollUser",
@@ -3667,10 +3697,7 @@
36673697
{ "label": "Do not assign", "value": "On" },
36683698
{ "label": "Assign to all users", "value": "allLicensedUsers" },
36693699
{ "label": "Assign to all devices", "value": "AllDevices" },
3670-
{
3671-
"label": "Assign to all users and devices",
3672-
"value": "AllDevicesAndUsers"
3673-
},
3700+
{ "label": "Assign to all users and devices", "value": "AllDevicesAndUsers" },
36743701
{ "label": "Assign to Custom Group", "value": "customGroup" }
36753702
]
36763703
},
@@ -3749,10 +3776,7 @@
37493776
{ "value": "donotchange", "label": "Do not change state" },
37503777
{ "value": "Enabled", "label": "Set to enabled" },
37513778
{ "value": "Disabled", "label": "Set to disabled" },
3752-
{
3753-
"value": "enabledForReportingButNotEnforced",
3754-
"label": "Set to report only"
3755-
}
3779+
{ "value": "enabledForReportingButNotEnforced", "label": "Set to report only" }
37563780
]
37573781
}
37583782
]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ function Invoke-CIPPStandardAnonReportDisable {
5757
}
5858
}
5959
if ($Settings.report -eq $true) {
60-
$stateisCorrrect = $CurrentInfo.displayConcealedNames ? $false : $true
61-
Set-CIPPStandardsCompareField -FieldName 'standards.AnonReportDisable' -FieldValue $stateisCorrrect -TenantFilter $tenant
60+
$StateIsCorrect = $CurrentInfo.displayConcealedNames ? $false : $true
61+
Set-CIPPStandardsCompareField -FieldName 'standards.AnonReportDisable' -FieldValue $StateIsCorrect -TenantFilter $tenant
6262
Add-CIPPBPAField -FieldName 'AnonReport' -FieldValue $CurrentInfo.displayConcealedNames -StoreAs bool -Tenant $tenant
6363
}
6464
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function Invoke-CIPPStandardAntiPhishPolicy {
124124
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Anti-phishing policy already correctly configured' -sev Info
125125
} else {
126126
if ($MDOLicensed) {
127-
$cmdparams = @{
127+
$cmdParams = @{
128128
Enabled = $true
129129
PhishThresholdLevel = $Settings.PhishThresholdLevel
130130
EnableMailboxIntelligence = $true
@@ -147,7 +147,7 @@ function Invoke-CIPPStandardAntiPhishPolicy {
147147
EnableOrganizationDomainsProtection = $true
148148
}
149149
} else {
150-
$cmdparams = @{
150+
$cmdParams = @{
151151
Enabled = $true
152152
EnableSpoofIntelligence = $true
153153
EnableFirstContactSafetyTips = $Settings.EnableFirstContactSafetyTips
@@ -160,16 +160,16 @@ function Invoke-CIPPStandardAntiPhishPolicy {
160160

161161
if ($CurrentState.Name -eq $PolicyName) {
162162
try {
163-
$cmdparams.Add('Identity', $PolicyName)
164-
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AntiPhishPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
163+
$cmdParams.Add('Identity', $PolicyName)
164+
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AntiPhishPolicy' -cmdParams $cmdParams -UseSystemMailbox $true
165165
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Anti-phishing policy $PolicyName." -sev Info
166166
} catch {
167167
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Anti-phishing policy $PolicyName." -sev Error -LogData $_
168168
}
169169
} else {
170170
try {
171-
$cmdparams.Add('Name', $PolicyName)
172-
New-ExoRequest -tenantid $Tenant -cmdlet 'New-AntiPhishPolicy' -cmdparams $cmdparams -UseSystemMailbox $true
171+
$cmdParams.Add('Name', $PolicyName)
172+
New-ExoRequest -tenantid $Tenant -cmdlet 'New-AntiPhishPolicy' -cmdParams $cmdParams -UseSystemMailbox $true
173173
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Anti-phishing policy $PolicyName." -sev Info
174174
} catch {
175175
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Anti-phishing policy $PolicyName." -sev Error -LogData $_
@@ -178,27 +178,27 @@ function Invoke-CIPPStandardAntiPhishPolicy {
178178
}
179179

180180
if ($RuleStateIsCorrect -eq $false) {
181-
$cmdparams = @{
181+
$cmdParams = @{
182182
Priority = 0
183183
RecipientDomainIs = $AcceptedDomains.Name
184184
}
185185

186186
if ($RuleState.AntiPhishPolicy -ne $PolicyName) {
187-
$cmdparams.Add('AntiPhishPolicy', $PolicyName)
187+
$cmdParams.Add('AntiPhishPolicy', $PolicyName)
188188
}
189189

190190
if ($RuleState.Name -eq $RuleName) {
191191
try {
192-
$cmdparams.Add('Identity', $RuleName)
193-
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AntiPhishRule' -cmdparams $cmdparams -UseSystemMailbox $true
192+
$cmdParams.Add('Identity', $RuleName)
193+
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AntiPhishRule' -cmdParams $cmdParams -UseSystemMailbox $true
194194
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Updated Anti-phishing rule $RuleName." -sev Info
195195
} catch {
196196
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to update Anti-phishing rule $RuleName." -sev Error -LogData $_
197197
}
198198
} else {
199199
try {
200-
$cmdparams.Add('Name', $RuleName)
201-
New-ExoRequest -tenantid $Tenant -cmdlet 'New-AntiPhishRule' -cmdparams $cmdparams -UseSystemMailbox $true
200+
$cmdParams.Add('Name', $RuleName)
201+
New-ExoRequest -tenantid $Tenant -cmdlet 'New-AntiPhishRule' -cmdParams $cmdParams -UseSystemMailbox $true
202202
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Created Anti-phishing rule $RuleName." -sev Info
203203
} catch {
204204
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to create Anti-phishing rule $RuleName." -sev Error -LogData $_

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ function Invoke-CIPPStandardAtpPolicyForO365 {
4848
if ($StateIsCorrect -eq $true) {
4949
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Atp Policy For O365 already set.' -sev Info
5050
} else {
51-
$cmdparams = @{
51+
$cmdParams = @{
5252
EnableATPForSPOTeamsODB = $true
5353
EnableSafeDocs = $true
5454
AllowSafeDocsOpen = $Settings.AllowSafeDocsOpen
5555
}
5656

5757
try {
58-
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AtpPolicyForO365' -cmdparams $cmdparams -UseSystemMailbox $true
58+
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-AtpPolicyForO365' -cmdParams $cmdParams -UseSystemMailbox $true
5959
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Updated Atp Policy For O365' -sev Info
6060
} catch {
6161
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function Invoke-CIPPStandardDisableOutlookAddins {
4747

4848
foreach ($Role in $RolesToRemove) {
4949
try {
50-
New-ExoRequest -tenantid $Tenant -cmdlet 'Get-ManagementRoleAssignment' -cmdparams @{ RoleAssignee = $CurrentInfo.Identity; Role = $Role } | ForEach-Object {
51-
New-ExoRequest -tenantid $Tenant -cmdlet 'Remove-ManagementRoleAssignment' -cmdparams @{ Identity = $_.Guid; Confirm = $false } -UseSystemMailbox $true
50+
New-ExoRequest -tenantid $Tenant -cmdlet 'Get-ManagementRoleAssignment' -cmdParams @{ RoleAssignee = $CurrentInfo.Identity; Role = $Role } | ForEach-Object {
51+
New-ExoRequest -tenantid $Tenant -cmdlet 'Remove-ManagementRoleAssignment' -cmdParams @{ Identity = $_.Guid; Confirm = $false } -UseSystemMailbox $true
5252
Write-LogMessage -API 'Standards' -tenant $tenant -message "Disabled Outlook add-in role: $Role" -sev Debug
5353
}
5454
} catch {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function Invoke-CIPPStandardDisableTNEF {
3838

3939
if ($CurrentState.TNEFEnabled -ne $false) {
4040
try {
41-
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-RemoteDomain' -cmdParams @{Identity = 'Default'; TNEFEnabled = $false } -useSystemmailbox $true
41+
New-ExoRequest -tenantid $Tenant -cmdlet 'Set-RemoteDomain' -cmdParams @{Identity = 'Default'; TNEFEnabled = $false } -useSystemMailbox $true
4242
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Disabled TNEF for Default Remote Domain' -sev Info
4343
} catch {
4444
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ function Invoke-CIPPStandardEXODisableAutoForwarding {
3535
param($Tenant, $Settings)
3636
##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'EXODisableAutoForwarding'
3737

38-
$CurrentInfo = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-HostedOutboundSpamFilterPolicy' -cmdparams @{Identity = 'Default' } -useSystemMailbox $true
38+
$CurrentInfo = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-HostedOutboundSpamFilterPolicy' -cmdParams @{Identity = 'Default' } -useSystemMailbox $true
3939
$StateIsCorrect = $CurrentInfo.AutoForwardingMode -eq 'Off'
4040

4141
If ($Settings.remediate -eq $true) {
4242

4343
try {
44-
New-ExoRequest -tenantid $tenant -cmdlet 'Set-HostedOutboundSpamFilterPolicy' -cmdparams @{ Identity = 'Default'; AutoForwardingMode = 'Off' } -useSystemMailbox $true
44+
New-ExoRequest -tenantid $tenant -cmdlet 'Set-HostedOutboundSpamFilterPolicy' -cmdParams @{ Identity = 'Default'; AutoForwardingMode = 'Off' } -useSystemMailbox $true
4545
Write-LogMessage -API 'Standards' -tenant $tenant -message 'Disabled auto forwarding' -sev Info
4646
} catch {
4747
$ErrorMessage = Get-CippException -Exception $_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function Invoke-CIPPStandardEnableMailTips {
4444
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'All MailTips are already enabled.' -sev Info
4545
} else {
4646
try {
47-
New-ExoRequest -useSystemMailbox $true -tenantid $Tenant -cmdlet 'Set-OrganizationConfig' -cmdparams @{ MailTipsAllTipsEnabled = $true; MailTipsExternalRecipientsTipsEnabled = $true; MailTipsGroupMetricsEnabled = $true; MailTipsLargeAudienceThreshold = $Settings.MailTipsLargeAudienceThreshold }
47+
New-ExoRequest -useSystemMailbox $true -tenantid $Tenant -cmdlet 'Set-OrganizationConfig' -cmdParams @{ MailTipsAllTipsEnabled = $true; MailTipsExternalRecipientsTipsEnabled = $true; MailTipsGroupMetricsEnabled = $true; MailTipsLargeAudienceThreshold = $Settings.MailTipsLargeAudienceThreshold }
4848
Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Enabled all MailTips' -sev Info
4949
} catch {
5050
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message

0 commit comments

Comments
 (0)