From 3a8c74e4dac88826569334823958b4eecc246c05 Mon Sep 17 00:00:00 2001
From: cipptesting <security+cipptesting@milesit.com>
Date: Mon, 29 Jul 2024 14:09:02 -0400
Subject: [PATCH 1/2] Updated Spam Filter Standard

---
 src/data/standards.json | 51 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/data/standards.json b/src/data/standards.json
index 51e5cf143234..1536d4a20a2c 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -1703,6 +1703,12 @@
     "tag": ["mediumimpact"],
     "helpText": "This standard creates a Spam filter policy similar to the default strict policy.",
     "addedComponent": [
+      {
+        "type": "number",
+        "label": "Bulk email threshold (Default 7)",
+        "name": "standards.SpamFilterPolicy.BulkThreshold",
+        "default": 7
+      },
       {
         "type": "Select",
         "label": "Spam Action",
@@ -1737,6 +1743,21 @@
           }
         ]
       },
+      {
+        "type": "Select",
+        "label": "High Confidence Spam Action",
+        "name": "standards.SpamFilterPolicy.HighConfidenceSpamAction",
+        "values": [
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          },
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
+          }
+        ]
+      },
       {
         "type": "Select",
         "label": "High Confidence Spam Quarantine Tag",
@@ -1756,6 +1777,21 @@
           }
         ]
       },
+      {
+        "type": "Select",
+        "label": "Bulk Spam Action",
+        "name": "standards.SpamFilterPolicy.BulkSpamAction",
+        "values": [
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
       {
         "type": "Select",
         "label": "Bulk Quarantine Tag",
@@ -1775,6 +1811,21 @@
           }
         ]
       },
+      {
+        "type": "Select",
+        "label": "Phish Spam Action",
+        "name": "standards.SpamFilterPolicy.PhishSpamAction",
+        "values": [
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          },
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
+          }
+        ]
+      },
       {
         "type": "Select",
         "label": "Phish Quarantine Tag",

From e2cbb688cd480fcef6f306a784cc7dd73ac6570d Mon Sep 17 00:00:00 2001
From: cipptesting <security+cipptesting@milesit.com>
Date: Mon, 29 Jul 2024 15:37:09 -0400
Subject: [PATCH 2/2] Updated standards.json based on feedback

---
 src/data/standards.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/data/standards.json b/src/data/standards.json
index 1536d4a20a2c..310890368c4d 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -1714,13 +1714,13 @@
         "label": "Spam Action",
         "name": "standards.SpamFilterPolicy.SpamAction",
         "values": [
-          {
-            "label": "Move message to Junk Email folder",
-            "value": "MoveToJmf"
-          },
           {
             "label": "Quarantine the message",
             "value": "Quarantine"
+          },
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
           }
         ]
       },
@@ -1782,13 +1782,13 @@
         "label": "Bulk Spam Action",
         "name": "standards.SpamFilterPolicy.BulkSpamAction",
         "values": [
-          {
-            "label": "Move message to Junk Email folder",
-            "value": "MoveToJmf"
-          },
           {
             "label": "Quarantine the message",
             "value": "Quarantine"
+          },
+          {
+            "label": "Move message to Junk Email folder",
+            "value": "MoveToJmf"
           }
         ]
       },