From 9c4bed31e79dac3d558efe3510ff372a2cdbe59f Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 24 Nov 2022 18:44:39 +0300 Subject: [PATCH] Pull request: use-download-url Merge in DNS/adguard-home from use-download-url to master Squashed commit of the following: commit d665794ef0594b87044c7a1aadac6ac9dc31722a Author: Ainar Garipov Date: Thu Nov 24 18:06:36 2022 +0300 all: use download url for vetted lists --- CHANGELOG.md | 4 ++ client/src/helpers/filters/filters.js | 66 +++++++++++++-------------- scripts/vetted-filters/main.go | 16 ++++--- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4abd1cd..78683cf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,10 @@ See also the [v0.107.20 GitHub milestone][ms-v0.107.20]. [ms-v0.107.20]: https://github.com/AdguardTeam/AdGuardHome/milestone/56?closed=1 --> +### Fixed + +- URLs of some vetter blocklists. + ## [v0.107.19] - 2022-11-23 diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js index 8be075e9..5a5ffad7 100644 --- a/client/src/helpers/filters/filters.js +++ b/client/src/helpers/filters/filters.js @@ -26,199 +26,199 @@ export default { "name": "1Hosts (Lite)", "categoryId": "general", "homepage": "https://badmojr.github.io/1Hosts/", - "source": "https://badmojr.gitlab.io/1hosts/Lite/adblock.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_24.txt" }, "CHN_adrules": { "name": "CHN: AdRules DNS List", "categoryId": "regional", "homepage": "https://github.com/Cats-Team/AdRules", - "source": "https://raw.githubusercontent.com/Cats-Team/AdRules/main/dns.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_29.txt" }, "CHN_anti_ad": { "name": "CHN: anti-AD", "categoryId": "regional", "homepage": "https://anti-ad.net/", - "source": "https://anti-ad.net/easylist.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_21.txt" }, "IDN_abpindo": { "name": "IDN: ABPindo", "categoryId": "regional", "homepage": "https://github.com/ABPindo/indonesianadblockrules", - "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/aghome.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_22.txt" }, "IRN_unwanted_iranian_domains": { "name": "IRN: PersianBlocker list", "categoryId": "regional", "homepage": "https://github.com/MasterKia/PersianBlocker", - "source": "https://raw.githubusercontent.com/MasterKia/PersianBlocker/main/PersianBlockerHosts.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_19.txt" }, "ITA_filtri_dns": { "name": "ITA: Filtri-DNS", "categoryId": "regional", "homepage": "https://filtri-dns.ga/", - "source": "https://filtri-dns.ga/filtri.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_18.txt" }, "KOR_list_kr": { "name": "KOR: List-KR DNS", "categoryId": "regional", "homepage": "https://github.com/List-KR/List-KR", - "source": "https://github.com/List-KR/List-KR" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_25.txt" }, "KOR_youslist": { "name": "KOR: YousList", "categoryId": "regional", "homepage": "https://github.com/yous/YousList", - "source": "https://raw.githubusercontent.com/yous/YousList/master/hosts.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_15.txt" }, "MKD_macedonian_pi_hole_blocklist": { "name": "MKD: Macedonian Pi-hole Blocklist", "categoryId": "regional", "homepage": "https://github.com/cchevy/macedonian-pi-hole-blocklist", - "source": "https://raw.githubusercontent.com/cchevy/macedonian-pi-hole-blocklist/master/hosts.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_20.txt" }, "NOR_dandelion_sprouts_anti_malware_list": { "name": "NOR: Dandelion Sprouts nordiske filtre", "categoryId": "regional", "homepage": "https://github.com/DandelionSprout/adfilt", - "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt" }, "POL_polish_filters_for_pi_hole": { "name": "POL: Polish filters for Pi hole", "categoryId": "regional", "homepage": "https://www.certyficate.it/", - "source": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_14.txt" }, "SWE_frellwit_swedish_hosts_file": { "name": "SWE: Frellwit's Swedish Hosts File", "categoryId": "regional", "homepage": "https://github.com/lassekongo83/Frellwits-filter-lists/", - "source": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Hosts-File.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_17.txt" }, "TUR_turk_adlist": { "name": "TUR: turk-adlist", "categoryId": "regional", "homepage": "https://github.com/bkrucarci/turk-adlist", - "source": "https://raw.githubusercontent.com/bkrucarci/turk-adlist/master/hosts" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_26.txt" }, "VNM_abpvn": { "name": "VNM: ABPVN List", "categoryId": "regional", "homepage": "http://abpvn.com/", - "source": "https://abpvn.com/android/abpvn.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_16.txt" }, "adguard_dns_filter": { "name": "AdGuard DNS filter", "categoryId": "general", "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter", - "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt" }, "adway_default_blocklist": { "name": "AdAway Default Blocklist", "categoryId": "general", "homepage": "https://github.com/AdAway/adaway.github.io/", - "source": "https://adaway.org/hosts.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt" }, "curben_phishing_filter": { "name": "Phishing URL Blocklist (PhishTank and OpenPhish)", "categoryId": "security", "homepage": "https://gitlab.com/malware-filter/phishing-filter", - "source": "https://malware-filter.gitlab.io/malware-filter/phishing-filter-agh.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_30.txt" }, "dan_pollocks_list": { "name": "Dan Pollock's List", "categoryId": "general", "homepage": "https://someonewhocares.org/", - "source": "https://someonewhocares.org/hosts/zero/hosts" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_4.txt" }, "dandelion_sprouts_anti_malware_list": { "name": "Dandelion Sprout's Anti-Malware List", "categoryId": "security", "homepage": "https://github.com/DandelionSprout/adfilt", - "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_12.txt" }, "dandelion_sprouts_game_console_adblock_list": { "name": "Dandelion Sprout's Game Console Adblock List", "categoryId": "other", "homepage": "https://github.com/DandelionSprout/adfilt", - "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/GameConsoleAdblockList.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_6.txt" }, "energized_spark": { "name": "Energized Spark", "categoryId": "general", "homepage": "https://energized.pro/", - "source": "https://block.energized.pro/spark/formats/filter" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt" }, "nocoin_filter_list": { "name": "NoCoin Filter List", "categoryId": "security", "homepage": "https://github.com/hoshsadiq/adblock-nocoin-list/", - "source": "https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_8.txt" }, "notracking_hosts_blocklists": { "name": "The NoTracking blocklist", "categoryId": "general", "homepage": "https://github.com/notracking/hosts-blocklists", - "source": "https://raw.githubusercontent.com/notracking/hosts-blocklists/master/adblock/adblock.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_32.txt" }, "oisd_basic": { "name": "OISD Blocklist Basic", "categoryId": "general", "homepage": "https://oisd.nl/", - "source": "https://abp.oisd.nl/basic/" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_5.txt" }, "oisd_full": { "name": "OISD Blocklist Full", "categoryId": "general", "homepage": "https://oisd.nl/", - "source": "https://abp.oisd.nl/" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_27.txt" }, "perflyst_dandelion_sprout_smart_tv_blocklist_for_adguard_home": { "name": "Perflyst and Dandelion Sprout's Smart-TV Blocklist", "categoryId": "other", "homepage": "https://github.com/Perflyst/PiHoleBlocklist", - "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_7.txt" }, "peter_lowe_list": { "name": "Peter Lowe's Blocklist", "categoryId": "general", "homepage": "https://pgl.yoyo.org/adservers/", - "source": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus\u0026showintro=1\u0026mimetype=plaintext" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_3.txt" }, "scam_blocklist_by_durablenapkin": { "name": "Scam Blocklist by DurableNapkin", "categoryId": "security", "homepage": "https://github.com/durablenapkin/scamblocklist", - "source": "https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/adguard.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_10.txt" }, "staklerware_indicators_list": { "name": "Stalkerware Indicators List", "categoryId": "security", "homepage": "https://github.com/AssoEchap/stalkerware-indicators", - "source": "https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_31.txt" }, "steven_blacks_list": { "name": "Steven Black's List", "categoryId": "general", "homepage": "https://github.com/StevenBlack/hosts", - "source": "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_33.txt" }, "the_big_list_of_hacked_malware_web_sites": { "name": "The Big List of Hacked Malware Web Sites", "categoryId": "security", "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites", - "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt" }, "urlhaus_filter_online": { "name": "Malicious URL Blocklist (URLHaus)", "categoryId": "security", "homepage": "https://gitlab.com/malware-filter/urlhaus-filter", - "source": "https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-agh.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt" }, "windowsspyblocker_hosts_spy_rules": { "name": "WindowsSpyBlocker - Hosts spy rules", "categoryId": "other", "homepage": "https://github.com/crazy-max/WindowsSpyBlocker", - "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_23.txt" } } } diff --git a/scripts/vetted-filters/main.go b/scripts/vetted-filters/main.go index d5647924..e0076878 100644 --- a/scripts/vetted-filters/main.go +++ b/scripts/vetted-filters/main.go @@ -74,7 +74,11 @@ func main() { Name: f.Name, CategoryID: cat, Homepage: f.Homepage, - Source: f.SourceURL, + // NOTE: The source URL in filters.json is not guaranteed to contain + // the URL of the filtering rule list. So, use our mirror for the + // vetted blocklists, which are mostly guaranteed to be valid and + // available lists. + Source: f.DownloadURL, } } @@ -114,11 +118,11 @@ type hlFilters struct { // hlFiltersFilter is the JSON structure for a filter in the Hostlists Registry. type hlFiltersFilter struct { - FilterID string `json:"filterId"` - Name string `json:"name"` - Homepage string `json:"homepage"` - SourceURL string `json:"sourceUrl"` - Tags []string `json:"tags"` + DownloadURL string `json:"downloadUrl"` + FilterID string `json:"filterId"` + Homepage string `json:"homepage"` + Name string `json:"name"` + Tags []string `json:"tags"` } // category returns the AdGuard Home category for this filter. If there is no