#
START=99
-EXTRA_COMMANDS="toggle cfgup"
-EXTRA_HELP=" toggle Toggle adblocking 'on' or 'off'
- cfgup Update the adblock configuration file"
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+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
-if [ $((adb_debug)) -eq 0 ]
-then
- exec 2>/dev/null
-fi
adb_pid="${$}"
adb_script="/usr/bin/adblock-update.sh"
-adb_dnsdir="/tmp/dnsmasq.d"
-adb_dnshidedir="${adb_dnsdir}/.adb_hidden"
-adb_dnsprefix="adb_list"
+adb_helper="/usr/bin/adblock-helper.sh"
adb_pidfile="/var/run/adblock.pid"
-adb_log="$(which logger)"
-adb_uci="$(which uci)"
+bg_parm="&"
-if [ -t 1 ]
+if [ $((adb_debug)) -eq 0 ]
then
- log_parm="-s"
- unset bg_parm
-else
- unset log_parm
- bg_parm="&"
+ exec 2>/dev/null
fi
if [ -r "${adb_pidfile}" ]
then
- "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile}))" 2>&1
+ logger -s -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile}))" 2>&1
exit 255
fi
-rm_config()
-{
- local value opt section="${1}" options="adb_src_timestamp adb_src_count"
- for opt in ${options}
- do
- "${adb_uci}" -q delete "adblock.${section}.${opt}"
- done
-}
+. "${adb_helper}"
+f_envload
+
+if [ "${adb_restricted}" = "1" ]
+then
+ adb_uci="$(which true)"
+fi
boot()
{
start()
{
+ if [ -t 1 ]
+ then
+ unset bg_parm
+ fi
eval "${adb_script}" ${bg_parm}
return 0
}
reload()
{
+ reload="true"
stop
start
}
stop()
{
- if [ -n "$(${adb_uci} -q get "adblock.global.adb_overall_count")" ]
- then
- . "/lib/functions.sh"
- config_load adblock
- config_foreach rm_config source
- "${adb_uci}" -q delete "adblock.global.adb_dnstoggle"
- "${adb_uci}" -q delete "adblock.global.adb_overall_count"
- "${adb_uci}" -q commit "adblock"
- fi
- if [ -d "${adb_dnshidedir}" ]
- then
- find "${adb_dnshidedir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -exec mv -f "{}" "${adb_dnsdir}" \;
- fi
- rm_done="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print -exec rm -f "{}" \;)"
- rc=${?}
- if [ $((rc)) -eq 0 ] && [ -n "${rm_done}" ]
- then
- rm -rf "${adb_dnshidedir}"
- /etc/init.d/dnsmasq restart
- /etc/init.d/firewall restart
- fi
- uhttpd_pid="$(pgrep -f "uhttpd -h /www/adblock")"
- if [ -n "${uhttpd_pid}" ]
+ f_rmdns
+ f_rmuhttpd
+ config_foreach f_rmconfig source
+ if [ -z "${reload}" ]
then
- kill -9 "${uhttpd_pid}"
+ f_rmfirewall
fi
- if [ -n "${rm_done}" ] || [ -n "${uhttpd_pid}" ]
+ if [ -n "${rm_dns}" ] || [ -n "${rm_uhttpd}" ] || [ -n "${rm_fw}" ] || [ -n "$(${adb_uci} -q changes adblock)" ]
then
- "${adb_log}" ${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()
{
- if [ "$(${adb_uci} -q get "adblock.global.adb_restricted")" = "1" ]
- then
- adb_uci="$(which true)"
- fi
if [ -d "${adb_dnshidedir}" ]
then
list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
list_dnshide="$(find "${adb_dnshidedir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
if [ -n "${list_dns}" ]
then
- mv -f "${adb_dnsdir}/${adb_dnsprefix}"* "${adb_dnshidedir}"
- "${adb_uci}" -q set "adblock.global.adb_dnstoggle=off"
- "${adb_uci}" -q commit "adblock"
- /etc/init.d/dnsmasq restart
- "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'off'" 2>&1
+ source="${adb_dnsdir}/${adb_dnsprefix}"
+ target="${adb_dnshidedir}"
+ pos="off"
elif [ -n "${list_dnshide}" ]
then
- mv -f "${adb_dnshidedir}/${adb_dnsprefix}"* "${adb_dnsdir}"
- "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
- "${adb_uci}" -q commit "adblock"
+ source="${adb_dnshidedir}/${adb_dnsprefix}"
+ target="${adb_dnsdir}"
+ pos="on"
+ fi
+ if [ -n "${list_dns}" ] || [ -n "${list_dnshide}" ]
+ then
+ mv -f "${source}"* "${target}"
/etc/init.d/dnsmasq restart
- "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'on'" 2>&1
+ "${adb_uci}" -q set "adblock.global.adb_dnstoggle=${pos}"
+ "${adb_uci}" -q commit "adblock"
+ f_log "adblock toggle switched '${pos}'"
fi
fi
return 0
}
+stats()
+{
+ f_statistics
+ "${adb_uci}" -q commit "adblock"
+ return 0
+}
+
cfgup()
{
stop
rc=$?
if [ $((rc)) -eq 0 ]
then
- "${adb_log}" ${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
- "${adb_log}" ${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
}
projects / feed / packages.git / blobdiff