From ac9e12e17c722bffe885343647d74a366d7c78b9 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sat, 14 Dec 2024 08:45:17 -0500
Subject: [PATCH] [mv3] Add "Malware protection, security" section in "Filter
 lists" pane

Additionally, add "Openphish Domain Blocklist" as stock list.
---
 .../mv3/extension/_locales/en/messages.json   |  2 +-
 platform/mv3/extension/js/filter-lists.js     |  5 +++
 platform/mv3/make-rulesets.js                 | 36 ++++++++++++-------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/platform/mv3/extension/_locales/en/messages.json b/platform/mv3/extension/_locales/en/messages.json
index ad9d26911..c40e17428 100644
--- a/platform/mv3/extension/_locales/en/messages.json
+++ b/platform/mv3/extension/_locales/en/messages.json
@@ -60,7 +60,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupMalware": {
-    "message": "Malware domains",
+    "message": "Malware protection, security",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupAnnoyances": {
diff --git a/platform/mv3/extension/js/filter-lists.js b/platform/mv3/extension/js/filter-lists.js
index daa647c5e..2356d57ce 100644
--- a/platform/mv3/extension/js/filter-lists.js
+++ b/platform/mv3/extension/js/filter-lists.js
@@ -218,6 +218,11 @@ export function renderFilterLists(rulesetData) {
             rulesetDetails.filter(ruleset =>
                 ruleset.id === 'default' 
             ),
+        ], [
+            'malware',
+            rulesetDetails.filter(ruleset =>
+                ruleset.group === 'malware'
+            ),
         ], [
             'annoyances',
             rulesetDetails.filter(ruleset =>
diff --git a/platform/mv3/make-rulesets.js b/platform/mv3/make-rulesets.js
index e23de3e44..f2c62671f 100644
--- a/platform/mv3/make-rulesets.js
+++ b/platform/mv3/make-rulesets.js
@@ -1186,23 +1186,22 @@ async function main() {
     log(`Secret: ${secret}`);
 
     // Assemble all default lists as the default ruleset
-    const contentURLs = [
-        'https://ublockorigin.github.io/uAssets/filters/filters.min.txt',
-        'https://ublockorigin.github.io/uAssets/filters/badware.min.txt',
-        'https://ublockorigin.github.io/uAssets/filters/privacy.min.txt',
-        'https://ublockorigin.github.io/uAssets/filters/unbreak.min.txt',
-        'https://ublockorigin.github.io/uAssets/filters/quick-fixes.min.txt',
-        'https://ublockorigin.github.io/uAssets/filters/ubol-filters.txt',
-        'https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt',
-        'https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt',
-        'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext',
-    ];
     await rulesetFromURLs({
         id: 'default',
         name: 'Ads, trackers, miners, and more' ,
         enabled: true,
         secret,
-        urls: contentURLs,
+        urls: [
+            'https://ublockorigin.github.io/uAssets/filters/filters.min.txt',
+            'https://ublockorigin.github.io/uAssets/filters/badware.min.txt',
+            'https://ublockorigin.github.io/uAssets/filters/privacy.min.txt',
+            'https://ublockorigin.github.io/uAssets/filters/unbreak.min.txt',
+            'https://ublockorigin.github.io/uAssets/filters/quick-fixes.min.txt',
+            'https://ublockorigin.github.io/uAssets/filters/ubol-filters.txt',
+            'https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt',
+            'https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt',
+            'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext',
+        ],
         dnrURL: 'https://ublockorigin.github.io/uAssets/dnr/default.json',
         homeURL: 'https://github.com/uBlockOrigin/uAssets',
         filters: [
@@ -1290,6 +1289,7 @@ async function main() {
     await rulesetFromURLs({
         id: 'urlhaus.full',
         name: 'Malicious URL Blocklist',
+        group: 'malware',
         enabled: true,
         urls: [
             'https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-hosts.txt',
@@ -1298,6 +1298,18 @@ async function main() {
         ],
         homeURL: 'https://gitlab.com/malware-filter/urlhaus-filter',
     });
+    await rulesetFromURLs({
+        id: 'openphish.domains',
+        name: 'Openphish Domain Blocklist',
+        group: 'malware',
+        enabled: false,
+        urls: [
+            'https://raw.githubusercontent.com/stephenhawk8054/openphish-adblock/refs/heads/main/filters_init_domains.txt',
+        ],
+        filters: [
+        ],
+        homeURL: 'https://github.com/stephenhawk8054/openphish-adblock',
+    });
 
     await rulesetFromURLs({
         id: 'stevenblack-hosts',