From 9500430231e6873a1091e83afa86dda707e183e3 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 4 Feb 2017 21:32:50 +0100 Subject: [PATCH] adblock: release 2.3.0 * automatically selects dnsmasq or unbound as dns backend * add the new 'adguard' source, a combined/quite effective block list * remove needless dns backend restarts * optimize adblock restart behavior * optimize block list processing on inotify enabled filesystems * better return code checking on block list download * fix boot function/startup on Chaos Calmer * fix a bug in blocklist removal function * add more (optional) debug output * move backup options to global config * documentation update Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 4 +- net/adblock/files/README.md | 61 ++++++---- net/adblock/files/adblock.conf | 12 +- net/adblock/files/adblock.init | 23 ++-- net/adblock/files/adblock.sh | 203 ++++++++++++++++++++------------- 5 files changed, 190 insertions(+), 113 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index e487d25ac..ea968aa69 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock -PKG_VERSION:=2.1.5 -PKG_RELEASE:=2 +PKG_VERSION:=2.3.0 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index fcfeaf22e..f45278d7c 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -7,6 +7,8 @@ A lot of people already use adblocker plugins within their desktop browsers, but * support of the following domain block list sources (free for private usage, for commercial use please check their individual licenses): * [adaway](https://adaway.org) * => infrequent updates, approx. 400 entries (enabled by default) + * [adguard](https://adguard.com) + * => numerous updates on the same day, approx. 12.000 entries * [blacklist]() * => static local blacklist, located by default in '/etc/adblock/adblock.blacklist' * [disconnect](https://disconnect.me) @@ -51,27 +53,28 @@ A lot of people already use adblocker plugins within their desktop browsers, but * => daily updates, approx. 440 entries * zero-conf like automatic installation & setup, usually no manual changes needed * simple but yet powerful adblock engine: adblock does not use error prone external iptables rulesets, http pixel server instances and things like that -* supports dnsmasq (default) or unbound as dns backend -* supports a wide range of router modes, even AP modes are supported +* automatically selects dnsmasq or unbound as dns backend +* automatically selects uclient-fetch or wget as download utility (other tools like curl or aria2c are supported as well) +* automatically supports a wide range of router modes, even AP modes are supported * full IPv4 and IPv6 support * each block list source will be updated and processed separately * block list source parsing by fast & flexible regex rulesets * overall duplicate removal in separate block lists * additional whitelist for manual overrides, located by default in /etc/adblock/adblock.whitelist -* quality checks during block list update to ensure a reliable dns server service +* quality checks during block list update to ensure a reliable dns backend service * minimal status & error logging to syslog, enable debug logging to receive more output * procd based init system support (start/stop/restart/reload/suspend/resume) * procd based hotplug support, the adblock start will be triggered by interface triggers * suspend & resume adblock actions temporarily without block list reloading * runtime statistics via ubus service call * query function to quickly identify blocked (sub-)domains, e.g. for whitelisting -* automatic block list backup & restore, backups will be (de-)compressed and restored on the fly -* add new adblock sources on your own via uci config +* optional: automatic block list backup & restore, backups will be (de-)compressed and restored on the fly in case of any runtime error +* optional: add new adblock sources on your own via uci config ## Prerequisites * [openwrt](https://openwrt.org), tested with latest stable release (Chaos Calmer) and with current trunk (Designated Driver) * [LEDE project](https://www.lede-project.org), tested with trunk > r98 -* a usual setup with an enabled dns server at minimum - dump AP modes without a working dns server are _not_ supported +* a usual setup with an enabled dns backend at minimum - dump AP modes without a working dns backend are _not_ supported * a download utility: full versions (with ssl support) of 'wget', 'uclient-fetch', 'aria2c' or 'curl' are supported - the Chaos Calmer built-in busybox wget is not * Chaos Calmer: download & install the external 'wget' package * Designated Driver/Trunk: use built-in 'uclient-fetch' or download & install the external 'wget' package @@ -98,7 +101,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but ## Tweaks * **status/runtime statistics:** the adblock status and runtime statistics are available via ubus service call (see example below) -* **debug output:** for script debugging please set the config option 'adb\_debug' to '1' and check the runtime output with _logread -e "adblock"_ +* **debug logging:** for script debugging please set the config option 'adb\_debug' to '1' and check the runtime output with _logread -e "adblock"_ * **storage expansion:** to process and store all block list sources at once it might helpful to enlarge your temp directory with a swap partition => see [openwrt wiki](https://wiki.openwrt.org/doc/uci/fstab) for further details * **add white-/blacklist entries:** add domain white- or blacklist entries to always-allow or -deny certain (sub) domains, by default both lists are empty and located in _/etc/adblock_. Please add one domain per line - ip addresses, wildcards & regex are _not_ allowed (see example below) * **backup & restore block lists:** enable this feature, to restore automatically the latest compressed backup of your block lists in case of any processing error (e.g. a single block list source is not available during update). Please use an (external) solid partition and _not_ your volatile router temp directory for this @@ -117,23 +120,18 @@ A lot of people already use adblocker plugins within their desktop browsers, but * adb\_iface => restrict the procd interface trigger to a (list of) certain wan interface(s) or disable it at all (default: not set, disabled) * adb\_fetch => full path to a different download utility, see example below (default: not set, use wget) * adb\_fetchparm => options for the download utility, see example below (default: not set, use wget options) - * adb\_dns => use 'unbound' as dns backend, see example below (default: not set, use dnsmasq) ## Examples **change default dns backend to 'unbound':** 

-set 'unbound' as dns backend in /etc/config/adblock:
-  [...]
-  option adb_dns 'unbound'
-
 switch to 'manual' unbound config in /etc/config/unbound:
   [...]
   option manual_conf '1'
 
 include adblock lists in /etc/unbound/unbound.conf:
   [...]
-  include: "/tmp/lib/unbound/adb_list.*"
+  include: "/var/lib/unbound/adb_list.*"
**configuration for different download utilities:** @@ -146,7 +144,7 @@ aria2c: option adb_fetch '/usr/bin/aria2c' option adb_fetchparm '-q --max-tries=1 --timeout=5 --allow-overwrite=true --auto-file-renaming=false --check-certificate=false -o' -uclient-fetch (not supported in Chaos Calmer): +uclient-fetch: option adb_fetch '/bin/uclient-fetch' option adb_fetchparm '-q --timeout=5 --no-check-certificate -O' @@ -162,7 +160,7 @@ This will output the active block lists and other runtime information as JSON, e { "adblock_stats": { "instances": { - "stats": { + "statistics": { "running": false, "command": [ "" @@ -170,16 +168,35 @@ This will output the active block lists and other runtime information as JSON, e "data": { "active_lists": [ { - "blacklist": "142", + "palevo": "14", + "blacklist": "144", + "winspy": "168", + "zeus": "422", "adaway": "408", - "yoyo": "2368" + "rolist": "649", + "malwarelist": "1219", + "ransomware": "1495", + "ruadlist": "1791", + "yoyo": "2304", + "openphish": "2139", + "dshield": "154", + "disconnect": "3176", + "spam404": "6251", + "adguard": "11081", + "whocares": "11575", + "winhelp": "10574", + "malware": "13854", + "sysctl": "8539", + "securemecca": "9262", + "shalla": "25358", + "hphosts": "36256" } ], - "adblock_version": "2.1.0", - "blocked_domains": "2918", - "dns_backend": "unbound", - "last_rundate": "05.01.2017 09:38:55", - "system": "LEDE Reboot SNAPSHOT r2762-ed69e93262" + "adblock_version": "2.3.0", + "blocked_domains": "146833", + "dns_backend": "dnsmasq", + "last_rundate": "04.02.2017 21:10:31", + "system": "LEDE Reboot SNAPSHOT r3286-c980147527" } } } diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf index aaf6eef43..999a2c47a 100644 --- a/net/adblock/files/adblock.conf +++ b/net/adblock/files/adblock.conf @@ -6,10 +6,8 @@ config adblock 'global' option adb_debug '0' option adb_whitelist '/etc/adblock/adblock.whitelist' option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\"^\"\$1\"\\\|[.]\"\$1)}' - -config service 'backup' - option enabled '0' - option adb_dir '/mnt' + option adb_backup '0' + option adb_backupdir '/mnt' config source 'adaway' option enabled '1' @@ -17,6 +15,12 @@ config source 'adaway' 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 'adguard' + option enabled '0' + option adb_src 'https://raw.githubusercontent.com/AdguardTeam/AdguardDNS/master/Filters/filter.txt' + option adb_src_rset '{FS=\"[|^]\"} \$0 ~/^\|\|([A-Za-z0-9_-]+\.){1,}[A-Za-z]+\^$/{print tolower(\$3)}' + option adb_src_desc 'combined adguard dns filter list, approx. 12.000 entries' + config source 'blacklist' option enabled '0' option adb_src '/etc/adblock/adblock.blacklist' diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init index fda5d6261..59b987f90 100755 --- a/net/adblock/files/adblock.init +++ b/net/adblock/files/adblock.init @@ -13,21 +13,23 @@ adb_script="/usr/bin/adblock.sh" boot() { - local wanif4 wanif6 + local wanif4 wanif6 cnt=0 - ubus -t 30 wait_for network.interface - if [ ${?} -eq 0 ] - then - . "/lib/functions/network.sh" + . "/lib/functions/network.sh" + while [ ${cnt} -le 30 ] + do network_find_wan wanif4 network_find_wan6 wanif6 - if [ -n "${wanif4}" ] || [ -n "${wanif6}" ] + if [ -n "${wanif4}" ] || [ -n "${wanif6}" ] || [ ${cnt} -eq 30 ] then rc_procd start_service return 0 + else + sleep 1 + cnt=$((cnt+1)) + network_flush_cache fi - fi - rc_procd service_triggers + done } start_service() @@ -54,6 +56,11 @@ stop_service() rc_procd "${adb_script}" stop } +restart() +{ + rc_procd start_service restart +} + suspend() { rc_procd start_service suspend diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 2737ced14..b1396c76f 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -10,41 +10,66 @@ # LC_ALL=C PATH="/usr/sbin:/usr/bin:/sbin:/bin" -adb_ver="2.1.5" +adb_ver="2.3.0" adb_enabled=1 adb_debug=0 +adb_backup=0 adb_whitelist="/etc/adblock/adblock.whitelist" adb_whitelist_rset="\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\"^\"\$1\"\\\|[.]\"\$1)}" adb_fetch="/usr/bin/wget" adb_fetchparm="--no-config --quiet --tries=1 --no-cache --no-cookies --max-redirect=0 --timeout=5 --no-check-certificate -O" +adb_dnslist="dnsmasq unbound" # f_envload: load adblock environment # f_envload() { + local dns_up cnt=0 + # source in system library # if [ -r "/lib/functions.sh" ] then . "/lib/functions.sh" else - f_log "error" "status ::: system library not found" + f_log "error" "status ::: system library not found" fi # set dns backend environment # - adb_dns="$(uci -q get adblock.global.adb_dns)" - if [ "${adb_dns}" = "unbound" ] + while [ ${cnt} -le 10 ] + do + for dns in ${adb_dnslist} + do + dns_up="$(ubus -S call service list "{\"name\":\"${dns}\"}" | jsonfilter -l1 -e "@.${dns}.instances.*.running")" + if [ "${dns_up}" = "true" ] + then + case "${dns}" in + dnsmasq) + adb_dns="dnsmasq" + adb_dnsdir="/tmp/dnsmasq.d" + adb_dnsformat="awk '{print \"local=/\"\$0\"/\"}'" + break 2 + ;; + unbound) + adb_dns="unbound" + adb_dnsdir="/var/lib/unbound" + adb_dnsformat="awk '{print \"local-zone: \042\"\$0\"\042 static\"}'" + break 2 + ;; + esac + fi + done + sleep 1 + cnt=$((cnt+1)) + done + if [ -n "${adb_dns}" ] then - adb_dnsdir="/tmp/lib/unbound" - adb_dnsformat="awk '{print \"local-zone: \042\"\$0\"\042 static\"}'" + adb_dnshidedir="${adb_dnsdir}/.adb_hidden" + adb_dnsprefix="adb_list" else - adb_dns="dnsmasq" - adb_dnsdir="/tmp/dnsmasq.d" - adb_dnsformat="awk '{print \"local=/\"\$0\"/\"}'" + f_log "error" "status ::: no active/supported DNS backend found" fi - adb_dnshidedir="${adb_dnsdir}/.adb_hidden" - adb_dnsprefix="adb_list" # parse global section by callback # @@ -64,15 +89,12 @@ f_envload() fi } - # parse 'service' and 'source' sections + # parse 'source' section # parse_config() { - local value opt section="${1}" options="enabled adb_dir adb_src adb_src_rset adb_src_cat" - if [ "${section}" != "backup" ] - then - eval "adb_sources=\"${adb_sources} ${section}\"" - fi + local value opt section="${1}" options="enabled adb_src adb_src_rset adb_src_cat" + eval "adb_sources=\"${adb_sources} ${section}\"" for opt in ${options} do config_get value "${section}" "${opt}" @@ -86,7 +108,6 @@ f_envload() # load adblock config # config_load adblock - config_foreach parse_config service config_foreach parse_config source } @@ -103,20 +124,20 @@ f_envcheck() f_rmdns f_dnsrestart fi - f_log "info " "status ::: adblock is currently disabled, please set adb_enabled to '1' to use this service" + f_log "info " "status ::: adblock is currently disabled, please set adb_enabled to '1' to use this service" exit 0 fi # check fetch utility # - if [ ! -f "${adb_fetch}" ] && [ "$(readlink -fn "/bin/wget")" = "/bin/uclient-fetch" ] + if [ ! -x "${adb_fetch}" ] && [ "$(readlink -fn "/bin/wget")" = "/bin/uclient-fetch" ] then adb_fetch="/bin/uclient-fetch" adb_fetchparm="-q --timeout=5 --no-check-certificate -O" fi - if [ -z "${adb_fetch}" ] || [ -z "${adb_fetchparm}" ] || [ ! -f "${adb_fetch}" ] || [ "$(readlink -fn "${adb_fetch}")" = "/bin/busybox" ] + if [ -z "${adb_fetch}" ] || [ -z "${adb_fetchparm}" ] || [ ! -x "${adb_fetch}" ] || [ "$(readlink -fn "${adb_fetch}")" = "/bin/busybox" ] then - f_log "error" "status ::: required download utility with ssl support not found, e.g. install full 'wget' package" + f_log "error" "status ::: required download utility with ssl support not found, e.g. install full 'wget' package" fi # create dns hideout directory @@ -149,17 +170,29 @@ f_rmtemp() { rm -f "${adb_tmpload}" rm -f "${adb_tmpfile}" - rm -rf "${adb_tmpdir}" + if [ -d "${adb_tmpdir}" ] + then + rm -rf "${adb_tmpdir}" + fi } # f_rmdns: remove dns related files & directories # f_rmdns() { - rm -f "${adb_dnsdir}/${adb_dnsprefix}"* - rm -f "${adb_dir_backup}/${adb_dnsprefix}"*.gz - rm -rf "${adb_dnshidedir}" - ubus call service delete "{\"name\":\"adblock_stats\",\"instances\":\"stats\"}" 2>/dev/null + if [ -d "${adb_dnsdir}" ] + then + rm -f "${adb_dnsdir}/${adb_dnsprefix}"* + fi + if [ -d "${adb_backupdir}" ] + then + rm -f "${adb_backupdir}/${adb_dnsprefix}"*.gz + fi + if [ -d "${adb_dnshidedir}" ] + then + rm -rf "${adb_dnshidedir}" + fi + ubus call service delete "{\"name\":\"adblock_stats\",\"instances\":\"statistics\"}" 2>/dev/null } # f_dnsrestart: restart the dns backend @@ -167,22 +200,20 @@ f_rmdns() f_dnsrestart() { local cnt=0 - dns_running="false" + adb_dnsup="false" - sync killall -q -TERM "${adb_dns}" while [ ${cnt} -le 10 ] do - dns_running="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" | jsonfilter -l 1 -e "@.${adb_dns}.instances.*.running")" - if [ "${dns_running}" = "true" ] + adb_dnsup="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" | jsonfilter -l1 -e "@.${adb_dns}.instances.*.running")" + if [ "${adb_dnsup}" = "true" ] then - return 0 + break fi cnt=$((cnt+1)) sleep 1 done - /etc/init.d/"${adb_dns}" restart - sleep 1 + f_log "debug" "restart ::: dns: ${adb_dns}, dns-up: ${adb_dnsup}, count: ${cnt}" } # f_list: backup/restore/remove block lists @@ -191,28 +222,39 @@ f_list() { local mode="${1}" - if [ "${enabled_backup}" = "1" ] && [ -d "${adb_dir_backup}" ] + if [ ${adb_backup} -eq 0 ] then - case "${mode}" in - backup) - gzip -cf "${adb_tmpfile}" > "${adb_dir_backup}/${adb_dnsprefix}.${src_name}.gz" - ;; - restore) - rm -f "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" - if [ -f "${adb_dir_backup}/${adb_dnsprefix}.${src_name}.gz" ] - then - gunzip -cf "${adb_dir_backup}/${adb_dnsprefix}.${src_name}.gz" > "${adb_tmpfile}" - fi - ;; - remove) + rc=0 + fi + case "${mode}" in + backup) + if [ ${adb_backup} -eq 1 ] && [ -d "${adb_backupdir}" ] + then + gzip -cf "${adb_tmpfile}" > "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" + rc=${?} + fi + ;; + restore) + if [ ${adb_backup} -eq 1 ] && [ -d "${adb_backupdir}" ] + then rm -f "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" - if [ -f "${adb_dir_backup}/${adb_dnsprefix}.${src_name}.gz" ] + if [ -f "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" ] then - rm -f "${adb_dir_backup}/${adb_dnsprefix}.${src_name}.gz" + gunzip -cf "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" > "${adb_tmpfile}" + rc=${?} fi - ;; - esac - fi + fi + ;; + remove) + rm -f "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" + if [ -d "${adb_backupdir}" ] + then + rm -f "${adb_backupdir}/${adb_dnsprefix}.${src_name}.gz" + fi + rc=${?} + ;; + esac + f_log "debug" "list ::: name: ${src_name}, mode: ${mode}, rc: ${rc}" } # f_switch: suspend/resume adblock processing @@ -240,7 +282,7 @@ f_switch() then mv -f "${source}"* "${target}" f_dnsrestart - f_log "info " "status ::: adblock processing ${status}" + f_log "info " "status ::: adblock processing ${status}" fi fi } @@ -291,10 +333,9 @@ f_log() logger -t "adblock-[${adb_ver}] ${class}" "${log_msg}" if [ "${class}" = "error" ] then - logger -t "adblock-[${adb_ver}] ${class}" "Please also check the online documentation 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md'" + logger -t "adblock-[${adb_ver}] ${class}" "Please check the online documentation 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md'" f_rmtemp f_rmdns - f_dnsrestart exit 255 fi fi @@ -311,17 +352,17 @@ f_debug() mem_total="$(awk '$1 ~ /^MemTotal/ {printf $2}' "/proc/meminfo")" mem_free="$(awk '$1 ~ /^MemFree/ {printf $2}' "/proc/meminfo")" mem_swap="$(awk '$1 ~ /^SwapTotal/ {printf $2}' "/proc/meminfo")" - f_log "debug" "memory ::: total: ${mem_total}, free: ${mem_free}, swap: ${mem_swap}" + f_log "debug" "memory ::: total: ${mem_total}, free: ${mem_free}, swap: ${mem_swap}" if [ -d "${adb_tmpdir}" ] then tmp_space="$(df "${adb_tmpdir}" 2>/dev/null | tail -n1 | awk '{printf $4}')" fi - if [ -d "${adb_dir_backup}" ] + if [ -d "${adb_backupdir}" ] then - backup_space="$(df "${adb_dir_backup}" 2>/dev/null | tail -n1 | awk '{printf $4}')" + backup_space="$(df "${adb_backupdir}" 2>/dev/null | tail -n1 | awk '{printf $4}')" fi - f_log "debug" "space ::: tmp_dir: ${adb_tmpdir}, tmp_kb: ${tmp_space}, backup: ${enabled_backup}, backup_dir: ${adb_dir_backup}, backup_kb: ${backup_space}" + f_log "debug" "space ::: tmp_dir: ${adb_tmpdir}, tmp_kb: ${tmp_space}, backup: ${adb_backup}, backup_dir: ${adb_backupdir}, backup_kb: ${backup_space}" fi } @@ -333,14 +374,13 @@ f_main() local src_name src_rset shalla_file shalla_archive list active_lists local sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" - f_debug - f_log "debug" "main ::: dns-backend: ${adb_dns}, fetch-tool: ${adb_fetch}, parm: ${adb_fetchparm}" + f_log "debug" "main ::: dns-backend: ${adb_dns}, fetch-tool: ${adb_fetch}, parm: ${adb_fetchparm}" for src_name in ${adb_sources} do eval "enabled=\"\${enabled_${src_name}}\"" eval "url=\"\${adb_src_${src_name}}\"" eval "src_rset=\"\${adb_src_rset_${src_name}}\"" - adb_dnsfile="${adb_dnsdir}/${adb_dnsprefix}.${src_name}" + adb_dnsfile="${adb_tmpdir}/${adb_dnsprefix}.${src_name}" > "${adb_tmpload}" > "${adb_tmpfile}" @@ -354,10 +394,10 @@ f_main() # download block list # - f_log "debug" "loop ::: name: ${src_name}, enabled: ${enabled}, dnsfile: ${adb_dnsfile}" + f_log "debug" "loop_0 ::: name: ${src_name}, enabled: ${enabled}, dnsfile: ${adb_dnsfile}" if [ "${src_name}" = "blacklist" ] then - cat "${url}" > "${adb_tmpload}" + cat "${url}" 2>/dev/null > "${adb_tmpload}" rc=${?} elif [ "${src_name}" = "shalla" ] then @@ -377,7 +417,7 @@ f_main() break fi done - cat "${shalla_file}" > "${adb_tmpload}" + cat "${shalla_file}" 2>/dev/null > "${adb_tmpload}" rm -f "${shalla_file}" fi rm -f "${shalla_archive}" @@ -386,10 +426,10 @@ f_main() "${adb_fetch}" ${adb_fetchparm} "${adb_tmpload}" "${url}" rc=${?} fi + f_log "debug" "loop_1 ::: name: ${src_name}, rc: ${rc}" # check download result and prepare domain output (incl. list backup/restore) # - f_log "debug" "loop ::: name: ${src_name}, load-rc: ${rc}" if [ ${rc} -eq 0 ] && [ -s "${adb_tmpload}" ] then awk "${src_rset}" "${adb_tmpload}" > "${adb_tmpfile}" @@ -402,10 +442,11 @@ f_main() else f_list restore fi + f_log "debug" "loop_2 ::: name: ${src_name}, rc: ${rc}" # remove whitelist domains, sort and make them unique, final list preparation # - if [ -s "${adb_tmpfile}" ] + if [ ${rc} -eq 0 ] && [ -s "${adb_tmpfile}" ] then if [ -s "${adb_tmpdir}/tmp.whitelist" ] then @@ -418,13 +459,15 @@ f_main() then f_list remove fi + else + f_list remove fi - f_log "debug" "loop ::: name: ${src_name}, list-rc: ${rc}" + f_log "debug" "loop_3 ::: name: ${src_name}, rc: ${rc}" done # sort block lists # - for src_name in $(ls -dASr "${adb_dnsdir}/${adb_dnsprefix}"* 2>/dev/null) + for src_name in $(ls -dASr "${adb_tmpdir}/${adb_dnsprefix}"* 2>/dev/null) do if [ -s "${adb_tmpdir}/blocklist.overall" ] then @@ -445,25 +488,25 @@ f_main() # restart the dns backend and write statistics to procd service instance # + mv -f "${adb_tmpdir}/${adb_dnsprefix}"* "${adb_dnsdir}" 2>/dev/null chown "${adb_dns}":"${adb_dns}" "${adb_dnsdir}/${adb_dnsprefix}"* 2>/dev/null f_dnsrestart - if [ "${dns_running}" = "true" ] + f_debug + if [ "${adb_dnsup}" = "true" ] then - f_debug - f_rmtemp - f_log "info " "status ::: block lists with overall ${sum_cnt} domains loaded (${sysver})" - ubus call service add "{\"name\":\"adblock_stats\", - \"instances\":{\"stats\":{\"command\":[\"\"], + f_log "info " "status ::: block lists with overall ${sum_cnt} domains loaded (${sysver})" + ubus call service set "{\"name\":\"adblock_stats\", + \"instances\":{\"statistics\":{\"command\":[\"\"], \"data\":{\"active_lists\":[{${active_lists}}], \"adblock_version\":\"${adb_ver}\", \"blocked_domains\":\"${sum_cnt}\", \"dns_backend\":\"${adb_dns}\", \"last_rundate\":\"$(/bin/date "+%d.%m.%Y %H:%M:%S")\", \"system\":\"${sysver}\"}}}}" + f_rmtemp return 0 fi - f_debug - f_log "error" "status ::: dns backend restart with active block lists failed (${sysver})" + f_log "error" "status ::: dns backend restart with active block lists failed (${sysver})" } # handle different adblock actions @@ -477,6 +520,12 @@ then f_rmdns f_dnsrestart ;; + restart) + f_rmtemp + f_rmdns + f_envcheck + f_main + ;; suspend) f_switch suspend ;;