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 6a2f6bf0e31b03a331f575464f18d17375d5f5ec..f7b707a21bf48d588d61d5cd9bb9281ce1064bbe 100755 (executable)
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -2,10 +2,11 @@
 #
 
 START=99
-EXTRA_COMMANDS="toggle stats cfgup"
+EXTRA_COMMANDS="toggle stats cfgup query"
 EXTRA_HELP="   toggle  Toggle adblock 'on' or 'off'
        stats   Update adblock statistics
-       cfgup   Update adblock configuration file"
+       cfgup   Update adblock configuration file
+       query   <DOMAIN> Query active blocklists for specific domain"
 
 adb_debug=0
 adb_pid="${$}"
@@ -13,10 +14,6 @@ adb_script="/usr/bin/adblock-update.sh"
 adb_helper="/usr/bin/adblock-helper.sh"
 adb_pidfile="/var/run/adblock.pid"
 bg_parm="&"
-if [ -t 1 ]
-then
-    unset bg_parm
-fi
 
 if [ $((adb_debug)) -eq 0 ]
 then
@@ -32,6 +29,11 @@ fi
 . "${adb_helper}"
 f_envload
 
+if [ "${adb_restricted}" = "1" ]
+then
+    adb_uci="$(which true)"
+fi
+
 boot()
 {
     return 0
@@ -39,6 +41,10 @@ boot()
 
 start()
 {
+    if [ -t 1 ]
+    then
+        unset bg_parm
+    fi
     eval "${adb_script}" ${bg_parm}
     return 0
 }
@@ -60,18 +66,14 @@ stop()
 {
     f_rmdns
     f_rmuhttpd
-    adb_uci="$(which uci)"
     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
+        "${adb_uci}" -q commit adblock
         f_log "all adblock related services stopped"
     fi
     return 0
@@ -97,9 +99,9 @@ toggle()
         if [ -n "${list_dns}" ] || [ -n "${list_dnshide}" ]
         then
             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
             f_log "adblock toggle switched '${pos}'"
         fi
     fi
@@ -126,3 +128,34 @@ cfgup()
     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
+        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
+}