Skip to content

Commit 1d02056

Browse files
JohnDupreyJohnDuprey
authored
Merge pull request #2735 from KelvinTegelaar/dev
Dev to hotfix
2 parents 1502bc3 + 2b7aa1e commit 1d02056

26 files changed

+1263
-161
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "6.1.0",
3+
"version": "6.1.1",
44
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
55
"homepage": "https://cipp.app/",
66
"bugs": {

‎public/version_latest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.0
1+
6.1.1

‎src/_nav.jsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,23 @@ const _nav = [
790790
},
791791
{
792792
component: CNavItem,
793-
name: 'Phishing Policies',
794-
to: '/email/reports/phishing-policies',
793+
name: 'Anti-Phishing Filters',
794+
to: '/email/reports/antiphishing-filters',
795+
},
796+
{
797+
component: CNavItem,
798+
name: 'Malware Filters',
799+
to: '/email/reports/malware-filters',
800+
},
801+
{
802+
component: CNavItem,
803+
name: 'Safe Links Filters',
804+
to: '/email/reports/safelinks-filters',
805+
},
806+
{
807+
component: CNavItem,
808+
name: 'Safe Attachments Filters',
809+
to: '/email/reports/safeattachments-filters',
795810
},
796811
{
797812
component: CNavItem,

‎src/data/Extensions.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@
186186
"label": "Hudu API Key",
187187
"placeholder": "Enter your Hudu API Key"
188188
},
189+
{
190+
"type": "checkbox",
191+
"name": "Hudu.Enabled",
192+
"label": "Enable Integration"
193+
},
189194
{
190195
"type": "checkbox",
191196
"name": "Hudu.CreateMissingUsers",
@@ -196,10 +201,20 @@
196201
"name": "Hudu.CreateMissingDevices",
197202
"label": "Create missing devices in Hudu"
198203
},
204+
{
205+
"type": "text",
206+
"name": "Hudu.ExcludeSerials",
207+
"label": "Exclude device serials (comma separated)"
208+
},
199209
{
200210
"type": "checkbox",
201-
"name": "Hudu.Enabled",
202-
"label": "Enable Integration"
211+
"name": "Hudu.ImportDomains",
212+
"label": "Import domains from M365"
213+
},
214+
{
215+
"type": "checkbox",
216+
"name": "Hudu.MonitorDomains",
217+
"label": "Monitor domains in Hudu"
203218
}
204219
],
205220
"mappingRequired": true,

‎src/data/standards.json

