adblock: update 1.4.9

[feed/packages.git] / net / adblock / files / adblock.init

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index d4eb3fff99d5d9dc59e304ad00ff53e3cb43a937..f7b707a21bf48d588d61d5cd9bb9281ce1064bbe 100755 (executable)
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -2,9 +2,11 @@
 #
 
 START=99
-EXTRA_COMMANDS="toggle cfgup"
-EXTRA_HELP="   toggle  Toggle adblocking 'on' or 'off'
-       cfgup   Update the adblock configuration file"
+EXTRA_COMMANDS="toggle stats cfgup query"
+EXTRA_HELP="   toggle  Toggle adblock 'on' or 'off'
+       stats   Update adblock statistics
+       cfgup   Update adblock configuration file
+       query   <DOMAIN> Query active blocklists for specific domain"
 
 adb_debug=0
 adb_pid="${$}"
@@ -12,23 +14,24 @@ adb_script="/usr/bin/adblock-update.sh"
 adb_helper="/usr/bin/adblock-helper.sh"
 adb_pidfile="/var/run/adblock.pid"
 bg_parm="&"
-unset log_parm
 
 if [ $((adb_debug)) -eq 0 ]
 then
     exec 2>/dev/null
 fi
 
-if [ -t 1 ]
+if [ -r "${adb_pidfile}" ]
 then
-    log_parm="-s"
-    unset bg_parm
+    logger -s -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile}))" 2>&1
+    exit 255
 fi
 
-if [ -r "${adb_pidfile}" ]
+. "${adb_helper}"
+f_envload
+
+if [ "${adb_restricted}" = "1" ]
 then
-    logger ${log_parm} -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile}))" 2>&1
-    exit 255
+    adb_uci="$(which true)"
 fi
 
 boot()
@@ -38,6 +41,10 @@ boot()
 
 start()
 {
+    if [ -t 1 ]
+    then
+        unset bg_parm
+    fi
     eval "${adb_script}" ${bg_parm}
     return 0
 }
@@ -57,29 +64,23 @@ reload()
 
 stop()
 {
-    . "${adb_helper}"
-    f_envload
     f_rmdns
     f_rmuhttpd
     config_foreach f_rmconfig source
-    if [ -n "$(${adb_uci} -q changes adblock)" ]
-    then
-        "${adb_uci}" -q commit adblock
-    fi
     if [ -z "${reload}" ]
     then
         f_rmfirewall
     fi
-    if [ -n "${rm_dns}" ] || [ -n "${rm_uhttpd}" ] || [ -n "${rm_fw}" ] || [ -n "${rm_cfg}" ]
+    if [ -n "${rm_dns}" ] || [ -n "${rm_uhttpd}" ] || [ -n "${rm_fw}" ] || [ -n "$(${adb_uci} -q changes adblock)" ]
     then
-        logger ${log_parm} -t "adblock[${adb_pid}] info " "all adblock related services stopped" 2>&1
+        "${adb_uci}" -q commit adblock
+        f_log "all adblock related services stopped"
     fi
     return 0
 }
 
 toggle()
 {
-    . "${adb_helper}"
     if [ -d "${adb_dnshidedir}" ]
     then
         list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
@@ -97,20 +98,23 @@ toggle()
         fi
         if [ -n "${list_dns}" ] || [ -n "${list_dnshide}" ]
         then
-            if [ "$(${adb_uci} -q get adblock.global.adb_restricted)" = "1" ]
-            then
-                adb_uci="$(which true)"
-            fi
             mv -f "${source}"* "${target}"
+            /etc/init.d/dnsmasq restart
             "${adb_uci}" -q set "adblock.global.adb_dnstoggle=${pos}"
             "${adb_uci}" -q commit "adblock"
-            /etc/init.d/dnsmasq restart
-            logger ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblock switched '${pos}'" 2>&1
+            f_log "adblock toggle switched '${pos}'"
         fi
     fi
     return 0
 }
 
+stats()
+{
+    f_statistics
+    "${adb_uci}" -q commit "adblock"
+    return 0
+}
+
 cfgup()
 {
     stop
@@ -118,9 +122,40 @@ cfgup()
     rc=$?
     if [ $((rc)) -eq 0 ]
     then
-        logger ${log_parm} -t "adblock[${adb_pid}] info " "default adblock configuration applied, please check the settings in '/etc/config/adblock'" 2>&1
+        f_log "default adblock configuration applied, please check the settings in '/etc/config/adblock'"
+    else
+        f_log "default adblock configuration not found, please re-install the package via 'opkg install adblock --force-maintainer'"
+    fi
+    return 0
+}
+
+query()
+{
+    domain="${1}"
+    tld="${domain#*.}"
+    list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
+    if [ -z "${list_dns}" ]
+    then
+        f_log "no active blocklists found, please start adblock first"
+    elif [ -z "${domain}" ] || [ "${domain}" = "${tld}" ]
+    then
+        f_log "invalid domain query input, please submit a specific (sub-)domain, i.e. 'www.abc.xyz'"
     else
-        logger ${log_parm} -t "adblock[${adb_pid}] info " "default adblock configuration not found, please re-install the package via 'opkg install adblock --force-maintainer'" 2>&1
+        while [ "${domain}" != "${tld}" ]
+        do
+            search="${domain//./\.}"
+            result="$(grep -Hm 1 "[/\.]${search}/" "${adb_dnsdir}/adb_list"* | awk -F ':|/' '{print "   "$4"\t: "$6}')"
+            count="$(grep -hc "[/\.]${search}/" "${adb_dnsdir}/adb_list"* | awk '{sum += $1} END {printf sum}')"
+            printf "%s\n" "=> distinct results for domain '${domain}' (overall ${count})"
+            if [ -z "${result}" ]
+            then
+                printf "%s\n" "   no matches in active blocklists"
+            else
+                printf "%s\n" "${result}"
+            fi
+            domain="${tld}"
+            tld="${domain#*.}"
+        done
     fi
     return 0
 }