Skip to content

Commit a8be0ee

Browse files
michaelmumenthalermichaelmumenthaler
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents 2c940ef + c04bde0 commit a8be0ee

874 files changed

Lines changed: 61197 additions & 8682 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Config/BaselineStandards/Copilot (M365) Standards/CopilotLimitedMode.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "CopilotLimitedMode",
3+
"disabled": true,
34
"label": "Set Copilot Limited Mode",
45
"cat": "Copilot (M365) Standards",
56
"tag": [],

‎Config/BaselineStandards/Defender Standards/QuarantineRequestAlert.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@
3636
"type": "textField",
3737
"label": "E-mail to receive the alert",
3838
"helperText": "Ignored when the alert state is Removed.",
39-
"required": true
39+
"required": true,
40+
"validators": {
41+
"pattern": {
42+
"value": "^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$",
43+
"message": "Must be a valid e-mail address"
44+
}
45+
}
4046
},
4147
"AllowExtraAddresses": {
4248
"type": "switch",

‎Config/BaselineStandards/Defender Standards/SpamFilterPolicy.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,26 @@
302302
"required": true,
303303
"default": 7
304304
},
305+
"BulkMovesEnabled": {
306+
"type": "select",
307+
"multiple": false,
308+
"label": "Bulk moves enabled (deliver bulk mail below the threshold to the Promotions folder - Preview)",
309+
"options": [
310+
{
311+
"label": "Do not configure",
312+
"value": ""
313+
},
314+
{
315+
"label": "On",
316+
"value": "On"
317+
},
318+
{
319+
"label": "Off",
320+
"value": "Off"
321+
}
322+
],
323+
"default": ""
324+
},
305325
"IncreaseScoreWithImageLinks": {
306326
"type": "switch",
307327
"label": "Increase score with image links",

‎Config/BaselineStandards/Entra (AAD) Standards/AdminSSPR.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
"read": {
3737
"cacheType": "AuthorizationPolicy"
3838
},
39+
"writeTarget": "authorizationPolicy",
40+
"writeTargetProperties": {
41+
"allowedToUseSSPR": "%allowSSPR%"
42+
},
3943
"remediate": {
4044
"executor": "GraphRequest",
4145
"requests": [

‎Config/BaselineStandards/Entra (AAD) Standards/AppDeploy.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
"url": "/api/ListAppApprovalTemplates",
4747
"labelField": "TemplateName",
4848
"valueField": "TemplateId",
49-
"queryKey": "StdAppApprovalTemplateList"
49+
"queryKey": "StdAppApprovalTemplateList",
50+
"templateView": { "title": "App Approval Template" }
5051
}
5152
},
5253
"appids": {

‎Config/BaselineStandards/Entra (AAD) Standards/AuthMethodsPolicyMigration.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
"read": {
4545
"cacheType": "AuthenticationMethodsPolicy"
4646
},
47+
"writeTarget": "authenticationMethodsPolicy",
48+
"writeTargetProperties": {
49+
"policyMigrationState": "%migrationState%"
50+
},
4751
"remediate": {
4852
"executor": "GraphRequest",
4953
"requests": [

‎Config/BaselineStandards/Entra (AAD) Standards/AuthMethodsSettings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@
8181
"read": {
8282
"cacheType": "AuthenticationMethodsPolicy"
8383
},
84+
"writeTarget": "authenticationMethodsPolicy",
85+
"writeTargetProperties": {
86+
"reportSuspiciousActivitySettings.state": "%reportSuspiciousActivity%",
87+
"systemCredentialPreferences.state": "%systemCredential%"
88+
},
8489
"remediate": {
8590
"executor": "GraphRequest",
8691
"requests": [

‎Config/BaselineStandards/Entra (AAD) Standards/AuthenticationMethods.json‎

Lines changed: 192 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,99 +24,249 @@
2424
"compare": "subset",
2525
"variables": {
2626
"MicrosoftAuthenticatorEnabled": {
27-
"label": "Microsoft Authenticator: manage this method",
27+
"creatable": false,
28+
"options": [
29+
{
30+
"value": true,
31+
"label": "Enabled"
32+
},
33+
{
34+
"value": false,
35+
"label": "Disabled"
36+
},
37+
{
38+
"value": "notConfigured",
39+
"label": "Not Configured"
40+
}
41+
],
2842
"omitWhenBlank": true,
29-
"type": "switch"
43+
"type": "autoComplete",
44+
"label": "Microsoft Authenticator: state (Not Configured = leave as-is)"
3045
},
3146
"MicrosoftAuthenticatorGroup": {
3247
"label": "Microsoft Authenticator: target group (blank = all users)",
3348
"omitWhenBlank": true,
3449
"type": "textField"
3550
},
3651
"FIDO2Enabled": {
37-
"label": "FIDO2 Security Keys: manage this method",
52+
"creatable": false,
53+
"options": [
54+
{
55+
"value": true,
56+
"label": "Enabled"
57+
},
58+
{
59+
"value": false,
60+
"label": "Disabled"
61+
},
62+
{
63+
"value": "notConfigured",
64+
"label": "Not Configured"
65+
}
66+
],
3867
"omitWhenBlank": true,
39-
"type": "switch"
68+
"type": "autoComplete",
69+
"label": "FIDO2 Security Keys: state (Not Configured = leave as-is)"
4070
},
4171
"FIDO2Group": {
4272
"label": "FIDO2 Security Keys: target group (blank = all users)",
4373
"omitWhenBlank": true,
4474
"type": "textField"
4575
},
4676
"TAPEnabled": {
47-
"label": "Temporary Access Pass: manage this method",
77+
"creatable": false,
78+
"options": [
79+
{
80+
"value": true,
81+
"label": "Enabled"
82+
},
83+
{
84+
"value": false,
85+
"label": "Disabled"
86+
},
87+
{
88+
"value": "notConfigured",
89+
"label": "Not Configured"
90+
}
91+
],
4892
"omitWhenBlank": true,
49-
"type": "switch"
93+
"type": "autoComplete",
94+
"label": "Temporary Access Pass: state (Not Configured = leave as-is)"
5095
},
5196
"TAPGroup": {
5297
"label": "Temporary Access Pass: target group (blank = all users)",
5398
"omitWhenBlank": true,
5499
"type": "textField"
55100
},
56101
"SoftwareOathEnabled": {
57-
"label": "Software OATH Tokens: manage this method",
102+
"creatable": false,
103+
"options": [
104+
{
105+
"value": true,
106+
"label": "Enabled"
107+
},
108+
{
109+
"value": false,
110+
"label": "Disabled"
111+
},
112+
{
113+
"value": "notConfigured",
114+
"label": "Not Configured"
115+
}
116+
],
58117
"omitWhenBlank": true,
59-
"type": "switch"
118+
"type": "autoComplete",
119+
"label": "Software OATH Tokens: state (Not Configured = leave as-is)"
60120
},
61121
"SoftwareOathGroup": {
62122
"label": "Software OATH Tokens: target group (blank = all users)",
63123
"omitWhenBlank": true,
64124
"type": "textField"
65125
},
66126
"HardwareOathEnabled": {
67-
"label": "Hardware OATH Tokens: manage this method",
127+
"creatable": false,
128+
"options": [
129+
{
130+
"value": true,
131+
"label": "Enabled"
132+
},
133+
{
134+
"value": false,
135+
"label": "Disabled"
136+
},
137+
{
138+
"value": "notConfigured",
139+
"label": "Not Configured"
140+
}
141+
],
68142
"omitWhenBlank": true,
69-
"type": "switch"
143+
"type": "autoComplete",
144+
"label": "Hardware OATH Tokens: state (Not Configured = leave as-is)"
70145
},
71146
"HardwareOathGroup": {
72147
"label": "Hardware OATH Tokens: target group (blank = all users)",
73148
"omitWhenBlank": true,
74149
"type": "textField"
75150
},
76151
"SMSEnabled": {
77-
"label": "SMS: manage this method",
152+
"creatable": false,
153+
"options": [
154+
{
155+
"value": true,
156+
"label": "Enabled"
157+
},
158+
{
159+
"value": false,
160+
"label": "Disabled"
161+
},
162+
{
163+
"value": "notConfigured",
164+
"label": "Not Configured"
165+
}
166+
],
78167
"omitWhenBlank": true,
79-
"type": "switch"
168+
"type": "autoComplete",
169+
"label": "SMS: state (Not Configured = leave as-is)"
80170
},
81171
"SMSGroup": {
82172
"label": "SMS: target group (blank = all users)",
83173
"omitWhenBlank": true,
84174
"type": "textField"
85175
},
86176
"VoiceEnabled": {
87-
"label": "Voice Call: manage this method",
177+
"creatable": false,
178+
"options": [
179+
{
180+
"value": true,
181+
"label": "Enabled"
182+
},
183+
{
184+
"value": false,
185+
"label": "Disabled"
186+
},
187+
{
188+
"value": "notConfigured",
189+
"label": "Not Configured"
190+
}
191+
],
88192
"omitWhenBlank": true,
89-
"type": "switch"
193+
"type": "autoComplete",
194+
"label": "Voice Call: state (Not Configured = leave as-is)"
90195
},
91196
"VoiceGroup": {
92197
"label": "Voice Call: target group (blank = all users)",
93198
"omitWhenBlank": true,
94199
"type": "textField"
95200
},
96201
"EmailEnabled": {
97-
"label": "Email OTP: manage this method",
202+
"creatable": false,
203+
"options": [
204+
{
205+
"value": true,
206+
"label": "Enabled"
207+
},
208+
{
209+
"value": false,
210+
"label": "Disabled"
211+
},
212+
{
213+
"value": "notConfigured",
214+
"label": "Not Configured"
215+
}
216+
],
98217
"omitWhenBlank": true,
99-
"type": "switch"
218+
"type": "autoComplete",
219+
"label": "Email OTP: state (Not Configured = leave as-is)"
100220
},
101221
"EmailGroup": {
102222
"label": "Email OTP: target group (blank = all users)",
103223
"omitWhenBlank": true,
104224
"type": "textField"
105225
},
106226
"x509CertificateEnabled": {
107-
"label": "Certificate-Based Authentication: manage this method",
227+
"creatable": false,
228+
"options": [
229+
{
230+
"value": true,
231+
"label": "Enabled"
232+
},
233+
{
234+
"value": false,
235+
"label": "Disabled"
236+
},
237+
{
238+
"value": "notConfigured",
239+
"label": "Not Configured"
240+
}
241+
],
108242
"omitWhenBlank": true,
109-
"type": "switch"
243+
"type": "autoComplete",
244+
"label": "Certificate-Based Authentication: state (Not Configured = leave as-is)"
110245
},
111246
"x509CertificateGroup": {
112247
"label": "Certificate-Based Authentication: target group (blank = all users)",
113248
"omitWhenBlank": true,
114249
"type": "textField"
115250
},
116251
"QRCodePinEnabled": {
117-
"label": "QR Code Pin: manage this method",
252+
"creatable": false,
253+
"options": [
254+
{
255+
"value": true,
256+
"label": "Enabled"
257+
},
258+
{
259+
"value": false,
260+
"label": "Disabled"
261+
},
262+
{
263+
"value": "notConfigured",
264+
"label": "Not Configured"
265+
}
266+
],
118267
"omitWhenBlank": true,
119-
"type": "switch"
268+
"type": "autoComplete",
269+
"label": "QR Code Pin: state (Not Configured = leave as-is)"
120270
},
121271
"QRCodePinGroup": {
122272
"label": "QR Code Pin: target group (blank = all users)",
@@ -268,6 +418,28 @@
268418
"cacheType": "AuthenticationMethodsPolicy"
269419
},
270420
"prepare": "Get-CIPPBaselineAuthenticationMethodsState",
421+
"writeTarget": "authenticationMethodsPolicy",
422+
"writeTargetProperties": {
423+
"Sms.state": "%SMSEnabled%",
424+
"Voice.state": "%VoiceEnabled%",
425+
"Email.state": "%EmailEnabled%",
426+
"x509Certificate.state": "%x509CertificateEnabled%",
427+
"HardwareOath.state": "%HardwareOathEnabled%",
428+
"SoftwareOath.state": "%SoftwareOathEnabled%",
429+
"QRCodePin.state": "%QRCodePinEnabled%",
430+
"Fido2.state": "%FIDO2Enabled%",
431+
"MicrosoftAuthenticator.state": "%MicrosoftAuthenticatorEnabled%",
432+
"MicrosoftAuthenticator.isSoftwareOathEnabled": "%MicrosoftAuthenticatorSoftwareOath%",
433+
"MicrosoftAuthenticator.featureSettings.displayAppInformationRequiredState.state": "%MicrosoftAuthenticatorDisplayAppInfo%",
434+
"MicrosoftAuthenticator.featureSettings.displayLocationInformationRequiredState.state": "%MicrosoftAuthenticatorDisplayLocation%",
435+
"MicrosoftAuthenticator.featureSettings.companionAppAllowedState.state": "%MicrosoftAuthenticatorCompanionApp%",
436+
"TemporaryAccessPass.state": "%TAPEnabled%",
437+
"TemporaryAccessPass.isUsableOnce": "%TAPUsableOnce%",
438+
"TemporaryAccessPass.defaultLifetimeInMinutes": "%TAPDefaultLifetime%",
439+
"TemporaryAccessPass.minimumLifetimeInMinutes": "%TAPMinLifetime%",
440+
"TemporaryAccessPass.maximumLifetimeInMinutes": "%TAPMaxLifetime%",
441+
"TemporaryAccessPass.defaultLength": "%TAPDefaultLength%"
442+
},
271443
"remediate": {
272444
"executor": "AuthenticationMethods"
273445
}

0 commit comments

Comments
 (0)