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/