Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from KelvinTegelaar:main #61

Merged
merged 42 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ea4c887
Add bulk options to device list
Jul 21, 2024
68c6af9
Risk report quickfix
OfficialEsco Jul 22, 2024
eb418bf
Added missing docs property
kris6673 Jul 22, 2024
7b973a5
Add more hudu settings
JohnDuprey Jul 22, 2024
c675d7b
Merge pull request #2716 from JohnDuprey/dev
JohnDuprey Jul 22, 2024
d4e99ba
Change placeholder
JohnDuprey Jul 23, 2024
97ad63a
Merge pull request #2713 from rvdwegen/dev
KelvinTegelaar Jul 24, 2024
3d7e73c
Merge pull request #2714 from Ren-Roros-Digital/riskquickfix
KelvinTegelaar Jul 24, 2024
a2e8e69
Merge pull request #2715 from kris6673/docs-property-missing
KelvinTegelaar Jul 24, 2024
03452ae
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Jul 24, 2024
d0f3dcd
New standard for setting SharePoint sync button state
kris6673 Jul 24, 2024
9cff0cc
Update standard with enable and disable options
kris6673 Jul 24, 2024
4b12ee5
Added List Malware Filters
OfficialEsco Jul 19, 2024
9b4206e
Added List SafeLinks Filters
OfficialEsco Jul 24, 2024
516cc8c
Added List SafeAttachment Filters
OfficialEsco Jul 25, 2024
5d09169
Updated List AntiPhishing Filters
OfficialEsco Jul 25, 2024
d4e642c
Added Edit Safe AttachmentsFilter
OfficialEsco Jul 25, 2024
6f70b2c
Added Edit Anti-Phishing Filter
OfficialEsco Jul 25, 2024
b4aa3dd
Added Edit Malware Filter
OfficialEsco Jul 25, 2024
9213b34
Added Edit SafeLinks Filter
OfficialEsco Jul 25, 2024
0d4dd6f
MFA report update
JohnDuprey Jul 25, 2024
34a7533
Add remove tenant bulk action
JohnDuprey Jul 25, 2024
e444336
Merge pull request #2728 from JohnDuprey/dev
JohnDuprey Jul 25, 2024
d03b70e
Pass userEmail to backend to use in logging
kris6673 Jul 25, 2024
b55fb5f
Reorder offboarding options
kris6673 Jul 26, 2024
9f0bd38
Added Optional Malware FileTypes
OfficialEsco Jul 26, 2024
0948177
Add tags to standards
kris6673 Jul 26, 2024
d98383f
Add missing options in user settings for Offboarding Defaults
kris6673 Jul 26, 2024
0972e11
Add DisableAutoForwarding standard
kris6673 Jul 26, 2024
e69f33b
Log Subscriptoins
JohnDuprey Jul 26, 2024
f54327b
Merge pull request #2730 from kris6673/secure-score-tags
KelvinTegelaar Jul 26, 2024
779047d
Merge pull request #2723 from kris6673/sp-disable-sync
KelvinTegelaar Jul 26, 2024
d2e075a
Merge pull request #2724 from Ren-Roros-Digital/listmalwarefilters
KelvinTegelaar Jul 26, 2024
f64a877
Merge pull request #2731 from Ren-Roros-Digital/malwarefiletypes
KelvinTegelaar Jul 26, 2024
0fe29d9
Merge pull request #2729 from kris6673/hidden-rules
KelvinTegelaar Jul 26, 2024
40c8e6c
Merge pull request #2732 from kris6673/DisableAutoForwarding
KelvinTegelaar Jul 26, 2024
c8aba86
UI tweaks
JohnDuprey Jul 26, 2024
ca6ac61
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Jul 26, 2024
54383ef
Merge pull request #2733 from JohnDuprey/dev
JohnDuprey Jul 26, 2024
a0eb3ec
up version
JohnDuprey Jul 26, 2024
2b7aa1e
Merge pull request #2734 from JohnDuprey/dev
JohnDuprey Jul 26, 2024
1d02056
Merge pull request #2735 from KelvinTegelaar/dev
JohnDuprey Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "6.1.0",
"version": "6.1.1",
"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.1.0
6.1.1
19 changes: 17 additions & 2 deletions src/_nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,23 @@ const _nav = [
},
{
component: CNavItem,
name: 'Phishing Policies',
to: '/email/reports/phishing-policies',
name: 'Anti-Phishing Filters',
to: '/email/reports/antiphishing-filters',
},
{
component: CNavItem,
name: 'Malware Filters',
to: '/email/reports/malware-filters',
},
{
component: CNavItem,
name: 'Safe Links Filters',
to: '/email/reports/safelinks-filters',
},
{
component: CNavItem,
name: 'Safe Attachments Filters',
to: '/email/reports/safeattachments-filters',
},
{
component: CNavItem,
Expand Down
19 changes: 17 additions & 2 deletions src/data/Extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@
"label": "Hudu API Key",
"placeholder": "Enter your Hudu API Key"
},
{
"type": "checkbox",
"name": "Hudu.Enabled",
"label": "Enable Integration"
},
{
"type": "checkbox",
"name": "Hudu.CreateMissingUsers",
Expand All @@ -196,10 +201,20 @@
"name": "Hudu.CreateMissingDevices",
"label": "Create missing devices in Hudu"
},
{
"type": "text",
"name": "Hudu.ExcludeSerials",
"label": "Exclude device serials (comma separated)"
},
{
"type": "checkbox",
"name": "Hudu.Enabled",
"label": "Enable Integration"
"name": "Hudu.ImportDomains",
"label": "Import domains from M365"
},
{
"type": "checkbox",
"name": "Hudu.MonitorDomains",
"label": "Monitor domains in Hudu"
}
],
"mappingRequired": true,
Expand Down
91 changes: 73 additions & 18 deletions src/data/standards.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
"tag": ["lowimpact"],
"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.",
"docsDescription": "",
"disabledFeatures": {
"report": false,
"warn": false,
"remediate": false
},
"addedComponent": [
{
"type": "input",
Expand Down Expand Up @@ -589,7 +584,7 @@
{
"name": "standards.OauthConsentLowSec",
"cat": "Entra (AAD) Standards",
"tag": ["mediumimpact"],
"tag": ["mediumimpact", "IntegratedApps"],
"helpText": "Sets the default oauth consent level so users can consent to applications that have low risks.",
"docsDescription": "Allows users to consent to applications with low assigned risk.",
"label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure)",
Expand Down Expand Up @@ -645,7 +640,9 @@
"addedComponent": [],
"label": "Disables Voice call as an MFA method",
"impact": "High Impact",
"impactColour": "danger"
"impactColour": "danger",
"powershellEquivalent": "Update-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration",
"recommendedBy": []
},
{
"name": "standards.DisableEmail",
Expand Down Expand Up @@ -1281,6 +1278,19 @@
"powershellEquivalent": "Get-Mailbox & Update-MgUser",
"recommendedBy": ["CIS"]
},
{
"name": "standards.EXODisableAutoForwarding",
"cat": "Exchange Standards",
"tag": ["highimpact", "CIS", "mdo_autoforwardingmode", "mdo_blockmailforward"],
"helpText": "Disables the ability for users to automatically forward e-mails to external recipients.",
"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.",
"addedComponent": [],
"label": "Disable automatic forwarding to external recipients",
"impact": "High Impact",
"impactColour": "danger",
"powershellEquivalent": "Set-HostedOutboundSpamFilterPolicy -AutoForwardingMode 'Off'",
"recommendedBy": ["CIS"]
},
{
"name": "standards.QuarantineRequestAlert",
"cat": "Defender Standards",
Expand Down Expand Up @@ -1339,7 +1349,8 @@
"mdo_highconfidencephishaction",
"mdo_phisspamacation",
"mdo_spam_notifications_only_for_admins",
"mdo_antiphishingpolicies"
"mdo_antiphishingpolicies",
"mdo_phishthresholdlevel"
],
"helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mailtips.",
"addedComponent": [
Expand Down Expand Up @@ -1635,6 +1646,11 @@
}
]
},
{
"type": "input",
"name": "standards.MalwareFilterPolicy.OptionalFileTypes",
"label": "Optional File Types, Comma separated"
},
{
"type": "Select",
"label": "QuarantineTag",
Expand Down Expand Up @@ -2081,23 +2097,62 @@
"name": "standards.DisableAddShortcutsToOneDrive",
"cat": "SharePoint Standards",
"tag": ["mediumimpact"],
"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.",
"disabledFeatures": {
"report": true,
"warn": true,
"remediate": false
},
"addedComponent": [],
"label": "Disable Add Shortcuts To OneDrive",
"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",
"addedComponent": [
{
"type": "Select",
"label": "Add Shortcuts To OneDrive button state",
"name": "standards.DisableAddShortcutsToOneDrive.state",
"values": [
{
"label": "Disabled",
"value": "true"
},
{
"label": "Enabled",
"value": "false"
}
]
}
],
"label": "Set Add Shortcuts To OneDrive button state",
"impact": "Medium Impact",
"impactColour": "warning",
"powershellEquivalent": "Set-SPOTenant -DisableAddShortcutsToOneDrive $true or $false",
"recommendedBy": []
},
{
"name": "standards.SPSyncButtonState",
"cat": "SharePoint Standards",
"tag": ["mediumimpact"],
"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.",
"addedComponent": [
{
"type": "Select",
"label": "SharePoint Sync Button state",
"name": "standards.SPSyncButtonState.state",
"values": [
{
"label": "Disabled",
"value": "true"
},
{
"label": "Enabled",
"value": "false"
}
]
}
],
"label": "Set SharePoint sync button state",
"impact": "Medium Impact",
"impactColour": "warning",
"powershellEquivalent": "Graph API or Portal",
"powershellEquivalent": "Set-SPOTenant -HideSyncButtonOnTeamSite $true or $false",
"recommendedBy": []
},
{
"name": "standards.DisableSharePointLegacyAuth",
"cat": "SharePoint Standards",
"tag": ["mediumimpact", "CIS"],
"tag": ["mediumimpact", "CIS", "spo_legacy_auth"],
"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.",
"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.",
"addedComponent": [],
Expand Down
5 changes: 4 additions & 1 deletion src/importsMap.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ import React from 'react'
"/email/reports/mailbox-cas-settings": React.lazy(() => import('./views/email-exchange/reports/MailboxClientAccessSettingsList')),
"/email/reports/message-trace": React.lazy(() => import('./views/email-exchange/reports/MessageTrace')),
"/cipp/user-settings": React.lazy(() => import('./views/cipp/UserSettings')),
"/email/reports/phishing-policies": React.lazy(() => import('./views/email-exchange/reports/PhishingPoliciesList')),
"/email/reports/antiphishing-filters": React.lazy(() => import('./views/email-exchange/reports/AntiPhishingFilters')),
"/email/reports/malware-filters": React.lazy(() => import('./views/email-exchange/reports/MalwareFilters')),
"/email/reports/safelinks-filters": React.lazy(() => import('./views/email-exchange/reports/SafeLinksFilters')),
"/email/reports/safeattachments-filters": React.lazy(() => import('./views/email-exchange/reports/SafeAttachmentsFilters')),
"/security/incidents/list-alerts": React.lazy(() => import('./views/security/incidents/ListAlerts')),
"/security/incidents/list-incidents": React.lazy(() => import('./views/security/incidents/ListIncidents')),
"/security/reports/list-device-compliance": React.lazy(() => import('./views/security/reports/ListDeviceComplianceReport')),
Expand Down
24 changes: 21 additions & 3 deletions src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -890,9 +890,27 @@
"allowedRoles": ["admin", "editor", "readonly"]
},
{
"name": "Phishing Policies",
"path": "/email/reports/phishing-policies",
"component": "views/email-exchange/reports/PhishingPoliciesList",
"path": "/email/reports/antiphishing-filters",
"name": "Anti Phishing Filters",
"component": "views/email-exchange/reports/AntiPhishingFilters",
"allowedRoles": ["admin", "editor", "readonly"]
},
{
"path": "/email/reports/malware-filters",
"name": "Malware Filters",
"component": "views/email-exchange/reports/MalwareFilters",
"allowedRoles": ["admin", "editor", "readonly"]
},
{
"path": "/email/reports/safelinks-filters",
"name": "Safe Links Filters",
"component": "views/email-exchange/reports/SafeLinksFilters",
"allowedRoles": ["admin", "editor", "readonly"]
},
{
"path": "/email/reports/safeattachments-filters",
"name": "Safe Attachment Filters",
"component": "views/email-exchange/reports/SafeAttachmentsFilters",
"allowedRoles": ["admin", "editor", "readonly"]
},
{
Expand Down
14 changes: 7 additions & 7 deletions src/views/cipp/ExtensionSync.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,49 +19,49 @@ const ExtensionSync = () => {
const columns = [
{
name: 'Tenant',
selector: (row) => row['Tenant'],
selector: (row) => row?.Tenant,
sortable: true,
cell: cellGenericFormatter(),
exportSelector: 'Tenants',
},
{
name: 'Sync Type',
selector: (row) => row['SyncType'],
selector: (row) => row?.SyncType,
sortable: true,
cell: cellBadgeFormatter({ color: 'info' }),
exportSelector: 'SyncType',
},
{
name: 'Task',
selector: (row) => row['Name'],
selector: (row) => row?.Name,
sortable: true,
cell: cellGenericFormatter(),
exportSelector: 'Name',
},
{
name: 'Scheduled Time',
selector: (row) => row['ScheduledTime'],
selector: (row) => row?.ScheduledTime,
sortable: true,
cell: cellDateFormatter({ format: 'short' }),
exportSelector: 'ScheduledTime',
},
{
name: 'Last Run',
selector: (row) => row['ExecutedTime'],
selector: (row) => row?.ExecutedTime,
sortable: true,
cell: cellDateFormatter({ format: 'short' }),
exportSelector: 'ExecutedTime',
},
{
name: 'Repeats every',
selector: (row) => row['RepeatsEvery'],
selector: (row) => row?.RepeatsEvery,
sortable: true,
cell: (row) => CellTip(row['RepeatsEvery']),
exportSelector: 'RepeatsEvery',
},
{
name: 'Results',
selector: (row) => row['Results'],
selector: (row) => row?.Results,
sortable: true,
cell: cellGenericFormatter(),
exportSelector: 'Results',
Expand Down
2 changes: 1 addition & 1 deletion src/views/cipp/Setup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ const Setup = () => {
type="text"
name="TenantID"
label="Tenant ID"
placeholder="Enter the Tenant ID. e.g. mymsp.onmicrosoft.com. Leave blank to retain a previous key if this exists."
placeholder="Enter the Tenant ID. e.g. 1111-1111-1111-1111-11111. Leave blank to retain a previous key if this exists."
/>
</CCol>
</CRow>
Expand Down
32 changes: 20 additions & 12 deletions src/views/cipp/UserSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,28 +156,36 @@ const UserSettings = () => {
<CRow className="mb-3">
<h3 className="underline mb-5">Offboarding Defaults</h3>
<CCol>
<RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
<RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
<RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
<RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
<RFFCFormSwitch
name="ConvertToShared"
label="Convert to Shared Mailbox"
/>
<RFFCFormSwitch
name="HideFromGAL"
label="Hide from Global Address List"
/>
</CCol>
<CCol>
<RFFCFormSwitch
name="ConvertToShared"
label="Convert to Shared Mailbox"
name="removeCalendarInvites"
label="Cancel all calendar invites"
/>
<RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
<RFFCFormSwitch name="ResetPass" label="Reset Password" />
<RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />

<RFFCFormSwitch
name="removePermissions"
label="Remove users mailbox permissions"
/>
<RFFCFormSwitch name="RemoveRules" label="Remove all Rules" />
<RFFCFormSwitch
name="keepCopy"
label="Keep copy of forwarded mail in source mailbox"
/>
<RFFCFormSwitch name="RemoveMobile" label="Remove all Mobile Devices" />
</CCol>
<CCol>
<RFFCFormSwitch name="RemoveGroups" label="Remove from all groups" />
<RFFCFormSwitch name="RemoveLicenses" label="Remove Licenses" />
<RFFCFormSwitch name="RevokeSessions" label="Revoke all sessions" />
<RFFCFormSwitch name="DisableSignIn" label="Disable Sign in" />
<RFFCFormSwitch name="ResetPass" label="Reset Password" />
<RFFCFormSwitch name="DeleteUser" label="Delete user" />
</CCol>
</CRow>
<CRow className="mb-3">
Expand Down
Loading