|
@ -10,7 +10,7 @@ |
|
|
# |
|
|
# |
|
|
LC_ALL=C |
|
|
LC_ALL=C |
|
|
PATH="/usr/sbin:/usr/bin:/sbin:/bin" |
|
|
PATH="/usr/sbin:/usr/bin:/sbin:/bin" |
|
|
adb_ver="3.5.2" |
|
|
|
|
|
|
|
|
adb_ver="3.5.3" |
|
|
adb_sysver="unknown" |
|
|
adb_sysver="unknown" |
|
|
adb_enabled=0 |
|
|
adb_enabled=0 |
|
|
adb_debug=0 |
|
|
adb_debug=0 |
|
@ -35,7 +35,7 @@ adb_rtfile="/tmp/adb_runtime.json" |
|
|
adb_hashutil="$(command -v sha256sum)" |
|
|
adb_hashutil="$(command -v sha256sum)" |
|
|
adb_hashold="" |
|
|
adb_hashold="" |
|
|
adb_hashnew="" |
|
|
adb_hashnew="" |
|
|
adb_cnt=0 |
|
|
|
|
|
|
|
|
adb_cnt="" |
|
|
adb_rc=0 |
|
|
adb_rc=0 |
|
|
adb_action="${1:-"start"}" |
|
|
adb_action="${1:-"start"}" |
|
|
adb_pidfile="/var/run/adblock.pid" |
|
|
adb_pidfile="/var/run/adblock.pid" |
|
@ -126,11 +126,8 @@ f_envload() |
|
|
adb_dnsdir="${adb_dnsdir:-"/tmp"}" |
|
|
adb_dnsdir="${adb_dnsdir:-"/tmp"}" |
|
|
adb_dnsheader="" |
|
|
adb_dnsheader="" |
|
|
adb_dnsdeny="awk '{print \"server=/\"\$0\"/\"}'" |
|
|
adb_dnsdeny="awk '{print \"server=/\"\$0\"/\"}'" |
|
|
if [ ${adb_jail} -eq 1 ] |
|
|
|
|
|
then |
|
|
|
|
|
adb_dnsallow="awk '{print \"server=/\"\$0\"/#\"}'" |
|
|
|
|
|
adb_dnshalt="server=/#/" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
adb_dnsallow="awk '{print \"server=/\"\$0\"/#\"}'" |
|
|
|
|
|
adb_dnshalt="server=/#/" |
|
|
;; |
|
|
;; |
|
|
unbound) |
|
|
unbound) |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
@ -138,11 +135,8 @@ f_envload() |
|
|
adb_dnsdir="${adb_dnsdir:-"/var/lib/unbound"}" |
|
|
adb_dnsdir="${adb_dnsdir:-"/var/lib/unbound"}" |
|
|
adb_dnsheader="" |
|
|
adb_dnsheader="" |
|
|
adb_dnsdeny="awk '{print \"local-zone: \042\"\$0\"\042 static\"}'" |
|
|
adb_dnsdeny="awk '{print \"local-zone: \042\"\$0\"\042 static\"}'" |
|
|
if [ ${adb_jail} -eq 1 ] |
|
|
|
|
|
then |
|
|
|
|
|
adb_dnsallow="awk '{print \"local-zone: \042\"\$0\"\042 transparent\"}'" |
|
|
|
|
|
adb_dnshalt="local-zone: \".\" static" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
adb_dnsallow="awk '{print \"local-zone: \042\"\$0\"\042 transparent\"}'" |
|
|
|
|
|
adb_dnshalt="local-zone: \".\" static" |
|
|
;; |
|
|
;; |
|
|
named) |
|
|
named) |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
@ -150,11 +144,8 @@ f_envload() |
|
|
adb_dnsdir="${adb_dnsdir:-"/var/lib/bind"}" |
|
|
adb_dnsdir="${adb_dnsdir:-"/var/lib/bind"}" |
|
|
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost." |
|
|
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost." |
|
|
adb_dnsdeny="awk '{print \"\"\$0\" CNAME .\n*.\"\$0\" CNAME .\"}'" |
|
|
adb_dnsdeny="awk '{print \"\"\$0\" CNAME .\n*.\"\$0\" CNAME .\"}'" |
|
|
if [ ${adb_jail} -eq 1 ] |
|
|
|
|
|
then |
|
|
|
|
|
adb_dnsallow="awk '{print \"\"\$0\" CNAME rpz-passthru.\n*.\"\$0\" CNAME rpz-passthru.\"}'" |
|
|
|
|
|
adb_dnshalt="* CNAME ." |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
adb_dnsallow="awk '{print \"\"\$0\" CNAME rpz-passthru.\n*.\"\$0\" CNAME rpz-passthru.\"}'" |
|
|
|
|
|
adb_dnshalt="* CNAME ." |
|
|
;; |
|
|
;; |
|
|
kresd) |
|
|
kresd) |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
@ -162,11 +153,8 @@ f_envload() |
|
|
adb_dnsdir="${adb_dnsdir:-"/etc/kresd"}" |
|
|
adb_dnsdir="${adb_dnsdir:-"/etc/kresd"}" |
|
|
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost." |
|
|
adb_dnsheader="\$TTL 2h"$'\n'"@ IN SOA localhost. root.localhost. (1 6h 1h 1w 2h)"$'\n'" IN NS localhost." |
|
|
adb_dnsdeny="awk '{print \"\"\$0\" CNAME .\n*.\"\$0\" CNAME .\"}'" |
|
|
adb_dnsdeny="awk '{print \"\"\$0\" CNAME .\n*.\"\$0\" CNAME .\"}'" |
|
|
if [ ${adb_jail} -eq 1 ] |
|
|
|
|
|
then |
|
|
|
|
|
adb_dnsallow="awk '{print \"\"\$0\" CNAME rpz-passthru.\n*.\"\$0\" CNAME rpz-passthru.\"}'" |
|
|
|
|
|
adb_dnshalt="* CNAME ." |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
adb_dnsallow="awk '{print \"\"\$0\" CNAME rpz-passthru.\n*.\"\$0\" CNAME rpz-passthru.\"}'" |
|
|
|
|
|
adb_dnshalt="* CNAME ." |
|
|
;; |
|
|
;; |
|
|
dnscrypt-proxy) |
|
|
dnscrypt-proxy) |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
|
adb_dnsinstance="${adb_dnsinstance:-"0"}" |
|
@ -174,6 +162,8 @@ f_envload() |
|
|
adb_dnsdir="${adb_dnsdir:-"/tmp"}" |
|
|
adb_dnsdir="${adb_dnsdir:-"/tmp"}" |
|
|
adb_dnsheader="" |
|
|
adb_dnsheader="" |
|
|
adb_dnsdeny="awk '{print \$0}'" |
|
|
adb_dnsdeny="awk '{print \$0}'" |
|
|
|
|
|
adb_dnsallow="" |
|
|
|
|
|
adb_dnshalt="" |
|
|
;; |
|
|
;; |
|
|
esac |
|
|
esac |
|
|
|
|
|
|
|
@ -210,9 +200,12 @@ f_envload() |
|
|
cnt=$((cnt+1)) |
|
|
cnt=$((cnt+1)) |
|
|
done |
|
|
done |
|
|
|
|
|
|
|
|
if [ -z "${adb_dns}" ] || [ -z "${adb_dnsdeny}" ] || [ ! -x "$(command -v ${adb_dns})" ] || [ ! -d "${adb_dnsdir}" ] |
|
|
|
|
|
|
|
|
if [ "${dns_up}" != "true" ] || [ -z "${adb_dns}" ] || [ ! -x "$(command -v ${adb_dns})" ] |
|
|
then |
|
|
then |
|
|
f_log "err" "'${adb_dns}' not running, DNS backend not found" |
|
|
|
|
|
|
|
|
f_log "err" "'${adb_dns}' not running or not executable" |
|
|
|
|
|
elif [ ! -d "${adb_dnsdir}" ] |
|
|
|
|
|
then |
|
|
|
|
|
f_log "err" "'${adb_dnsdir}' backend directory not found" |
|
|
fi |
|
|
fi |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -352,15 +345,11 @@ f_count() |
|
|
adb_cnt=0 |
|
|
adb_cnt=0 |
|
|
if [ -s "${adb_dnsdir}/${adb_dnsfile}" ] && ([ -z "${mode}" ] || [ "${mode}" = "final" ]) |
|
|
if [ -s "${adb_dnsdir}/${adb_dnsfile}" ] && ([ -z "${mode}" ] || [ "${mode}" = "final" ]) |
|
|
then |
|
|
then |
|
|
|
|
|
adb_cnt="$(( $(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}") - $(wc -l 2>/dev/null < "${adb_tmpdir}/tmp.add_whitelist") ))" |
|
|
if [ "${adb_dns}" = "named" ] || [ "${adb_dns}" = "kresd" ] |
|
|
if [ "${adb_dns}" = "named" ] || [ "${adb_dns}" = "kresd" ] |
|
|
then |
|
|
then |
|
|
adb_cnt="$(( ($(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}") - $(printf '%s' "${adb_dnsheader}" | grep -c "^")) / 2 ))" |
|
|
|
|
|
else |
|
|
|
|
|
adb_cnt="$(wc -l 2>/dev/null < "${adb_dnsdir}/${adb_dnsfile}")" |
|
|
|
|
|
|
|
|
adb_cnt="$(( (${adb_cnt} - $(printf '%s' "${adb_dnsheader}" | grep -c "^")) / 2 ))" |
|
|
fi |
|
|
fi |
|
|
elif [ "${mode}" = "whitelist" ] && [ -s "${adb_tmpdir}/tmp.whitelist" ] |
|
|
|
|
|
then |
|
|
|
|
|
adb_cnt="$(wc -l 2>/dev/null < "${adb_tmpdir}/tmp.whitelist")" |
|
|
|
|
|
elif [ -s "${adb_tmpfile}" ] |
|
|
elif [ -s "${adb_tmpfile}" ] |
|
|
then |
|
|
then |
|
|
adb_cnt="$(wc -l 2>/dev/null < "${adb_tmpfile}")" |
|
|
adb_cnt="$(wc -l 2>/dev/null < "${adb_tmpfile}")" |
|
@ -408,15 +397,15 @@ f_extconf() |
|
|
if [ ${adb_enabled} -eq 1 ] && [ ${adb_forcedns} -eq 1 ] && \ |
|
|
if [ ${adb_enabled} -eq 1 ] && [ ${adb_forcedns} -eq 1 ] && \ |
|
|
[ -z "$(uci -q get firewall.adblock_dns)" ] && [ $(/etc/init.d/firewall enabled; printf '%u' ${?}) -eq 0 ] |
|
|
[ -z "$(uci -q get firewall.adblock_dns)" ] && [ $(/etc/init.d/firewall enabled; printf '%u' ${?}) -eq 0 ] |
|
|
then |
|
|
then |
|
|
uci -q batch <<-EOF |
|
|
|
|
|
set firewall.adblock_dns="redirect" |
|
|
|
|
|
set firewall.adblock_dns.name="Adblock DNS" |
|
|
|
|
|
set firewall.adblock_dns.src="lan" |
|
|
|
|
|
set firewall.adblock_dns.proto="tcp udp" |
|
|
|
|
|
set firewall.adblock_dns.src_dport="53" |
|
|
|
|
|
set firewall.adblock_dns.dest_port="53" |
|
|
|
|
|
set firewall.adblock_dns.target="DNAT" |
|
|
|
|
|
EOF |
|
|
|
|
|
|
|
|
uci -q batch <<-EOF |
|
|
|
|
|
set firewall.adblock_dns="redirect" |
|
|
|
|
|
set firewall.adblock_dns.name="Adblock DNS" |
|
|
|
|
|
set firewall.adblock_dns.src="lan" |
|
|
|
|
|
set firewall.adblock_dns.proto="tcp udp" |
|
|
|
|
|
set firewall.adblock_dns.src_dport="53" |
|
|
|
|
|
set firewall.adblock_dns.dest_port="53" |
|
|
|
|
|
set firewall.adblock_dns.target="DNAT" |
|
|
|
|
|
EOF |
|
|
elif [ -n "$(uci -q get firewall.adblock_dns)" ] && ([ ${adb_enabled} -eq 0 ] || [ ${adb_forcedns} -eq 0 ]) |
|
|
elif [ -n "$(uci -q get firewall.adblock_dns)" ] && ([ ${adb_enabled} -eq 0 ] || [ ${adb_forcedns} -eq 0 ]) |
|
|
then |
|
|
then |
|
|
uci -q delete firewall.adblock_dns |
|
|
uci -q delete firewall.adblock_dns |
|
@ -545,12 +534,20 @@ f_list() |
|
|
adb_tmpfile="${adb_tmpdir}/${adb_dnsfile}" |
|
|
adb_tmpfile="${adb_tmpdir}/${adb_dnsfile}" |
|
|
;; |
|
|
;; |
|
|
final) |
|
|
final) |
|
|
if [ -s "${adb_tmpdir}/tmp.whitelist" ] |
|
|
|
|
|
|
|
|
> "${adb_dnsdir}/${adb_dnsfile}" |
|
|
|
|
|
|
|
|
|
|
|
if [ -s "${adb_tmpdir}/tmp.add_whitelist" ] |
|
|
|
|
|
then |
|
|
|
|
|
cat "${adb_tmpdir}/tmp.add_whitelist" >> "${adb_dnsdir}/${adb_dnsfile}" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [ -s "${adb_tmpdir}/tmp.rem_whitelist" ] |
|
|
then |
|
|
then |
|
|
grep -vf "${adb_tmpdir}/tmp.whitelist" "${adb_tmpdir}/${adb_dnsfile}" | eval "${adb_dnsdeny}" > "${adb_dnsdir}/${adb_dnsfile}" |
|
|
|
|
|
|
|
|
grep -vf "${adb_tmpdir}/tmp.rem_whitelist" "${adb_tmpdir}/${adb_dnsfile}" | eval "${adb_dnsdeny}" >> "${adb_dnsdir}/${adb_dnsfile}" |
|
|
else |
|
|
else |
|
|
eval "${adb_dnsdeny}" "${adb_tmpdir}/${adb_dnsfile}" > "${adb_dnsdir}/${adb_dnsfile}" |
|
|
|
|
|
|
|
|
eval "${adb_dnsdeny}" "${adb_tmpdir}/${adb_dnsfile}" >> "${adb_dnsdir}/${adb_dnsfile}" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
if [ ${?} -eq 0 ] && [ -n "${adb_dnsheader}" ] |
|
|
if [ ${?} -eq 0 ] && [ -n "${adb_dnsheader}" ] |
|
|
then |
|
|
then |
|
|
printf '%s\n' "${adb_dnsheader}" | cat - "${adb_dnsdir}/${adb_dnsfile}" > "${adb_tmpdir}/${adb_dnsfile}" |
|
|
printf '%s\n' "${adb_dnsheader}" | cat - "${adb_dnsdir}/${adb_dnsfile}" > "${adb_tmpdir}/${adb_dnsfile}" |
|
@ -670,7 +667,7 @@ f_switch() |
|
|
# |
|
|
# |
|
|
f_query() |
|
|
f_query() |
|
|
{ |
|
|
{ |
|
|
local search result field=1 domain="${1}" tld="${1#*.}" |
|
|
|
|
|
|
|
|
local search result prefix suffix field domain="${1}" tld="${1#*.}" |
|
|
|
|
|
|
|
|
if [ -z "${domain}" ] || [ "${domain}" = "${tld}" ] |
|
|
if [ -z "${domain}" ] || [ "${domain}" = "${tld}" ] |
|
|
then |
|
|
then |
|
@ -678,16 +675,35 @@ f_query() |
|
|
else |
|
|
else |
|
|
case "${adb_dns}" in |
|
|
case "${adb_dns}" in |
|
|
dnsmasq) |
|
|
dnsmasq) |
|
|
|
|
|
prefix=".*[\/\.]" |
|
|
|
|
|
suffix="(\/)" |
|
|
field=2 |
|
|
field=2 |
|
|
;; |
|
|
;; |
|
|
unbound) |
|
|
unbound) |
|
|
|
|
|
prefix=".*[\"\.]" |
|
|
|
|
|
suffix="(static)" |
|
|
field=3 |
|
|
field=3 |
|
|
;; |
|
|
;; |
|
|
|
|
|
named) |
|
|
|
|
|
prefix="[^\*].*[\.]" |
|
|
|
|
|
suffix="( \.)" |
|
|
|
|
|
field=1 |
|
|
|
|
|
;; |
|
|
|
|
|
kresd) |
|
|
|
|
|
prefix="[^\*].*[\.]" |
|
|
|
|
|
suffix="( \.)" |
|
|
|
|
|
field=1 |
|
|
|
|
|
;; |
|
|
|
|
|
dnscrypt-proxy) |
|
|
|
|
|
prefix=".*[\.]" |
|
|
|
|
|
suffix="" |
|
|
|
|
|
field=1 |
|
|
|
|
|
;; |
|
|
esac |
|
|
esac |
|
|
while [ "${domain}" != "${tld}" ] |
|
|
while [ "${domain}" != "${tld}" ] |
|
|
do |
|
|
do |
|
|
search="${domain//./\.}" |
|
|
search="${domain//./\.}" |
|
|
result="$(awk -F '/|\"| ' "/^($search|[^\*].*[\/\"\. ]+${search})/{i++;{printf(\" + %s\n\",\$${field})};if(i>9){printf(\" + %s\n\",\"[...]\");exit}}" "${adb_dnsdir}/${adb_dnsfile}")" |
|
|
|
|
|
|
|
|
result="$(awk -F '/|\"| ' "/^($search|${prefix}+${search}.*${suffix}$)/{i++;{printf(\" + %s\n\",\$${field})};if(i>9){printf(\" + %s\n\",\"[...]\");exit}}" "${adb_dnsdir}/${adb_dnsfile}")" |
|
|
printf '%s\n' "::: results for domain '${domain}'" |
|
|
printf '%s\n' "::: results for domain '${domain}'" |
|
|
printf '%s\n' "${result:-" - no match"}" |
|
|
printf '%s\n' "${result:-" - no match"}" |
|
|
domain="${tld}" |
|
|
domain="${tld}" |
|
@ -700,16 +716,21 @@ f_query() |
|
|
# |
|
|
# |
|
|
f_jsnup() |
|
|
f_jsnup() |
|
|
{ |
|
|
{ |
|
|
local bg_pid rundate="$(/bin/date "+%d.%m.%Y %H:%M:%S")" status="${1:-"enabled"}" mode="normal mode" no_mail=0 |
|
|
|
|
|
|
|
|
local bg_pid rundate status="${1:-"enabled"}" mode="normal mode" no_mail=0 |
|
|
|
|
|
|
|
|
if [ ${adb_rc} -gt 0 ] |
|
|
if [ ${adb_rc} -gt 0 ] |
|
|
then |
|
|
then |
|
|
status="error" |
|
|
status="error" |
|
|
|
|
|
rundate="$(/bin/date "+%d.%m.%Y %H:%M:%S")" |
|
|
fi |
|
|
fi |
|
|
if [ ${adb_enabled} -eq 0 ] |
|
|
if [ ${adb_enabled} -eq 0 ] |
|
|
then |
|
|
then |
|
|
status="disabled" |
|
|
status="disabled" |
|
|
fi |
|
|
fi |
|
|
|
|
|
if [ "${status}" = "enabled" ] |
|
|
|
|
|
then |
|
|
|
|
|
rundate="$(/bin/date "+%d.%m.%Y %H:%M:%S")" |
|
|
|
|
|
fi |
|
|
if [ "${status}" = "suspend" ] |
|
|
if [ "${status}" = "suspend" ] |
|
|
then |
|
|
then |
|
|
status="paused" |
|
|
status="paused" |
|
@ -719,28 +740,36 @@ f_jsnup() |
|
|
no_mail=1 |
|
|
no_mail=1 |
|
|
status="enabled" |
|
|
status="enabled" |
|
|
fi |
|
|
fi |
|
|
if [ "${status}" = "enabled" ] |
|
|
|
|
|
then |
|
|
|
|
|
f_count |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [ ${adb_backup_mode} -eq 1 ] |
|
|
if [ ${adb_backup_mode} -eq 1 ] |
|
|
then |
|
|
then |
|
|
mode="backup mode" |
|
|
mode="backup mode" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
if [ -z "${adb_fetchinfo}" ] && [ -s "${adb_rtfile}" ] |
|
|
|
|
|
|
|
|
if [ -s "${adb_rtfile}" ] |
|
|
then |
|
|
then |
|
|
json_load "$(cat "${adb_rtfile}" 2>/dev/null)" |
|
|
json_load "$(cat "${adb_rtfile}" 2>/dev/null)" |
|
|
json_select data |
|
|
json_select data |
|
|
json_get_var adb_fetchinfo "fetch_utility" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ -z "${adb_fetchinfo}" ] && [ -s "${adb_rtfile}" ] |
|
|
|
|
|
then |
|
|
|
|
|
json_get_var adb_fetchinfo "fetch_utility" |
|
|
|
|
|
fi |
|
|
|
|
|
if [ -z "${rundate}" ] |
|
|
|
|
|
then |
|
|
|
|
|
json_get_var rundate "last_rundate" |
|
|
|
|
|
fi |
|
|
|
|
|
if [ -z "${adb_cnt}" ] |
|
|
|
|
|
then |
|
|
|
|
|
json_get_var adb_cnt "overall_domains" |
|
|
|
|
|
adb_cnt="${adb_cnt%% *}" |
|
|
|
|
|
fi |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
json_init |
|
|
json_init |
|
|
json_add_object "data" |
|
|
json_add_object "data" |
|
|
json_add_string "adblock_status" "${status}" |
|
|
json_add_string "adblock_status" "${status}" |
|
|
json_add_string "adblock_version" "${adb_ver}" |
|
|
json_add_string "adblock_version" "${adb_ver}" |
|
|
json_add_string "overall_domains" "${adb_cnt} (${mode})" |
|
|
|
|
|
|
|
|
json_add_string "overall_domains" "${adb_cnt:-0} (${mode})" |
|
|
json_add_string "fetch_utility" "${adb_fetchinfo:-"-"}" |
|
|
json_add_string "fetch_utility" "${adb_fetchinfo:-"-"}" |
|
|
json_add_string "dns_backend" "${adb_dns} (${adb_dnsdir})" |
|
|
json_add_string "dns_backend" "${adb_dns} (${adb_dnsdir})" |
|
|
json_add_string "last_rundate" "${rundate:-"-"}" |
|
|
json_add_string "last_rundate" "${rundate:-"-"}" |
|
@ -770,7 +799,7 @@ f_log() |
|
|
then |
|
|
then |
|
|
f_rmdns |
|
|
f_rmdns |
|
|
f_jsnup |
|
|
f_jsnup |
|
|
logger -p "${class}" -t "adblock-[${adb_ver}]" "Please also check 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md' (${adb_sysver})" |
|
|
|
|
|
|
|
|
logger -p "${class}" -t "adblock-[${adb_ver}]" "Please also check 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md'" |
|
|
exit 1 |
|
|
exit 1 |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
@ -787,29 +816,33 @@ f_main() |
|
|
tmp_load="${adb_tmpload}" |
|
|
tmp_load="${adb_tmpload}" |
|
|
tmp_file="${adb_tmpfile}" |
|
|
tmp_file="${adb_tmpfile}" |
|
|
> "${adb_dnsdir}/.${adb_dnsfile}" |
|
|
> "${adb_dnsdir}/.${adb_dnsfile}" |
|
|
> "${adb_tmpdir}/tmp.whitelist" |
|
|
|
|
|
|
|
|
> "${adb_tmpdir}/tmp.raw_whitelist" |
|
|
|
|
|
> "${adb_tmpdir}/tmp.add_whitelist" |
|
|
|
|
|
> "${adb_tmpdir}/tmp.rem_whitelist" |
|
|
f_log "debug" "f_main ::: dns: ${adb_dns}, fetch_util: ${adb_fetchinfo}, backup: ${adb_backup}, backup_mode: ${adb_backup_mode}, dns_jail: ${adb_jail}, force_srt: ${adb_forcesrt}, force_dns: ${adb_forcedns}, mem_total: ${mem_total:-0}, mem_free: ${mem_free:-0}, max_queue: ${adb_maxqueue}" |
|
|
f_log "debug" "f_main ::: dns: ${adb_dns}, fetch_util: ${adb_fetchinfo}, backup: ${adb_backup}, backup_mode: ${adb_backup_mode}, dns_jail: ${adb_jail}, force_srt: ${adb_forcesrt}, force_dns: ${adb_forcedns}, mem_total: ${mem_total:-0}, mem_free: ${mem_free:-0}, max_queue: ${adb_maxqueue}" |
|
|
|
|
|
|
|
|
# prepare whitelist entries |
|
|
# prepare whitelist entries |
|
|
# |
|
|
# |
|
|
if [ -s "${adb_whitelist}" ] |
|
|
if [ -s "${adb_whitelist}" ] |
|
|
then |
|
|
then |
|
|
|
|
|
adb_whitelist_rset="/^([^([:space:]|\#|\*|\/).]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}" |
|
|
|
|
|
awk "${adb_whitelist_rset}" "${adb_whitelist}" > "${adb_tmpdir}/tmp.raw_whitelist" |
|
|
|
|
|
f_tld "${adb_tmpdir}/tmp.raw_whitelist" |
|
|
|
|
|
|
|
|
adb_whitelist_rset="/^([^([:space:]|\#|\*|\/).]+\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\.\",\"\\\.\",\$1);print tolower(\"^\"\$1\"\\\|\\\.\"\$1)}" |
|
|
adb_whitelist_rset="/^([^([:space:]|\#|\*|\/).]+\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\.\",\"\\\.\",\$1);print tolower(\"^\"\$1\"\\\|\\\.\"\$1)}" |
|
|
awk "${adb_whitelist_rset}" "${adb_whitelist}" > "${adb_tmpdir}/tmp.whitelist" |
|
|
|
|
|
f_list whitelist |
|
|
|
|
|
if [ ${adb_jail} -eq 1 ] && [ "${adb_dns}" != "dnscrypt-proxy" ] |
|
|
|
|
|
|
|
|
awk "${adb_whitelist_rset}" "${adb_tmpdir}/tmp.raw_whitelist" > "${adb_tmpdir}/tmp.rem_whitelist" |
|
|
|
|
|
|
|
|
|
|
|
if [ -n "${adb_dnsallow}" ] |
|
|
then |
|
|
then |
|
|
adb_whitelist_rset="/^([^([:space:]|\#|\*|\/).]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}" |
|
|
|
|
|
awk "${adb_whitelist_rset}" "${adb_whitelist}" > "${adb_tmpdir}/tmp.dnsjail" |
|
|
|
|
|
|
|
|
eval "${adb_dnsallow}" "${adb_tmpdir}/tmp.raw_whitelist" > "${adb_tmpdir}/tmp.add_whitelist" |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
# build 'dnsjail' list |
|
|
# build 'dnsjail' list |
|
|
# |
|
|
# |
|
|
if [ ${adb_jail} -eq 1 ] && [ "${adb_dns}" != "dnscrypt-proxy" ] |
|
|
|
|
|
|
|
|
if [ ${adb_jail} -eq 1 ] |
|
|
then |
|
|
then |
|
|
f_tld "${adb_tmpdir}/tmp.dnsjail" |
|
|
|
|
|
eval "${adb_dnsallow}" "${adb_tmpdir}/tmp.dnsjail" > "/tmp/${adb_dnsjail}" |
|
|
|
|
|
|
|
|
cat "${adb_tmpdir}/tmp.add_whitelist" > "/tmp/${adb_dnsjail}" |
|
|
printf '%s\n' "${adb_dnshalt}" >> "/tmp/${adb_dnsjail}" |
|
|
printf '%s\n' "${adb_dnshalt}" >> "/tmp/${adb_dnsjail}" |
|
|
if [ -n "${adb_dnsheader}" ] |
|
|
if [ -n "${adb_dnsheader}" ] |
|
|
then |
|
|
then |
|
|