Lines changed: 73 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
"tag": ["lowimpact"],
66
"helpText": "Defines the email address to receive general updates and information related to M365 subscriptions. Leave a contact field blank if you do not want to update the contact information.",
77
"docsDescription": "",
8-
"disabledFeatures": {
9-
"report": false,
10-
"warn": false,
11-
"remediate": false
12-
},
138
"addedComponent": [
149
{
1510
"type": "input",
@@ -589,7 +584,7 @@
589584
{
590585
"name": "standards.OauthConsentLowSec",
591586
"cat": "Entra (AAD) Standards",
592-
"tag": ["mediumimpact"],
587+
"tag": ["mediumimpact", "IntegratedApps"],
593588
"helpText": "Sets the default oauth consent level so users can consent to applications that have low risks.",
594589
"docsDescription": "Allows users to consent to applications with low assigned risk.",
595590
"label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure)",
@@ -645,7 +640,9 @@
645640
"addedComponent": [],
646641
"label": "Disables Voice call as an MFA method",
647642
"impact": "High Impact",
648-
"impactColour": "danger"
643+
"impactColour": "danger",
644+
"powershellEquivalent": "Update-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration",
645+
"recommendedBy": []
649646
},
650647
{
651648
"name": "standards.DisableEmail",
@@ -1281,6 +1278,19 @@
12811278
"powershellEquivalent": "Get-Mailbox & Update-MgUser",
12821279
"recommendedBy": ["CIS"]
12831280
},
1281+
{
1282+
"name": "standards.EXODisableAutoForwarding",
1283+
"cat": "Exchange Standards",
1284+
"tag": ["highimpact", "CIS", "mdo_autoforwardingmode", "mdo_blockmailforward"],
1285+
"helpText": "Disables the ability for users to automatically forward e-mails to external recipients.",
1286+
"docsDescription": "Disables the ability for users to automatically forward e-mails to external recipients. This is to prevent data exfiltration. Please check if there are any legitimate use cases for this feature before implementing, like forwarding invoices and such.",
1287+
"addedComponent": [],
1288+
"label": "Disable automatic forwarding to external recipients",
1289+
"impact": "High Impact",
1290+
"impactColour": "danger",
1291+
"powershellEquivalent": "Set-HostedOutboundSpamFilterPolicy -AutoForwardingMode 'Off'",
1292+
"recommendedBy": ["CIS"]
1293+
},
12841294
{
12851295
"name": "standards.QuarantineRequestAlert",
12861296
"cat": "Defender Standards",
@@ -1339,7 +1349,8 @@
13391349
"mdo_highconfidencephishaction",
13401350
"mdo_phisspamacation",
13411351
"mdo_spam_notifications_only_for_admins",
1342-
"mdo_antiphishingpolicies"
1352+
"mdo_antiphishingpolicies",
1353+
"mdo_phishthresholdlevel"
13431354
],
13441355
"helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mailtips.",
13451356
"addedComponent": [
@@ -1635,6 +1646,11 @@
16351646
}
16361647
]
16371648
},
1649+
{
1650+
"type": "input",
1651+
"name": "standards.MalwareFilterPolicy.OptionalFileTypes",
1652+
"label": "Optional File Types, Comma separated"
1653+
},
16381654
{
16391655
"type": "Select",
16401656
"label": "QuarantineTag",
@@ -2081,23 +2097,62 @@
20812097
"name": "standards.DisableAddShortcutsToOneDrive",
20822098
"cat": "SharePoint Standards",
20832099
"tag": ["mediumimpact"],
2084-
"helpText": "When the feature is disabled the option Add shortcut to OneDrive will be removed. Any folders that have already been added will remain on the user's computer.",
2085-
"disabledFeatures": {
2086-
"report": true,
2087-
"warn": true,
2088-
"remediate": false
2089-
},
2090-
"addedComponent": [],
2091-
"label": "Disable Add Shortcuts To OneDrive",
2100+
"helpText": "If disabled, the button Add shortcut to OneDrive will be removed and users in the tenant will no longer be able to add new shortcuts to their OneDrive. Existing shortcuts will remain functional",
2101+
"addedComponent": [
2102+
{
2103+
"type": "Select",
2104+
"label": "Add Shortcuts To OneDrive button state",
2105+
"name": "standards.DisableAddShortcutsToOneDrive.state",
2106+
"values": [
2107+
{
2108+
"label": "Disabled",
2109+
"value": "true"
2110+
},
2111+
{
2112+
"label": "Enabled",
2113+
"value": "false"
2114+
}
2115+
]
2116+
}
2117+
],
2118+
"label": "Set Add Shortcuts To OneDrive button state",
2119+
"impact": "Medium Impact",
2120+
"impactColour": "warning",
2121+
"powershellEquivalent": "Set-SPOTenant -DisableAddShortcutsToOneDrive $true or $false",
2122+
"recommendedBy": []
2123+
},
2124+
{
2125+
"name": "standards.SPSyncButtonState",
2126+
"cat": "SharePoint Standards",
2127+
"tag": ["mediumimpact"],
2128+
"helpText": "If disabled, users in the tenant will no longer be able to use the Sync button to sync SharePoint content on all sites. However, existing synced content will remain functional on the user's computer.",
2129+
"addedComponent": [
2130+
{
2131+
"type": "Select",
2132+
"label": "SharePoint Sync Button state",
2133+
"name": "standards.SPSyncButtonState.state",
2134+
"values": [
2135+
{
2136+
"label": "Disabled",
2137+
"value": "true"
2138+
},
2139+
{
2140+
"label": "Enabled",
2141+
"value": "false"
2142+
}
2143+
]
2144+
}
2145+
],
2146+
"label": "Set SharePoint sync button state",
20922147
"impact": "Medium Impact",
20932148
"impactColour": "warning",
2094-
"powershellEquivalent": "Graph API or Portal",
2149+
"powershellEquivalent": "Set-SPOTenant -HideSyncButtonOnTeamSite $true or $false",
20952150
"recommendedBy": []
20962151
},
20972152
{
20982153
"name": "standards.DisableSharePointLegacyAuth",
20992154
"cat": "SharePoint Standards",
2100-
"tag": ["mediumimpact", "CIS"],
2155+
"tag": ["mediumimpact", "CIS", "spo_legacy_auth"],
21012156
"helpText": "Disables the ability to authenticate with SharePoint using legacy authentication methods. Any applications that use legacy authentication will need to be updated to use modern authentication.",
21022157
"docsDescription": "Disables the ability for users and applications to access SharePoint via legacy basic authentication. This will likely not have any user impact, but will block systems/applications depending on basic auth or the SharePointOnlineCredentials class.",
21032158
"addedComponent": [],

‎src/importsMap.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,10 @@ import React from 'react'
133133
"/email/reports/mailbox-cas-settings": React.lazy(() => import('./views/email-exchange/reports/MailboxClientAccessSettingsList')),
134134
"/email/reports/message-trace": React.lazy(() => import('./views/email-exchange/reports/MessageTrace')),
135135
"/cipp/user-settings": React.lazy(() => import('./views/cipp/UserSettings')),
136-
"/email/reports/phishing-policies": React.lazy(() => import('./views/email-exchange/reports/PhishingPoliciesList')),
136+
"/email/reports/antiphishing-filters": React.lazy(() => import('./views/email-exchange/reports/AntiPhishingFilters')),
137+
"/email/reports/malware-filters": React.lazy(() => import('./views/email-exchange/reports/MalwareFilters')),
138+
"/email/reports/safelinks-filters": React.lazy(() => import('./views/email-exchange/reports/SafeLinksFilters')),
139+
"/email/reports/safeattachments-filters": React.lazy(() => import('./views/email-exchange/reports/SafeAttachmentsFilters')),
137140
"/security/incidents/list-alerts": React.lazy(() => import('./views/security/incidents/ListAlerts')),
138141
"/security/incidents/list-incidents": React.lazy(() => import('./views/security/incidents/ListIncidents')),
139142
"/security/reports/list-device-compliance": React.lazy(() => import('./views/security/reports/ListDeviceComplianceReport')),

‎src/routes.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -890,9 +890,27 @@
890890
"allowedRoles": ["admin", "editor", "readonly"]
891891
},
892892
{
893-
"name": "Phishing Policies",
894-
"path": "/email/reports/phishing-policies",
895-
"component": "views/email-exchange/reports/PhishingPoliciesList",
893+
"path": "/email/reports/antiphishing-filters",
894+
"name": "Anti Phishing Filters",
895+
"component": "views/email-exchange/reports/AntiPhishingFilters",
896+
"allowedRoles": ["admin", "editor", "readonly"]
897+
},
898+
{
899+
"path": "/email/reports/malware-filters",
900+
"name": "Malware Filters",
901+
"component": "views/email-exchange/reports/MalwareFilters",
902+
"allowedRoles": ["admin", "editor", "readonly"]
903+
},
904+
{
905+
"path": "/email/reports/safelinks-filters",
906+
"name": "Safe Links Filters",
907+
"component": "views/email-exchange/reports/SafeLinksFilters",
908+
"allowedRoles": ["admin", "editor", "readonly"]
909+
},
910+
{
911+
"path": "/email/reports/safeattachments-filters",
912+
"name": "Safe Attachment Filters",
913+
"component": "views/email-exchange/reports/SafeAttachmentsFilters",
896914
"allowedRoles": ["admin", "editor", "readonly"]
897915
},
898916
{

‎src/views/cipp/ExtensionSync.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,49 @@ const ExtensionSync = () => {
1919
const columns = [
2020
{
2121
name: 'Tenant',
22-
selector: (row) => row['Tenant'],
22+
selector: (row) => row?.Tenant,
2323
sortable: true,
2424
cell: cellGenericFormatter(),
2525
exportSelector: 'Tenants',
2626
},
2727
{
2828
name: 'Sync Type',
29-
selector: (row) => row['SyncType'],
29+
selector: (row) => row?.SyncType,
3030
sortable: true,
3131
cell: cellBadgeFormatter({ color: 'info' }),
3232
exportSelector: 'SyncType',
3333
},
3434
{
3535
name: 'Task',
36-
selector: (row) => row['Name'],
36+
selector: (row) => row?.Name,
3737
sortable: true,
3838
cell: cellGenericFormatter(),
3939
exportSelector: 'Name',
4040
},
4141
{
4242
name: 'Scheduled Time',
43-
selector: (row) => row['ScheduledTime'],
43+
selector: (row) => row?.ScheduledTime,
4444
sortable: true,
4545
cell: cellDateFormatter({ format: 'short' }),
4646
exportSelector: 'ScheduledTime',
4747
},
4848
{
4949
name: 'Last Run',
50-
selector: (row) => row['ExecutedTime'],
50+
selector: (row) => row?.ExecutedTime,
5151
sortable: true,
5252
cell: cellDateFormatter({ format: 'short' }),
5353
exportSelector: 'ExecutedTime',
5454
},
5555
{
5656
name: 'Repeats every',
57-
selector: (row) => row['RepeatsEvery'],
57+
selector: (row) => row?.RepeatsEvery,
5858
sortable: true,
5959
cell: (row) => CellTip(row['RepeatsEvery']),
6060
exportSelector: 'RepeatsEvery',
6161
},
6262
{
6363
name: 'Results',
64-
selector: (row) => row['Results'],
64+
selector: (row) => row?.Results,
6565
sortable: true,
6666
cell: cellGenericFormatter(),
6767
exportSelector: 'Results',

‎src/views/cipp/Setup.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ const Setup = () => {
286286
type="text"
287287
name="TenantID"
288288
label="Tenant ID"
289-
placeholder="Enter the Tenant ID. e.g. mymsp.onmicrosoft.com. Leave blank to retain a previous key if this exists."
289+
placeholder="Enter the Tenant ID. e.g. 1111-1111-1111-1111-11111. Leave blank to retain a previous key if this exists."
290290
/>
291291
</CCol>
292292
</CRow>

‎src/views/cipp/UserSettings.jsx

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,28 +156,36 @@ const UserSettings = () => {
156156
<CRow className="mb-3">
157157
<h3 className="underline mb-5">Offboarding Defaults</h3>
158158
<CCol>
159-
<RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
160-
<RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
161-
<RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
162-
<RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
159+
<RFFCFormSwitch
160+
name="ConvertToShared"
161+
label="Convert to Shared Mailbox"
162+
/>
163163
<RFFCFormSwitch
164164
name="HideFromGAL"
165165
label="Hide from Global Address List"
166166
/>
167-
</CCol>
168-
<CCol>
169167
<RFFCFormSwitch
170-
name="ConvertToShared"
171-
label="Convert to Shared Mailbox"
168+
name="removeCalendarInvites"
169+
label="Cancel all calendar invites"
172170
/>
173-
<RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
174-
<RFFCFormSwitch name="ResetPass" label="Reset Password" />
175-
<RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
176-
171+
<RFFCFormSwitch
172+
name="removePermissions"
173+
label="Remove users mailbox permissions"
174+
/>
175+
<RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
177176
<RFFCFormSwitch
178177
name="keepCopy"
179178
label="Keep copy of forwarded mail in source mailbox"
180179
/>
180+
<RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
181+
</CCol>
182+
<CCol>
183+
<RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
184+
<RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
185+
<RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
186+
<RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
187+
<RFFCFormSwitch name="ResetPass" label="Reset Password" />
188+
<RFFCFormSwitch name="DeleteUser" label="Delete user" />
181189
</CCol>
182190
</CRow>
183191
<CRow className="mb-3">

0 commit comments

Comments
 (0)