adblock: release 1.1.0

* support more router modes, as long as the firewall and the DNS server
are enabled
* new source sites can be added & changed via awk ruleset in uci config
* source domain count, last update time & overall count will be stored
in uci config
* added 3 new source sites:
   ransomware tracker
   rolist/easylist
   winspy
* switch to minimal inline base64 encoded 1×1 GIF for pixel server
(separate png image no longer needed)
* simplified uci parser
* source download & domain sort optimization
* add whitelist parser with wildcard support
* reduced code size & various cleanups
* updated documentation

Signed-off-by: Dirk Brenken <openwrt@brenken.org>

1 files changed, 79 insertions, 39 deletions

diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf
index cb18787dc..061f51812 100644
--- a/net/adblock/files/adblock.conf
+++ b/net/adblock/files/adblock.conf
@@ -3,96 +3,136 @@
 
 config adblock 'global'
 	option adb_enabled '1'
-	option adb_cfgver '1.0'
-	option adb_blacklist '/etc/adblock/adblock.blacklist'
+	option adb_cfgversion '1.1'
 	option adb_whitelist '/etc/adblock/adblock.whitelist'
+	option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
 	option adb_forcedns '1'
 
 config service 'backup'
 	option enabled '0'
-	option adb_backupdir '/mnt'
+	option adb_dir '/mnt'
 
 config source 'adaway'
 	option enabled '1'
-	option adb_src 'https://adaway.org/hosts.txt&ruleset=rset_adaway'
-	option adb_srcdesc 'focus on mobile ads, infrequent updates, approx. 400 entries'
+	option adb_src 'https://adaway.org/hosts.txt'
+	option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'focus on mobile ads, infrequent updates, approx. 400 entries'
+
+config source 'blacklist'
+	option enabled '0'
+	option adb_src '/etc/adblock/adblock.blacklist'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'static local domain blacklist (always deny these domains)'
 
 config source 'disconnect'
 	option enabled '1'
-	option adb_src 'https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt&ruleset=rset_disconnect'
-	option adb_srcdesc 'mozilla driven content blocklist, numerous updates on the same day, approx. 6.500 entries'
+	option adb_src 'https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'mozilla driven content blocklist, numerous updates on the same day, approx. 6.500 entries'
 
 config source 'dshield'
 	option enabled '0'
-	option adb_src 'http://www.dshield.org/feeds/suspiciousdomains_Low.txt&ruleset=rset_dshield'
-	option adb_srcdesc 'broad blocklist for suspicious domains, daily updates, approx. 4.500 entries'
+	option adb_src 'http://www.dshield.org/feeds/suspiciousdomains_Low.txt'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'broad blocklist for suspicious domains, daily updates, approx. 4.500 entries'
 
 config source 'feodo'
 	option enabled '0'
-	option adb_src 'https://feodotracker.abuse.ch/blocklist/?download=domainblocklist&ruleset=rset_feodo'
-	option adb_srcdesc 'focus on feodo botnet domains, daily updates, approx. 0-10 entries'
+	option adb_src 'https://feodotracker.abuse.ch/blocklist/?download=domainblocklist'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'focus on feodo botnet domains, daily updates, approx. 0-10 entries'
 
 config source 'malware'
 	option enabled '0'
-	option adb_src 'https://mirror.cedia.org.ec/malwaredomains/justdomains&ruleset=rset_malware'
-	option adb_srcdesc 'broad blocklist for malware domains, daily updates, approx. 16.000 entries'
+	option adb_src 'https://mirror.cedia.org.ec/malwaredomains/justdomains'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'broad blocklist for malware domains, daily updates, approx. 16.000 entries'
 
 config source 'malwarelist'
 	option enabled '0'
-	option adb_src 'http://www.malwaredomainlist.com/hostslist/hosts.txt&ruleset=rset_malwarelist'
-	option adb_srcdesc 'generic blocklist for malware domains, daily updates, approx. 1.500 entries'
+	option adb_src 'http://www.malwaredomainlist.com/hostslist/hosts.txt'
+	option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'generic blocklist for malware domains, daily updates, approx. 1.500 entries'
 
 config source 'openphish'
 	option enabled '0'
-	option adb_src 'https://openphish.com/feed.txt&ruleset=rset_openphish'
-	option adb_srcdesc 'focus on phishing domains, numerous updates on the same day, approx. 1.800 entries'
+	option adb_src 'https://openphish.com/feed.txt'
+	option adb_src_rset '{FS=\"/\"} \$3 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$3)}'
+	option adb_src_desc 'focus on phishing domains, numerous updates on the same day, approx. 1.800 entries'
 
 config source 'palevo'
 	option enabled '0'
