From a13ac920892d25ba0bf431ea1410fd3c8612b2d6 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 6 Jul 2020 09:03:20 -0400
Subject: [PATCH] Replace seemingly abandoned malware lists with urlhaus list

Related issues:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1116
- https://github.com/uBlockOrigin/uBlock-issues/issues/984

It has been found that the two malware lists uBO uses by
default appear to be essentially no longer maintained.

urlhaus list[1] has been identified by the community as
being well maintained and as being actually useful as a
default malware-related list in uBO, since it's being updated
every day from a database of top domains and specific URLs
identified as serving malicious content. Additionally, the
maintainer of urlhaus list has taken steps to increase
compatibility with uBO[2].

The decision has been to replace the current two malware-
related lists with urlhaus list, which will be enabled by
default in uBO -- and this means that list will be part of
uBO's package from now on.

For those who have the two removed malware lists enabled,
these will be moved to the custom lists section -- they
will still be enabled. It is suggested users remove them from
their selection of lists as their usefulness at this point
is questionable.

[1] https://gitlab.com/curben/urlhaus-filter
[2] https://gitlab.com/curben/urlhaus-filter/-/commit/859dfd03c6e9e5af6f1fac29bc9b22d1e0046111
---
 assets/assets.json   | 29 ++++++++++-------------------
 tools/make-assets.sh |  3 +--
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/assets/assets.json b/assets/assets.json
index 6cdbecb05..33f4c2f0f 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -139,30 +139,21 @@
 		"contentURL": "https://www.fanboy.co.nz/enhancedstats.txt",
 		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
 	},
-	"malware-0": {
-		"content": "filters",
-		"group": "malware",
-		"title": "Malware Domain List",
-		"contentURL": [
-			"https://gitcdn.xyz/repo/NanoMeow/MDLMirror/master/hosts.txt",
-			"https://raw.githubusercontent.com/NanoMeow/MDLMirror/master/hosts.txt",
-			"https://www.malwaredomainlist.com/hostslist/hosts.txt",
-			"https://gitcdn.xyz/repo/NanoMeow/MDLMirror/master/filter.txt",
-			"https://raw.githubusercontent.com/NanoMeow/MDLMirror/master/filter.txt",
-			"assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt"
-		]
-	},
-	"malware-1": {
+	"urlhaus-1": {
 		"content": "filters",
 		"group": "malware",
 		"title": "Malware domains",
 		"contentURL": [
-			"https://mirror.cedia.org.ec/malwaredomains/justdomains",
-			"https://mirror1.malwaredomains.com/files/justdomains",
-			"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains.txt",
-			"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains"
+			"https://gitlab.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt",
+			"assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt"
 		],
-		"supportURL": "https://www.malwaredomains.com/"
+		"cdnURLs": [
+			"https://cdn.statically.io/gl/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt",
+			"https://glcdn.githack.com/curben/urlhaus-filter/raw/master/urlhaus-filter-online.txt",
+			"https://gitcdn.xyz/repo/curbengh/urlhaus-filter/master/urlhaus-filter-online.txt",
+			"https://repo.or.cz/urlhaus-filter.git/blob_plain/refs/heads/master:/urlhaus-filter-online.txt"
+		],
+		"supportURL": "https://gitlab.com/curben/urlhaus-filter#urlhaus-malicious-url-blocklist"
 	},
 	"spam404-0": {
 		"content": "filters",
diff --git a/tools/make-assets.sh b/tools/make-assets.sh
index ecf0b9729..515550d9a 100755
--- a/tools/make-assets.sh
+++ b/tools/make-assets.sh
@@ -17,10 +17,9 @@ cp -R ./assets $DES/
 
 mkdir $DES/thirdparties
 cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/
-cp -R ../uAssets/thirdparties/mirror1.malwaredomains.com         $DES/thirdparties/
 cp -R ../uAssets/thirdparties/pgl.yoyo.org                       $DES/thirdparties/
 cp -R ../uAssets/thirdparties/publicsuffix.org                   $DES/thirdparties/
-cp -R ../uAssets/thirdparties/www.malwaredomainlist.com          $DES/thirdparties/
+cp -R ../uAssets/thirdparties/urlhaus-filter                     $DES/thirdparties/
 
 mkdir $DES/ublock
 cp -R ../uAssets/filters/*                                       $DES/ublock/