Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19246 from stangri/openwrt-22.03-simple-adblock

Browse source 
[22.03] simple-adblock: update to 1.9.0-1
This commit is contained in:
Stan Grishin 2022-08-24 03:52:33 +03:00 committed by GitHub
commit fad4eff765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 287 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/simple-adblock/Makefile
View file

@ -1,13 +1,13 @@
# Copyright 2017-2018 Stan Grishin (stangri@melmac.net) # Copyright 2017-2022 Stan Grishin (stangri@melmac.ca)
# TLD optimization written by Dirk Brenken (dev@brenken.org) # TLD optimization written by Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3. # This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock PKG_NAME:=simple-adblock
PKG_VERSION:=1.8.8 PKG_VERSION:=1.9.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -38,7 +38,9 @@ define Build/Compile
endef endef
define Package/simple-adblock/install define Package/simple-adblock/install
$(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config $(1)/tmp $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/tmp
$(INSTALL_BIN) ./files/simple-adblock.init $(1)/etc/init.d/simple-adblock $(INSTALL_BIN) ./files/simple-adblock.init $(1)/etc/init.d/simple-adblock
$(SED) "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/simple-adblock $(SED) "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/simple-adblock
$(INSTALL_CONF) ./files/simple-adblock.conf $(1)/etc/config/simple-adblock $(INSTALL_CONF) ./files/simple-adblock.conf $(1)/etc/config/simple-adblock

411
net/simple-adblock/files/simple-adblock.init
View file

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright 2017-2020 Stan Grishin (stangri@melmac.net) # Copyright 2017-2022 Stan Grishin (stangri@melmac.ca)
# shellcheck disable=SC2039,SC1091,SC2016,SC3043,SC3057,SC3060 # shellcheck disable=SC2039,SC1091,SC2016,SC3043,SC3057,SC3060
PKG_VERSION='dev-test' PKG_VERSION='dev-test'
@ -10,6 +10,7 @@ USE_PROCD=1
LC_ALL=C LC_ALL=C
if type extra_command 1>/dev/null 2>&1; then if type extra_command 1>/dev/null 2>&1; then
extra_command 'allow' 'Allows domain(s) in current block-list and config'
extra_command 'check' 'Checks if specified domain is found in current block-list' extra_command 'check' 'Checks if specified domain is found in current block-list'
extra_command 'dl' 'Force-downloads all enabled block-list' extra_command 'dl' 'Force-downloads all enabled block-list'
extra_command 'killcache' 'Delete all cached files' extra_command 'killcache' 'Delete all cached files'
@ -17,39 +18,44 @@ if type extra_command 1>/dev/null 2>&1; then
extra_command 'version' 'Show version information' extra_command 'version' 'Show version information'
else else
# shellcheck disable=SC2034 # shellcheck disable=SC2034
EXTRA_COMMANDS='check dl killcache sizes status_service version' EXTRA_COMMANDS='allow check dl killcache sizes status_service version'
# shellcheck disable=SC2034 # shellcheck disable=SC2034
EXTRA_HELP=' check Checks if specified domain is found in current block-list EXTRA_HELP=' allow Allows domain(s) in current block-list and config
check Checks if specified domain is found in current block-list
dl Force-downloads all enabled block-list dl Force-downloads all enabled block-list
sizes Displays the file-sizes of enabled block-lists' sizes Displays the file-sizes of enabled block-lists'
fi fi
readonly packageName='simple-adblock' readonly packageName='simple-adblock'
readonly serviceName="$packageName $PKG_VERSION" readonly serviceName="$packageName $PKG_VERSION"
readonly addnhostsFile="/var/run/${packageName}.addnhosts" readonly dnsmasqAddnhostsFile="/var/run/${packageName}/dnsmasq.addnhosts"
readonly addnhostsCache="/var/run/${packageName}.addnhosts.cache" readonly dnsmasqAddnhostsCache="/var/run/${packageName}/dnsmasq.addnhosts.cache"
readonly addnhostsGzip="/etc/${packageName}.addnhosts.gz" readonly dnsmasqAddnhostsGzip="/etc/${packageName}.dnsmasq.addnhosts.gz"
readonly addnhostsOutputFilter='s|^|127.0.0.1 |;s|$||' readonly dnsmasqAddnhostsFilter='s|^|127.0.0.1 |;s|$||'
readonly addnhostsOutputFilterIPv6='s|^|:: |;s|$||' readonly dnsmasqAddnhostsFilterIPv6='s|^|:: |;s|$||'
readonly dnsmasqFile="/var/dnsmasq.d/${packageName}" readonly dnsmasqConfFile="/tmp/dnsmasq.d/${packageName}"
readonly dnsmasqCache="/var/run/${packageName}.dnsmasq.cache" readonly dnsmasqConfCache="/var/run/${packageName}/dnsmasq.conf.cache"
readonly dnsmasqGzip="/etc/${packageName}.dnsmasq.gz" readonly dnsmasqConfGzip="/etc/${packageName}.dnsmasq.conf.gz"
readonly dnsmasqOutputFilter='s|^|local=/|;s|$|/|' readonly dnsmasqConfFilter='s|^|local=/|;s|$|/|'
readonly ipsetFile="/var/dnsmasq.d/${packageName}.ipset" readonly dnsmasqIpsetFile="/tmp/dnsmasq.d/${packageName}.ipset"
readonly ipsetCache="/var/run/${packageName}.ipset.cache" readonly dnsmasqIpsetCache="/var/run/${packageName}/dnsmasq.ipset.cache"
readonly ipsetGzip="/etc/${packageName}.ipset.gz" readonly dnsmasqIpsetGzip="/etc/${packageName}.dnsmasq.ipset.gz"
readonly ipsetOutputFilter='s|^|ipset=/|;s|$|/adb|' readonly dnsmasqIpsetFilter='s|^|ipset=/|;s|$|/adb|'
readonly serversFile="/var/run/${packageName}.servers" readonly dnsmasqNftsetFile="/tmp/dnsmasq.d/${packageName}.nftset"
readonly serversCache="/var/run/${packageName}.servers.cache" readonly dnsmasqNftsetCache="/var/run/${packageName}/dnsmasq.nftset.cache"
readonly serversGzip="/etc/${packageName}.servers.gz" readonly dnsmasqNftsetGzip="/etc/${packageName}.dnsmasq.nftset.gz"
readonly serversOutputFilter='s|^|server=/|;s|$|/|' readonly dnsmasqNftsetFilter='s|^|nftset=/|;s|$|/adb|'
readonly dnsmasqServersFile="/var/run/${packageName}/dnsmasq.servers"
readonly dnsmasqServersCache="/var/run/${packageName}/dnsmasq.servers.cache"
readonly dnsmasqServersGzip="/etc/${packageName}.dnsmasq.servers.gz"
readonly dnsmasqServersFilter='s|^|server=/|;s|$|/|'
readonly unboundFile="/var/lib/unbound/adb_list.${packageName}" readonly unboundFile="/var/lib/unbound/adb_list.${packageName}"
readonly unboundCache="/var/run/${packageName}.unbound.cache" readonly unboundCache="/var/run/${packageName}/unbound.cache"
readonly unboundGzip="/etc/${packageName}.unbound.gz" readonly unboundGzip="/etc/${packageName}.unbound.gz"
readonly unboundOutputFilter='s|^|local-zone: "|;s|$|" static|' readonly unboundFilter='s|^|local-zone: "|;s|$|" static|'
readonly A_TMP="/var/${packageName}.hosts.a.tmp" readonly A_TMP="/var/${packageName}.hosts.a.tmp"
readonly B_TMP="/var/${packageName}.hosts.b.tmp" readonly B_TMP="/var/${packageName}.hosts.b.tmp"
readonly jsonFile="/var/run/${packageName}.json" readonly jsonFile="/var/run/${packageName}/${packageName}.json"
readonly sharedMemoryError="/dev/shm/$packageName-error" readonly sharedMemoryError="/dev/shm/$packageName-error"
readonly sharedMemoryOutput="/dev/shm/$packageName-output" readonly sharedMemoryOutput="/dev/shm/$packageName-output"
readonly hostsFilter='/localhost/d;/^#/d;/^[^0-9]/d;s/^0\.0\.0\.0.//;s/^127\.0\.0\.1.//;s/[[:space:]]*#.*$//;s/[[:cntrl:]]$//;s/[[:space:]]//g;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;' readonly hostsFilter='/localhost/d;/^#/d;/^[^0-9]/d;s/^0\.0\.0\.0.//;s/^127\.0\.0\.1.//;s/[[:space:]]*#.*$//;s/[[:cntrl:]]$//;s/[[:space:]]//g;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;'
@ -61,6 +67,57 @@ readonly __FAIL__='\033[0;31m[\xe2\x9c\x97]\033[0m'
readonly _ERROR_='\033[0;31mERROR\033[0m' readonly _ERROR_='\033[0;31mERROR\033[0m'
readonly _WARNING_='\033[0;33mWARNING\033[0m' readonly _WARNING_='\033[0;33mWARNING\033[0m'
serviceEnabled=
forceDNS=
forceDNSPorts=
parallelDL=
debug=
compressedCache=
ipv6Enabled=
configUpdateEnabled=
configUpdateURL=
bootDelay=
dlTimeout=
curlRetry=
verbosity=
led=
targetDNS=
dnsInstance=
allowed_domains=
allowed_domains_urls=
blocked_domains=
blocked_domains_urls=
blocked_hosts_urls=
dl_command=
dl_flag=
isSSLSupported=
allowIDN=
outputFilter=
outputFilterIPv6=
outputFile=
outputGzip=
outputCache=
awk='awk'
uci_add_list_if_new() {
local PACKAGE="$1"
local CONFIG="$2"
local OPTION="$3"
local VALUE="$4"
local i
[ -n "$PACKAGE" ] && [ -n "$CONFIG" ] && [ -n "$OPTION" ] && [ -n "$VALUE" ] || return 1
for i in $(uci_get "$PACKAGE" "$CONFIG" "$OPTION"); do
[ "$i" = "$VALUE" ] && return 0
done
uci_add_list "$PACKAGE" "$CONFIG" "$OPTION" "$VALUE"
}
uci_changes() {
local PACKAGE="$1"
local CONFIG="$2"
local OPTION="$3"
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
}
version() { echo "$PKG_VERSION"; } version() { echo "$PKG_VERSION"; }
getStatusText() { getStatusText() {
@ -100,8 +157,10 @@ getErrorText() {
errorDNSReload) _ret="failed to reload/restart DNS resolver";; errorDNSReload) _ret="failed to reload/restart DNS resolver";;
errorDownloadingConfigUpdate) _ret="failed to download Config Update file";; errorDownloadingConfigUpdate) _ret="failed to download Config Update file";;
errorDownloadingList) _ret="failed to download";; errorDownloadingList) _ret="failed to download";;
errorParsingList) _ret="failed to parse";;
errorParsingConfigUpdate) _ret="failed to parse Config Update file";; errorParsingConfigUpdate) _ret="failed to parse Config Update file";;
errorParsingList) _ret="failed to parse";;
errorNoSSLSupport) _ret="no HTTPS/SSL support on device";;
errorCreatingDirectory) _ret="failed to create output/cache/gzip file directory";;
esac esac
printf "%b" "$_ret" printf "%b" "$_ret"
} }
@ -112,7 +171,8 @@ output_fail() { output 1 "$_FAIL_"; output 2 "$__FAIL__\\n"; }
output_failn() { output 1 "$_FAIL_\\n"; output 2 "$__FAIL__\\n"; } output_failn() { output 1 "$_FAIL_\\n"; output 2 "$__FAIL__\\n"; }
str_replace() { printf "%b" "$1" | sed -e "s/$(printf "%b" "$2")/$(printf "%b" "$3")/g"; } str_replace() { printf "%b" "$1" | sed -e "s/$(printf "%b" "$2")/$(printf "%b" "$3")/g"; }
str_contains() { test "$1" != "$(str_replace "$1" "$2" '')"; } str_contains() { test "$1" != "$(str_replace "$1" "$2" '')"; }
compare_values() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } is_greater() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
is_greater_or_equal() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" = "$2"; }
is_chaos_calmer() { ubus -S call system board | grep -q 'Chaos Calmer'; } is_chaos_calmer() { ubus -S call system board | grep -q 'Chaos Calmer'; }
led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; } led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; }
led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; } led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; }
@ -141,17 +201,8 @@ output() {
fi fi
} }
serviceEnabled=''; forceDNS=''; forceDNSPorts=''; parallelDL=''; debug='';
compressedCache=''; ipv6Enabled=''; configUpdateEnabled=''; configUpdateURL='';
bootDelay=''; dlTimeout=''; curlRetry=''; verbosity=''; led='';
targetDNS=''; dnsInstance='';
allowed_domains=''; allowed_domains_urls='';
blocked_domains=''; blocked_domains_urls=''; blocked_hosts_urls='';
dl_command=''; dl_flag=''; isSSLSupported=''; allowIDN='';
outputFilter=''; outputFilterIPv6=''; outputFile=''; outputGzip=''; outputCache='';
awk='awk';
load_package_config() { load_package_config() {
local i
config_load "$packageName" config_load "$packageName"
config_get_bool serviceEnabled 'config' 'enabled' 1 config_get_bool serviceEnabled 'config' 'enabled' 1
config_get_bool forceDNS 'config' 'force_dns' 1 config_get_bool forceDNS 'config' 'force_dns' 1
@ -177,61 +228,77 @@ load_package_config() {
if [ "$targetDNS" != 'dnsmasq.addnhosts' ] && [ "$targetDNS" != 'dnsmasq.conf' ] && \ if [ "$targetDNS" != 'dnsmasq.addnhosts' ] && [ "$targetDNS" != 'dnsmasq.conf' ] && \
[ "$targetDNS" != 'dnsmasq.servers' ] && [ "$targetDNS" != 'unbound.adb_list' ] && \ [ "$targetDNS" != 'dnsmasq.servers' ] && [ "$targetDNS" != 'unbound.adb_list' ] && \
[ "$targetDNS" != 'dnsmasq.ipset' ] ; then [ "$targetDNS" != 'dnsmasq.ipset' ] && [ "$targetDNS" != 'dnsmasq.nftset' ] ; then
targetDNS='dnsmasq.servers' targetDNS='dnsmasq.servers'
fi fi
case "$targetDNS" in case "$targetDNS" in
dnsmasq.addnhosts) dnsmasq.addnhosts)
outputFilter="$addnhostsOutputFilter" outputFilter="$dnsmasqAddnhostsFilter"
outputFile="$addnhostsFile" outputFile="$dnsmasqAddnhostsFile"
outputCache="$addnhostsCache" outputCache="$dnsmasqAddnhostsCache"
outputGzip="$addnhostsGzip" outputGzip="$dnsmasqAddnhostsGzip"
[ "$ipv6Enabled" -gt 0 ] && outputFilterIPv6="$addnhostsOutputFilterIPv6" [ "$ipv6Enabled" -gt 0 ] && outputFilterIPv6="$dnsmasqAddnhostsFilterIPv6"
rm -f "$dnsmasqFile" "$dnsmasqCache" "$dnsmasqGzip" rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$ipsetFile" "$ipsetCache" "$ipsetGzip" rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$serversFile" "$serversCache" "$serversGzip" rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "$dnsmasqServersGzip"
rm -f "$unboundFile" "$unboundCache" "$unboundGzip" rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
;; ;;
dnsmasq.conf) dnsmasq.conf)
outputFilter="$dnsmasqOutputFilter" outputFilter="$dnsmasqConfFilter"
outputFile="$dnsmasqFile" outputFile="$dnsmasqConfFile"
outputCache="$dnsmasqCache" outputCache="$dnsmasqConfCache"
outputGzip="$dnsmasqGzip" outputGzip="$dnsmasqConfGzip"
rm -f "$addnhostsFile" "$addnhostsCache" "$addnhostsGzip" rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$ipsetFile" "$ipsetCache" "$ipsetGzip" rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$serversFile" "$serversCache" "$serversGzip" rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "$dnsmasqServersGzip"
rm -f "$unboundFile" "$unboundCache" "$unboundGzip" rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
;; ;;
dnsmasq.ipset) dnsmasq.ipset)
outputFilter="$ipsetOutputFilter" outputFilter="$dnsmasqIpsetFilter"
outputFile="$ipsetFile" outputFile="$dnsmasqIpsetFile"
outputCache="$ipsetCache" outputCache="$dnsmasqIpsetCache"
outputGzip="$ipsetGzip" outputGzip="$dnsmasqIpsetGzip"
rm -f "$dnsmasqFile" "$dnsmasqCache" "$dnsmasqGzip" rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$addnhostsFile" "$addnhostsCache" "$addnhostsGzip" rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$serversFile" "$serversCache" "$serversGzip" rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "$dnsmasqServersGzip"
rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
;;
dnsmasq.nftset)
outputFilter="$dnsmasqNftsetFilter"
outputFile="$dnsmasqNftsetFile"
outputCache="$dnsmasqNftsetCache"
outputGzip="$dnsmasqNftsetGzip"
rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "$dnsmasqServersGzip"
rm -f "$unboundFile" "$unboundCache" "$unboundGzip" rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
;; ;;
dnsmasq.servers) dnsmasq.servers)
outputFilter="$serversOutputFilter" outputFilter="$dnsmasqServersFilter"
outputFile="$serversFile" outputFile="$dnsmasqServersFile"
outputCache="$serversCache" outputCache="$dnsmasqServersCache"
outputGzip="$serversGzip" outputGzip="$dnsmasqServersGzip"
rm -f "$dnsmasqFile" "$dnsmasqCache" "$dnsmasqGzip" rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$addnhostsFile" "$addnhostsCache" "$addnhostsGzip" rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$ipsetFile" "$ipsetCache" "$ipsetGzip" rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$unboundFile" "$unboundCache" "$unboundGzip" rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
;; ;;
unbound.adb_list) unbound.adb_list)
outputFilter="$unboundOutputFilter" outputFilter="$unboundFilter"
outputFile="$unboundFile" outputFile="$unboundFile"
outputCache="$unboundCache" outputCache="$unboundCache"
outputGzip="$unboundGzip" outputGzip="$unboundGzip"
rm -f "$addnhostsFile" "$addnhostsCache" "$addnhostsGzip" rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$dnsmasqFile" "$dnsmasqCache" "$dnsmasqGzip" rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$ipsetFile" "$ipsetCache" "$ipsetGzip" rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$serversFile" "$serversCache" "$serversGzip" rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "$dnsmasqServersGzip"
;; ;;
esac esac
if [ -z "${verbosity##*[!0-9]*}" ] || [ "$verbosity" -lt 0 ] || [ "$verbosity" -gt 2 ]; then if [ -z "${verbosity##*[!0-9]*}" ] || [ "$verbosity" -lt 0 ] || [ "$verbosity" -gt 2 ]; then
@ -277,7 +344,8 @@ load_package_config() {
} }
is_enabled() { is_enabled() {
wan_if=''; wan_gw=''; wan_if=
wan_gw=
load_package_config load_package_config
if [ "$debug" -ne 0 ]; then if [ "$debug" -ne 0 ]; then
@ -298,7 +366,7 @@ is_enabled() {
fi fi
case $targetDNS in case $targetDNS in
dnsmasq.addnhosts | dnsmasq.conf | dnsmasq.ipset | dnsmasq.servers) dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers)
if dnsmasq -v 2>/dev/null | grep -q 'no-IDN' || ! dnsmasq -v 2>/dev/null | grep -q -w 'IDN'; then if dnsmasq -v 2>/dev/null | grep -q 'no-IDN' || ! dnsmasq -v 2>/dev/null | grep -q -w 'IDN'; then
allowIDN=0 allowIDN=0
else else
@ -312,7 +380,7 @@ is_enabled() {
case $targetDNS in case $targetDNS in
dnsmasq.ipset) dnsmasq.ipset)
if dnsmasq -v 2>/dev/null | grep -q 'no-ipset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'ipset'; then if dnsmasq -v 2>/dev/null | grep -q 'no-ipset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'ipset'; then
output "$_ERROR_: DNSMASQ ipset support is enabled in $packageName, but DNSMASQ is either not installed or installed DNSMASQ does not support ipsets!\\n" output "$_ERROR_: DNSMASQ ipset support is enabled in $packageName, but DNSMASQ is either not installed or installed DNSMASQ does not support ipset!\\n"
targetDNS='dnsmasq.servers' targetDNS='dnsmasq.servers'
fi fi
if ! ipset help hash:net >/dev/null 2>&1; then if ! ipset help hash:net >/dev/null 2>&1; then
@ -320,11 +388,25 @@ is_enabled() {
targetDNS='dnsmasq.servers' targetDNS='dnsmasq.servers'
fi fi
;; ;;
dnsmasq.nftset)
if dnsmasq -v 2>/dev/null | grep -q 'no-nftset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'nftset'; then
output "$_ERROR_: DNSMASQ nftset support is enabled in $packageName, but DNSMASQ is either not installed or installed DNSMASQ does not support nftset!\\n"
targetDNS='dnsmasq.servers'
fi
if [ -z "$(command -v nft)" ]; then
output "$_ERROR_: DNSMASQ nftset support is enabled in $packageName, but nft is not installed!\\n"
targetDNS='dnsmasq.servers'
fi
;;
esac esac
[ ! -d "${outputFile%/*}" ] && mkdir -p "${outputFile%/*}" for i in "$outputFile" "$outputCache" "$outputGzip"; do
[ ! -d "${outputCache%/*}" ] && mkdir -p "${outputFile%/*}" if ! mkdir -p "$(dirname "$i")"; then
[ ! -d "${outputGzip%/*}" ] && mkdir -p "${outputFile%/*}" output "$_ERROR_: Unable to create directory for $i!\\n"
jsonOps add error "errorOutputFileCreate"
fi
done
cacheOps 'testGzip' && return 0 cacheOps 'testGzip' && return 0
network_flush_cache; network_find_wan wan_if; network_get_gateway wan_gw "$wan_if"; network_flush_cache; network_find_wan wan_if; network_get_gateway wan_gw "$wan_if";
[ -n "$wan_gw" ] && return 0 [ -n "$wan_gw" ] && return 0
@ -335,23 +417,21 @@ dnsmasqOps() {
local cfg="$1" param="$2" local cfg="$1" param="$2"
case "$param" in case "$param" in
dnsmasq.addnhosts) dnsmasq.addnhosts)
if [ "$(uci -q get dhcp."$cfg".serversfile)" = "$serversFile" ]; then if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then
uci -q del dhcp."$cfg".serversfile uci_remove 'dhcp' "$cfg" 'serversfile'
fi
if ! uci -q get dhcp."$cfg".addnhosts | grep -q "$addnhostsFile"; then
uci add_list dhcp."$cfg".addnhosts="$addnhostsFile"
fi fi
uci_add_list_if_new 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
;; ;;
dnsmasq.conf|dnsmasq.ipset|unbound.adb_list|cleanup) dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|unbound.adb_list|cleanup)
uci -q del_list dhcp."$cfg".addnhosts="$addnhostsFile" uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
if [ "$(uci -q get dhcp."$cfg".serversfile)" = "$serversFile" ]; then if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then
uci -q del dhcp."$cfg".serversfile uci_remove 'dhcp' "$cfg" 'serversfile'
fi fi
;; ;;
dnsmasq.servers) dnsmasq.servers)
uci -q del_list dhcp."$cfg".addnhosts="$addnhostsFile" uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
if [ "$(uci -q get dhcp."$cfg".serversfile)" != "$serversFile" ]; then if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" != "$dnsmasqServersFile" ]; then
uci set dhcp."$cfg".serversfile="$serversFile" uci_set 'dhcp' "$cfg" 'serversfile' "$dnsmasqServersFile"
fi fi
;; ;;
esac esac
@ -382,7 +462,7 @@ dnsOps() {
param=dnsmasq_hup param=dnsmasq_hup
output_text='Reloading DNSMASQ' output_text='Reloading DNSMASQ'
;; ;;
dnsmasq.conf|dnsmasq.ipset) dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
param=dnsmasq_restart param=dnsmasq_restart
output_text='Restarting DNSMASQ' output_text='Restarting DNSMASQ'
;; ;;
@ -392,8 +472,8 @@ dnsOps() {
;; ;;
esac esac
if [ -n "$(uci changes dhcp)" ]; then if [ -n "$(uci_changes dhcp)" ]; then
uci commit dhcp uci_commit dhcp
if [ "$param" = 'unbound_restart' ]; then if [ "$param" = 'unbound_restart' ]; then
param='dnsmasq_restart; unbound_restart;' param='dnsmasq_restart; unbound_restart;'
output_text='Restarting Unbound/DNSMASQ' output_text='Restarting Unbound/DNSMASQ'
@ -419,18 +499,18 @@ dnsOps() {
;; ;;
on_stop) on_stop)
case "$targetDNS" in case "$targetDNS" in
dnsmasq.addnhosts | dnsmasq.servers) dnsmasq.addnhosts|dnsmasq.servers)
param=dnsmasq_hup param=dnsmasq_hup
;; ;;
dnsmasq.conf | dnsmasq.ipset) dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
param=dnsmasq_restart param=dnsmasq_restart
;; ;;
unbound.adb_list) unbound.adb_list)
param=unbound_restart param=unbound_restart
;; ;;
esac esac
if [ -n "$(uci changes dhcp)" ]; then if [ -n "$(uci_changes dhcp)" ]; then
uci -q commit dhcp uci_commit dhcp
if [ "$param" = 'unbound_restart' ]; then if [ "$param" = 'unbound_restart' ]; then
param='dnsmasq_restart; unbound_restart;' param='dnsmasq_restart; unbound_restart;'
else else
@ -442,7 +522,7 @@ dnsOps() {
;; ;;
quiet) quiet)
case "$targetDNS" in case "$targetDNS" in
dnsmasq.addnhosts | dnsmasq.conf | dnsmasq.ipset | dnsmasq.servers) dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers)
param=dnsmasq_restart param=dnsmasq_restart
;; ;;
unbound.adb_list) unbound.adb_list)
@ -718,6 +798,7 @@ $(cat $A_TMP)"
if [ "$targetDNS" = 'dnsmasq.conf' ] || \ if [ "$targetDNS" = 'dnsmasq.conf' ] || \
[ "$targetDNS" = 'dnsmasq.ipset' ] || \ [ "$targetDNS" = 'dnsmasq.ipset' ] || \
[ "$targetDNS" = 'dnsmasq.nftset' ] || \
[ "$targetDNS" = 'dnsmasq.servers' ] || \ [ "$targetDNS" = 'dnsmasq.servers' ] || \
[ "$targetDNS" = 'unbound.adb_list' ]; then [ "$targetDNS" = 'unbound.adb_list' ]; then
# TLD optimization written by Dirk Brenken (dev@brenken.org) # TLD optimization written by Dirk Brenken (dev@brenken.org)
@ -802,6 +883,10 @@ $(cat $A_TMP)"
output 2 'Creating DNSMASQ ipset file ' output 2 'Creating DNSMASQ ipset file '
jsonOps set message "$(getStatusText "statusProcessing"): creating DNSMASQ ipset file" jsonOps set message "$(getStatusText "statusProcessing"): creating DNSMASQ ipset file"
;; ;;
dnsmasq.nftset)
output 2 'Creating DNSMASQ nftset file '
jsonOps set message "$(getStatusText "statusProcessing"): creating DNSMASQ nftset file"
;;
dnsmasq.servers) dnsmasq.servers)
output 2 'Creating DNSMASQ servers file ' output 2 'Creating DNSMASQ servers file '
jsonOps set message "$(getStatusText "statusProcessing"): creating DNSMASQ servers file" jsonOps set message "$(getStatusText "statusProcessing"): creating DNSMASQ servers file"
@ -1010,14 +1095,15 @@ reload_service() { rc_procd start_service 'restart'; }
dl() { rc_procd start_service 'download'; } dl() { rc_procd start_service 'download'; }
killcache() { killcache() {
rm -f "$addnhostsCache" "$addnhostsGzip" rm -f "$dnsmasqAddnhostsCache" "$dnsmasqAddnhostsGzip"
rm -f "$dnsmasqCache" "$dnsmasqGzip" rm -f "$dnsmasqConfCache" "$dnsmasqConfGzip"
rm -f "$ipsetCache" "$ipsetGzip" rm -f "$dnsmasqIpsetCache" "$dnsmasqIpsetGzip"
rm -f "$serversCache" "$serversGzip" rm -f "$dnsmasqNftsetCache" "$dnsmasqNftsetGzip"
rm -f "$dnsmasqServersCache" "$dnsmasqServersGzip"
rm -f "$unboundCache" "$unboundGzip" rm -f "$unboundCache" "$unboundGzip"
config_load 'dhcp' config_load 'dhcp'
config_foreach dnsmasqOps 'dnsmasq' 'cleanup' config_foreach dnsmasqOps 'dnsmasq' 'cleanup'
uci -q commit 'dhcp' uci_commit 'dhcp'
return 0 return 0
} }
@ -1080,39 +1166,104 @@ service_triggers() {
procd_close_trigger procd_close_trigger
} }
allow() {
load_package_config
local c string="$1"
if [ ! -s "$outputFile" ]; then
echo "No block-list ('$outputFile') found."
elif [ -z "$string" ]; then
echo "Usage: /etc/init.d/${packageName} allow domain(s)"
else
case "$targetDNS" in
dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers)
output 1 "Allowing domain(s) and restarting DNSMASQ... "
output 2 "Allowing domain(s)... \\n"
for c in $string; do
output 2 " $c "
if sed -i "/${string}/d" "$outputFile" && \
uci_add_list "${packageName}" 'config' 'allowed_domain' "$string"; then
output_ok
else
output_fail
fi
done
output 2 "Committing changes to config... "
if [ -n "$(uci_changes "$packageName")" ] && uci_commit "$packageName"; then
allowed_domains="$(uci_get_list "$packageName" 'config' 'allowed_domain')"
jsonOps set triggers
jsonOps set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${targetDNS})"
output_ok;
if [ "$targetDNS" = 'dnsmasq.ipset' ]; then
output 2 "Flushing adb ipset... "
if command -v ipset && ipset flush adb; then output_ok; else output_fail; fi
fi
output 2 "Restarting DNSMASQ... "
if dnsmasq_restart; then output_okn; else output_failn; fi
else
output_fail;
fi
;;
unbound.adb_list)
output 1 "Allowing domain(s) and restarting Unbound... "
output 2 "Allowing domain(s)... \\n"
for c in $string; do
output 2 " $c "
if sed -i "/${string}/d" "$outputFile" && \
uci_add_list "$packageName" 'config' 'allowed_domain' "$string"; then
output_ok
else
output_fail
fi
done
output 2 "Committing changes to config... "
if [ -n "$(uci_changes "$packageName")" ] && uci_commit "$packageName"; then
allowed_domains="$(uci_get_list "$packageName" 'config' 'allowed_domain')"
jsonOps set triggers
jsonOps set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${targetDNS})"
output_ok;
output 2 "Restarting Unbound... "
if unbound_restart; then output_okn; else output_failn; fi
else
output_fail;
fi
esac
fi
}
check() { check() {
load_package_config load_package_config
local c string="$1" local c string="$1"
c="$(grep -c "$string" "$outputFile")"
c="${c:-0}"
if [ ! -s "$outputFile" ]; then if [ ! -s "$outputFile" ]; then
echo "No block-list ('$outputFile') found." echo "No block-list ('$outputFile') found."
elif [ -z "$string" ]; then elif [ -z "$string" ]; then
echo "Usage: /etc/init.d/${packageName} check string" echo "Usage: /etc/init.d/${packageName} check string"
elif [ "$c" -gt 0 ]; then
if [ "$c" -eq 1 ]; then
echo "Found 1 match for '$string' in '$outputFile':"
elif [ "$c" -le 20 ]; then
echo "Found $c matches for '$string' in '$outputFile':"
else
echo "Found $c matches for '$string' in '$outputFile'."
fi
if [ "$c" -le 20 ]; then
case "$targetDNS" in
dnsmasq.addnhosts)
grep "$string" "$outputFile" | sed 's|^127.0.0.1 ||;s|^:: ||;';;
dnsmasq.conf)
grep "$string" "$outputFile" | sed 's|local=/||;s|/$||;';;
dnsmasq.ipset)
grep "$string" "$outputFile" | sed 's|ipset=/||;s|/adb$||;';;
dnsmasq.servers)
grep "$string" "$outputFile" | sed 's|server=/||;s|/$||;';;
unbound.adb_list)
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';;
esac
fi
else else
echo "The '$string' is not found in current block-list ('$outputFile')." c="$(grep -c "$string" "$outputFile")"
if [ "$c" -gt 0 ]; then
if [ "$c" -eq 1 ]; then
echo "Found 1 match for '$string' in '$outputFile':"
else
echo "Found $c matches for '$string' in '$outputFile'."
fi
if [ "$c" -le 20 ]; then
case "$targetDNS" in
dnsmasq.addnhosts)
grep "$string" "$outputFile" | sed 's|^127.0.0.1 ||;s|^:: ||;';;
dnsmasq.conf)
grep "$string" "$outputFile" | sed 's|local=/||;s|/$||;';;
dnsmasq.ipset)
grep "$string" "$outputFile" | sed 's|ipset=/||;s|/adb$||;';;
dnsmasq.nftset)
grep "$string" "$outputFile" | sed 's|nftset=/||;s|/adb$||;';;
dnsmasq.servers)
grep "$string" "$outputFile" | sed 's|server=/||;s|/$||;';;
unbound.adb_list)
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';;
esac
fi
else
echo "The '$string' is not found in current block-list ('$outputFile')."
fi
fi fi
} }
@ -1125,9 +1276,9 @@ sizes() {
[ "${i//melmac}" != "$i" ] && continue [ "${i//melmac}" != "$i" ] && continue
if $dl_command "$i" $dl_flag /tmp/sast 2>/dev/null && [ -s /tmp/sast ]; then if $dl_command "$i" $dl_flag /tmp/sast 2>/dev/null && [ -s /tmp/sast ]; then
echo "# File size: $(du -sh /tmp/sast | $awk '{print $1}')" echo "# File size: $(du -sh /tmp/sast | $awk '{print $1}')"
if compare_values "$(du -sk /tmp/sast)" "500"; then if is_greater "$(du -sk /tmp/sast)" "500"; then
echo "# block-list too big for most routers" echo "# block-list too big for most routers"
elif compare_values "$(du -sk /tmp/sast)" "100"; then elif is_greater "$(du -sk /tmp/sast)" "100"; then
echo "# block-list may be too big for some routers" echo "# block-list may be too big for some routers"
fi fi
rm -rf /tmp/sast rm -rf /tmp/sast
@ -1143,9 +1294,9 @@ sizes() {
for i in $blocked_hosts_urls; do for i in $blocked_hosts_urls; do
if $dl_command "$i" $dl_flag /tmp/sast 2>/dev/null && [ -s /tmp/sast ]; then if $dl_command "$i" $dl_flag /tmp/sast 2>/dev/null && [ -s /tmp/sast ]; then
echo "# File size: $(du -sh /tmp/sast | $awk '{print $1}')" echo "# File size: $(du -sh /tmp/sast | $awk '{print $1}')"
if compare_values "$(du -sk /tmp/sast)" "500"; then if is_greater "$(du -sk /tmp/sast)" "500"; then
echo "# block-list too big for most routers" echo "# block-list too big for most routers"
elif compare_values "$(du -sk /tmp/sast)" "100"; then elif is_greater "$(du -sk /tmp/sast)" "100"; then
echo "# block-list may be too big for some routers" echo "# block-list may be too big for some routers"
fi fi
rm -rf /tmp/sast rm -rf /tmp/sast