-	option adb_src 'https://palevotracker.abuse.ch/blocklists.php?download=domainblocklist&ruleset=rset_palevo'
-	option adb_srcdesc 'focus on palevo worm domains, daily updates, approx. 15 entries'
+	option adb_src 'https://palevotracker.abuse.ch/blocklists.php?download=domainblocklist'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'focus on palevo worm domains, daily updates, approx. 15 entries'
+
+config source 'ransomware'
+	option enabled '0'
+	option adb_src 'https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'focus on ransomware domains, numerous updates on the same day, approx. 130 entries'
+
+config source 'rolist'
+	option enabled '0'
+	option adb_src 'https://easylist-downloads.adblockplus.org/rolist+easylist.txt'
+	option adb_src_rset '{FS=\"[|^]\"} \$0 ~/^\|\|([A-Za-z0-9_-]+\.){1,}[A-Za-z]+\^$/{print tolower(\$3)}'
+	option adb_src_desc 'focus on romanian ad related domains plus generic easylist additions, weekly updates, approx. 600 entries'
 
 config source 'ruadlist'
 	option enabled '0'
-	option adb_src 'https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt&ruleset=rset_ruadlist'
-	option adb_srcdesc 'focus on russian ad related domains plus generic easylist additions, weekly updates, approx. 2.000 entries'
+	option adb_src 'https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt'
+	option adb_src_rset '{FS=\"[|^]\"} \$0 ~/^\|\|([A-Za-z0-9_-]+\.){1,}[A-Za-z]+\^$/{print tolower(\$3)}'
+	option adb_src_desc 'focus on russian ad related domains plus generic easylist additions, weekly updates, approx. 2.000 entries'
 
 config source 'shalla'
 	option enabled '0'
 	option adb_src 'http://www.shallalist.de/Downloads/shallalist.tar.gz'
-	option adb_srcdesc 'broad blocklist subdivided in different categories (adv, costtraps, spyware, tracker and warez enabled by default), daily updates, approx. 32.000 entries'
-	list adb_catlist 'adv'
-	list adb_catlist 'costtraps'
-	list adb_catlist 'spyware'
-	list adb_catlist 'tracker'
-	list adb_catlist 'warez'
+	option adb_src_rset '{FS=\"/\"} \$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'broad blocklist subdivided in different categories (adv, costtraps, spyware, tracker and warez enabled by default), daily updates, approx. 32.000 entries'
+	list adb_src_cat 'adv'
+	list adb_src_cat 'costtraps'
+	list adb_src_cat 'spyware'
+	list adb_src_cat 'tracker'
+	list adb_src_cat 'warez'
 
 config source 'spam404'
 	option enabled '0'
-	option adb_src 'https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt&ruleset=rset_spam404'
-	option adb_srcdesc 'generic blocklist for suspicious domains, infrequent updates, approx. 5.000 entries'
+	option adb_src 'https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'generic blocklist for suspicious domains, infrequent updates, approx. 5.000 entries'
 
 config source 'sysctl' 
 	option enabled '0'
-	option adb_src 'http://sysctl.org/cameleon/hosts&ruleset=rset_sysctl'
-	option adb_srcdesc 'generic blocklist for ad related domains, weekly updates, approx. 21.000 entries'
+	option adb_src 'http://sysctl.org/cameleon/hosts'
+	option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'generic blocklist for ad related domains, weekly updates, approx. 21.000 entries'
 
 config source 'whocares'
 	option enabled '0'
-	option adb_src 'http://someonewhocares.org/hosts/hosts&ruleset=rset_whocares'
-	option adb_srcdesc 'broad blocklist for suspicious domains, weekly updates, approx. 12.000 entries'
+	option adb_src 'http://someonewhocares.org/hosts/hosts'
+	option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'broad blocklist for suspicious domains, weekly updates, approx. 12.000 entries'
+
+config source 'winspy'
+	option enabled '0'
+	option adb_src 'https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/hostsBlockWindowsSpy.txt'
+	option adb_src_rset '\$0 ~/^0\.0\.0\.0[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'focus on windows spy & telemetry domains, infrequent updates, approx. 120 entries'
 
 config source 'winhelp'
 	option enabled '0'
-	option adb_src 'http://winhelp2002.mvps.org/hosts.txt&ruleset=rset_winhelp'
-	option adb_srcdesc 'broad blocklist for suspicious domains, infrequent updates, approx. 15.000 entries'
+	option adb_src 'http://winhelp2002.mvps.org/hosts.txt'
+	option adb_src_rset '\$0 ~/^0\.0\.0\.0[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+	option adb_src_desc 'broad blocklist for suspicious domains, infrequent updates, approx. 15.000 entries'
 
 config source 'yoyo'
 	option enabled '1'
-	option adb_src 'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=0&mimetype=plaintext&ruleset=rset_yoyo'
-	option adb_srcdesc 'focus on ad related domains, weekly updates, approx. 2.500 entries'
+	option adb_src 'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=0&mimetype=plaintext'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'focus on ad related domains, weekly updates, approx. 2.500 entries'
 
 config source 'zeus'
 	option enabled '0'
-	option adb_src 'https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist&ruleset=rset_zeus'
-	option adb_srcdesc 'focus on zeus botnet domains, daily updates, approx. 440 entries'
+	option adb_src 'https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist'
+	option adb_src_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
+	option adb_src_desc 'focus on zeus botnet domains, daily updates, approx. 440 entries'