Merge pull request #58 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
kris6673 · Jul 15, 2024 · cc7b5ab · cc7b5ab
2 parents 81ca69e + 8ebd98b
commit cc7b5ab
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 3 deletions.
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -1294,6 +1294,25 @@
     "powershellEquivalent": "Get-Mailbox & Update-MgUser",
     "recommendedBy": ["CIS"]
   },
+  {
+    "name": "standards.QuarantineRequestAlert",
+    "cat": "Defender Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Sets a e-mail address to alert when a User requests to release a quarantined message.",
+    "docsDescription": "Sets a e-mail address to alert when a User requests to release a quarantined message. This is useful for monitoring and ensuring that the correct messages are released.",
+    "addedComponent": [
+      {
+        "type": "input",
+        "name": "standards.QuarantineRequestAlert.NotifyUser",
+        "label": "E-mail to receive the alert"
+      }
+    ],
+    "label": "Quarantine Release Request Alert",
+    "impact": "Low Impact",
+    "impactColour": "info",
+    "powershellEquivalent": "New-ProtectionAlert and Set-ProtectionAlert",
+    "recommendedBy": []
+  },
   {
     "name": "standards.SafeLinksPolicy",
     "cat": "Defender Standards",
@@ -1675,6 +1694,129 @@
     "powershellEquivalent": "Set-MalwareFilterPolicy or New-MalwareFilterPolicy",
     "recommendedBy": ["CIS"]
   },
+  {
+    "name": "standards.SpamFilterPolicy",
+    "cat": "Defender Standards",
+    "tag": ["mediumimpact"],
+    "helpText": "This standard creates a Spam filter policy similar to the default strict policy.",
+    "addedComponent": [
+      {
+        "type": "Select",
+        "label": "Spam Action",
+        "name": "standards.SpamFilterPolicy.SpamAction",
+        "values": [
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "Spam Quarantine Tag",
+        "name": "standards.SpamFilterPolicy.SpamQuarantineTag",
+        "values": [
+          {
+            "label": "AdminOnlyAccessPolicy",
+            "value": "AdminOnlyAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessPolicy",
+            "value": "DefaultFullAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessWithNotificationPolicy",
+            "value": "DefaultFullAccessWithNotificationPolicy"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "High Confidence Spam Quarantine Tag",
+        "name": "standards.SpamFilterPolicy.HighConfidenceSpamQuarantineTag",
+        "values": [
+          {
+            "label": "AdminOnlyAccessPolicy",
+            "value": "AdminOnlyAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessPolicy",
+            "value": "DefaultFullAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessWithNotificationPolicy",
+            "value": "DefaultFullAccessWithNotificationPolicy"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "Bulk Quarantine Tag",
+        "name": "standards.SpamFilterPolicy.BulkQuarantineTag",
+        "values": [
+          {
+            "label": "AdminOnlyAccessPolicy",
+            "value": "AdminOnlyAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessPolicy",
+            "value": "DefaultFullAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessWithNotificationPolicy",
+            "value": "DefaultFullAccessWithNotificationPolicy"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "Phish Quarantine Tag",
+        "name": "standards.SpamFilterPolicy.PhishQuarantineTag",
+        "values": [
+          {
+            "label": "AdminOnlyAccessPolicy",
+            "value": "AdminOnlyAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessPolicy",
+            "value": "DefaultFullAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessWithNotificationPolicy",
+            "value": "DefaultFullAccessWithNotificationPolicy"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "High Confidence Phish Quarantine Tag",
+        "name": "standards.SpamFilterPolicy.HighConfidencePhishQuarantineTag",
+        "values": [
+          {
+            "label": "AdminOnlyAccessPolicy",
+            "value": "AdminOnlyAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessPolicy",
+            "value": "DefaultFullAccessPolicy"
+          },
+          {
+            "label": "DefaultFullAccessWithNotificationPolicy",
+            "value": "DefaultFullAccessWithNotificationPolicy"
+          }
+        ]
+      }
+    ],
+    "label": "Default Spam Filter Policy",
+    "impact": "Medium Impact",
+    "impactColour": "warning",
+    "powershellEquivalent": "New-HostedContentFilterPolicy or Set-HostedContentFilterPolicy",
+    "recommendedBy": []
+  },
   {
     "name": "standards.intuneDeviceRetirementDays",
     "cat": "Intune Standards",
@@ -1888,6 +2030,18 @@
     "powershellEquivalent": "Set-SPOTenant -DisallowInfectedFileDownload $true",
     "recommendedBy": ["CIS 3.0"]
   },
+  {
+    "name": "standards.SPDisableLegacyWorkflows",
+    "cat": "SharePoint Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Disables the creation of new SharePoint 2010 and 2013 classic workflows and removes the 'Return to classic SharePoint' link on modern SharePoint list and library pages.",
+    "addedComponent": [],
+    "label": "Disable Legacy Workflows",
+    "impact": "Low Impact",
+    "impactColour": "info",
+    "powershellEquivalent": "Set-SPOTenant -DisableWorkflow2010 $true -DisableWorkflow2013 $true -DisableBackToClassic $true",
+    "recommendedBy": []
+  },
   {
     "name": "standards.SPDirectSharing",
     "cat": "SharePoint Standards",

diff --git a/src/views/endpoint/intune/MEMListAppProtection.jsx b/src/views/endpoint/intune/MEMListAppProtection.jsx
@@ -128,7 +128,7 @@ const AppProtectionList = () => {
               label: 'Delete Policy',
               modal: true,
               modalUrl: `api/RemovePolicy?TenantFilter=${tenant?.defaultDomainName}&ID=!id&URLName=managedAppPolicies`,
-              modalMessage: 'Are you sure you want to convert these users to a shared mailbox?',
+              modalMessage: 'Are you sure you want to delete these policies?',
             },
           ],
         },

diff --git a/src/views/endpoint/intune/MEMListPolicies.jsx b/src/views/endpoint/intune/MEMListPolicies.jsx
@@ -146,7 +146,7 @@ const IntuneList = () => {
               label: 'Delete Policy',
               modal: true,
               modalUrl: `api/RemovePolicy?TenantFilter=${tenant?.defaultDomainName}&ID=!id&URLName=!URLName`,
-              modalMessage: 'Are you sure you want to convert these users to a shared mailbox?',
+              modalMessage: 'Are you sure you want to delete these policies?',
             },
           ],
         },

diff --git a/src/views/tenant/administration/AlertWizard.jsx b/src/views/tenant/administration/AlertWizard.jsx
@@ -203,7 +203,7 @@ const AlertWizard = () => {
                                   ]}
                                   name="logbook"
                                   placeholder={'Select a log source'}
-                                  label="Select the log you which to receive the alert for"
+                                  label="Select the log you wish to receive the alert for"
                                   validate={required}
                                 />
                               </CCol>