diff options
author | Stan Grishin <stangri@melmac.ca> | 2023-08-28 21:13:13 +0000 |
---|---|---|
committer | Stan Grishin <stangri@melmac.ca> | 2023-08-28 21:17:03 +0000 |
commit | be69e34ce3b4f4c144b4b9e7ec2a6b480ee4d44a (patch) | |
tree | a772587b32c2c1f67b64349d77fd13ee6cc25503 /net/adblock-fast/files/etc | |
parent | 40d5ba9378127a852b0b4735b02798be17e2e12c (diff) |
adblock-fast: initial commit
* this package replaces simple-adblock package
* it was impossible to keep existing config structure and continue
improving the simple-adblock the way I wanted, hence the new
package name
* the migration script for existing simple-adblock config is included in
the uci-defaults file
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Diffstat (limited to 'net/adblock-fast/files/etc')
-rw-r--r-- | net/adblock-fast/files/etc/config/adblock-fast | 118 | ||||
-rwxr-xr-x | net/adblock-fast/files/etc/init.d/adblock-fast | 1701 | ||||
-rw-r--r-- | net/adblock-fast/files/etc/uci-defaults/90-adblock-fast | 165 |
3 files changed, 1984 insertions, 0 deletions
diff --git a/net/adblock-fast/files/etc/config/adblock-fast b/net/adblock-fast/files/etc/config/adblock-fast new file mode 100644 index 000000000..10cdf5186 --- /dev/null +++ b/net/adblock-fast/files/etc/config/adblock-fast @@ -0,0 +1,118 @@ +config adblock-fast 'config' + option enabled '0' + list allowed_domain 'cdn.jsdelivr.net' + option allow_non_ascii '0' + option canary_domains_icloud '0' + option canary_domains_mozilla '0' + option compressed_cache '0' + option compressed_cache_dir '/etc' + option config_update_enabled '0' + option config_update_url 'https://cdn.jsdelivr.net/gh/openwrt/packages/net/adblock-fast/files/adblock-fast.conf.update' + option curl_additional_param '' + option curl_max_file_size '30000000' + option curl_retry '3' + option debug '0' + option dns 'dnsmasq.servers' + option dnsmasq_instance '*' +# option dnsmasq_config_file_url 'https://big.oisd.nl/dnsmasq2' + option download_timeout '10' + option force_dns '1' + list force_dns_port '53' + list force_dns_port '853' +# ports listed below are used by some +# of the dnscrypt-proxy v1 resolvers +# list force_dns_port '553' +# list force_dns_port '1443' +# list force_dns_port '4343' +# list force_dns_port '4434' +# list force_dns_port '5443' +# list force_dns_port '8443' + option led 'none' + option parallel_downloads '1' + option procd_trigger_wan6 '0' + option procd_boot_wan_timeout '60' + option verbosity '2' + +config file_url + option url 'https://cdn.jsdelivr.net/gh/StevenBlack/hosts/hosts' + option size '6770929' + option action 'block' + option enabled '0' + +config file_url + option url 'https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_trackers_justdomains.txt' + option size '6241707' + option action 'block' + option enabled '0' + +config file_url + option url 'https://big.oisd.nl/' + option size '6163363' + option action 'block' + option enabled '0' + +config file_url + option url 'https://cdn.jsdelivr.net/gh/bongochong/CombinedPrivacyBlockLists/NoFormatting/cpbl-ctld.txt' + option size '2608152' + option action 'block' + option enabled '0' + +config file_url + option url 'http://sysctl.org/cameleon/hosts' + option size '638545' + option action 'block' + option enabled '0' + +config file_url + option url 'https://cdn.jsdelivr.net/gh/kboghdady/youTube_ads_4_pi-hole/black.list' + option size '553006' + option action 'block' + option enabled '0' + +config file_url + option url 'https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_clickthroughs_justdomains.txt' + option size '362170' + option action 'block' + option enabled '0' + +config file_url + option url 'https://someonewhocares.org/hosts/hosts' + option size '347410' + option action 'block' + option enabled '0' + +config file_url + option url 'https://winhelp2002.mvps.org/hosts.txt' + option size '334861' + option action 'block' + option enabled '0' + +config file_url + option url 'https://adaway.org/hosts.txt' + option size '243454' + option action 'block' + option enabled '0' + +config file_url + option url 'https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_ads_justdomains.txt' + option size '222595' + option action 'block' + option enabled '0' + +config file_url + option url 'https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_microsites_justdomains.txt' + option size '123275' + option action 'block' + option enabled '0' + +config file_url + option url 'https://pgl.yoyo.org/as/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext' + option size '99588' + option action 'block' + option enabled '0' + +config file_url + option url 'https://cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list/hosts.txt' + option size '11149' + option action 'block' + option enabled '0' diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast new file mode 100755 index 000000000..f7fb5b3d2 --- /dev/null +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -0,0 +1,1701 @@ +#!/bin/sh /etc/rc.common +# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca) +# shellcheck disable=SC1091,SC2015,SC2016,SC3037,SC3043,SC3045,SC3057,SC3060 + +# shellcheck disable=SC2034 +START=94 +# shellcheck disable=SC2034 +USE_PROCD=1 +LC_ALL=C + +if type extra_command 1>/dev/null 2>&1; then + extra_command 'allow' 'Allows domain in current block-list and config' + extra_command 'check' 'Checks if specified domain is found in current block-list' + extra_command 'dl' 'Force-downloads all enabled block-list' + extra_command 'killcache' 'Delete all cached files' + extra_command 'pause' 'Pauses AdBlocking for specified number of seconds (default: 60)' + extra_command 'sizes' 'Displays the file-sizes of enabled block-lists' + extra_command 'version' 'Show version information' +else +# shellcheck disable=SC2034 + EXTRA_COMMANDS='allow check dl killcache pause sizes status_service version' +# shellcheck disable=SC2034 + 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 + pause Pauses AdBlocking for specified number of seconds (default: 60) + sizes Displays the file-sizes of enabled block-lists' +fi + +readonly PKG_VERSION='dev-test' +readonly packageName='adblock-fast' +readonly serviceName="$packageName $PKG_VERSION" +readonly packageConfigFile="/etc/config/${packageName}" +readonly dnsmasqAddnhostsFile="/var/run/${packageName}/dnsmasq.addnhosts" +readonly dnsmasqAddnhostsCache="/var/run/${packageName}/dnsmasq.addnhosts.cache" +readonly dnsmasqAddnhostsGzip="${packageName}.dnsmasq.addnhosts.gz" +readonly dnsmasqAddnhostsFilter='s|^|127.0.0.1 |;s|$||' +readonly dnsmasqAddnhostsFilterIPv6='s|^|:: |;s|$||' +readonly dnsmasqConfFile="/tmp/dnsmasq.d/${packageName}" +readonly dnsmasqConfCache="/var/run/${packageName}/dnsmasq.conf.cache" +readonly dnsmasqConfGzip="${packageName}.dnsmasq.conf.gz" +readonly dnsmasqConfFilter='s|^|local=/|;s|$|/|' +readonly dnsmasqIpsetFile="/tmp/dnsmasq.d/${packageName}.ipset" +readonly dnsmasqIpsetCache="/var/run/${packageName}/dnsmasq.ipset.cache" +readonly dnsmasqIpsetGzip="${packageName}.dnsmasq.ipset.gz" +readonly dnsmasqIpsetFilter='s|^|ipset=/|;s|$|/adb|' +readonly dnsmasqNftsetFile="/tmp/dnsmasq.d/${packageName}.nftset" +readonly dnsmasqNftsetCache="/var/run/${packageName}/dnsmasq.nftset.cache" +readonly dnsmasqNftsetGzip="${packageName}.dnsmasq.nftset.gz" +readonly dnsmasqNftsetFilter='s|^|nftset=/|;s|$|/4#inet#fw4#adb4|' +readonly dnsmasqNftsetFilterIPv6='s|^|nftset=/|;s|$|/4#inet#fw4#adb4,6#inet#fw4#adb6|' +readonly dnsmasqServersFile="/var/run/${packageName}/dnsmasq.servers" +readonly dnsmasqServersCache="/var/run/${packageName}/dnsmasq.servers.cache" +readonly dnsmasqServersGzip="${packageName}.dnsmasq.servers.gz" +readonly dnsmasqServersFilter='s|^|server=/|;s|$|/|' +readonly unboundFile="/var/lib/unbound/adb_list.${packageName}" +readonly unboundCache="/var/run/${packageName}/unbound.cache" +readonly unboundGzip="${packageName}.unbound.gz" +readonly unboundFilter='s|^|local-zone: "|;s|$|" static|' +readonly A_TMP="/var/${packageName}.hosts.a.tmp" +readonly B_TMP="/var/${packageName}.hosts.b.tmp" +readonly jsonFile="/dev/shm/$packageName-status.json" +readonly sharedMemoryError="/dev/shm/$packageName-error" +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 domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;' +readonly adBlockPlusFilter='/^#/d;/^!/d;s/[[:space:]]*#.*$//;s/^||//;s/\^$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;' +readonly dnsmasqFileFilter='\|^server=/[[:alnum:]_.-].*/|!d' +readonly dnsmasq2FileFilter='\|^local=/[[:alnum:]_.-].*/|!d' +readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m' +readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m' +readonly __OK__='\033[0;32m[\xe2\x9c\x93]\033[0m' +readonly __FAIL__='\033[0;31m[\xe2\x9c\x97]\033[0m' +readonly _ERROR_='\033[0;31mERROR\033[0m' +readonly _WARNING_='\033[0;33mWARNING\033[0m' +# shellcheck disable=SC2155 +readonly ipset="$(command -v ipset)" +# shellcheck disable=SC2155 +readonly nft="$(command -v nft)" +readonly canaryDomainsMozilla='use-application-dns.net' +readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com' + +dl_command= +dl_flag= +isSSLSupported= +outputFilter= +outputFilterIPv6= +outputFile= +outputGzip= +outputCache= +awk='awk' +load_environment_flag= +allowed_url= +blocked_url= + +debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; } + +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}" +} + +ipset() { "$ipset" "$@" >/dev/null 2>&1; } +nft() { "$nft" "$@" >/dev/null 2>&1; } + +get_text() { + local r + case "$1" in + errorConfigValidationFail) r="$packageName config validation failed";; + errorServiceDisabled) r="$packageName is currently disabled";; + errorNoDnsmasqIpset) + r="dnsmasq ipset support is enabled in $packageName, but dnsmasq is either not installed or installed dnsmasq does not support ipset";; + errorNoIpset) + r="dnsmasq ipset support is enabled in $packageName, but ipset is either not installed or installed ipset does not support 'hash:net' type";; + errorNoDnsmasqNftset) + r="dnsmasq nft set support is enabled in $packageName, but dnsmasq is either not installed or installed dnsmasq does not support nft set";; + errorNoNft) r="dnsmasq nft sets support is enabled in $packageName, but nft is not installed";; + errorNoWanGateway) r="The ${serviceName} failed to discover WAN gateway";; + errorOutputDirCreate) r="failed to create directory for %s file";; + errorOutputFileCreate) r="failed to create $outputFile file";; + errorFailDNSReload) r="failed to restart/reload DNS resolver";; + errorSharedMemory) r="failed to access shared memory";; + errorSorting) r="failed to sort data file";; + errorOptimization) r="failed to optimize data file";; + errorAllowListProcessing) r="failed to process allow-list";; + errorDataFileFormatting) r="failed to format data file";; + errorMovingDataFile) r="failed to move data file '${A_TMP}' to '${outputFile}'";; + errorCreatingCompressedCache) r="failed to create compressed cache";; + errorRemovingTempFiles) r="failed to remove temporary files";; + errorRestoreCompressedCache) r="failed to unpack compressed cache";; + errorRestoreCache) r="failed to move '$outputCache' to '$outputFile'";; + errorOhSnap) r="failed to create block-list or restart DNS resolver";; + errorStopping) r="failed to stop $serviceName";; + errorDNSReload) r="failed to reload/restart DNS resolver";; + errorDownloadingConfigUpdate) r="failed to download Config Update file";; + errorDownloadingList) r="failed to download";; + errorParsingConfigUpdate) r="failed to parse Config Update file";; + errorParsingList) r="failed to parse";; + errorNoSSLSupport) r="no HTTPS/SSL support on device";; + errorCreatingDirectory) r="failed to create output/cache/gzip file directory";; + + statusNoInstall) r="$serviceName is not installed or not found";; + statusStopped) r="Stopped";; + statusStarting) r="Starting";; + statusRestarting) r="Restarting";; + statusForceReloading) r="Force Reloading";; + statusDownloading) r="Downloading";; + statusProcessing) r="Processing";; + statusError) r="Error";; + statusWarning) r="Warning";; + statusFail) r="Fail";; + statusSuccess) r="Success";; + + warningExternalDnsmasqConfig) + r="use of external dnsmasq config file detected, please set 'dns' option to 'dnsmasq.conf'";; + warningMissingRecommendedPackages) r="Some recommended packages are missing";; + warningInvalidCompressedCacheDir) r="invalid compressed cache directory '%s'";; + esac + echo "$r" +} + +output_ok() { output 1 "$_OK_"; output 2 "$__OK__\\n"; } +output_okn() { output 1 "$_OK_\\n"; output 2 "$__OK__\\n"; } +output_fail() { output 1 "$_FAIL_"; 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_contains() { test "$1" != "$(str_replace "$1" "$2" '')"; } +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'; } +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; } +dnsmasq_hup() { killall -q -s HUP dnsmasq; } +dnsmasq_kill() { killall -q -s KILL dnsmasq; } +dnsmasq_restart() { /etc/init.d/dnsmasq restart >/dev/null 2>&1; } +unbound_restart() { /etc/init.d/unbound restart >/dev/null 2>&1; } +is_present() { command -v "$1" >/dev/null 2>&1; } +sanitize_dir() { [ -d "$(readlink -fn "$1")" ] && readlink -fn "$1"; } + +output() { +# Can take a single parameter (text) to be output at any verbosity +# Or target verbosity level and text to be output at specifc verbosity + local msg memmsg logmsg + local sharedMemoryOutput="/dev/shm/$packageName-output" + verbosity="${verbosity:-2}" + if [ $# -ne 1 ]; then + if [ $((verbosity & $1)) -gt 0 ] || [ "$verbosity" = "$1" ]; then shift; else return 0; fi + fi + [ -t 1 ] && printf "%b" "$1" + msg="${1//$serviceName /service }"; + if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then + [ -s "$sharedMemoryOutput" ] && memmsg="$(cat "$sharedMemoryOutput")" + logmsg="$(printf "%b" "${memmsg}${msg}" | sed 's/\x1b\[[0-9;]*m//g')" + logger -t "${packageName:-service} [$$]" "$(printf "%b" "$logmsg")" + rm -f "$sharedMemoryOutput" + else + printf "%b" "$msg" >> "$sharedMemoryOutput" + fi +} + +load_network() { + local param="$1" + local i j wan_if wan_gw wan_proto + local counter wan_if_timeout="$procd_boot_wan_timeout" wan_gw_timeout='5' + counter=0 + while [ -z "$wan_if" ]; do + network_flush_cache + network_find_wan wan_if + if [ -n "$wan_if" ]; then + output "WAN interface found: '${wan_if}'.\\n" + break + fi + if [ "$counter" -gt "$wan_if_timeout" ]; then + output "WAN interface timeout, assuming 'wan'.\\n" + wan_if='wan' + break + fi + counter=$((counter+1)) + output "Waiting to discover WAN Interface...\\n" + sleep 1 + done + + counter=0 + wan_proto="$(uci -q get "network.${wan_if}.proto")" + if [ "$wan_proto" = 'pppoe' ]; then + wan_gw_timeout=$((wan_gw_timeout+10)) + fi + while [ "$counter" -le "$wan_gw_timeout" ]; do + network_flush_cache + network_get_gateway wan_gw "$wan_if" + if [ -n "$wan_gw" ]; then + output "WAN gateway found: '${wan_gw}.'\\n" + return 0 + fi + counter=$((counter+1)) + output "Waiting to discover $wan_if gateway...\\n" + sleep 1 + done + json add error "errorNoWanGateway" + output "${_ERROR_}: $(get_text 'errorNoWanGateway')!\\n"; return 1; +} + +append_url() { + local cfg="$1" var="$2" + local en action url + config_get en "$cfg" enabled '1' + config_get action "$cfg" action 'block' + config_get url "$cfg" url + if [ "$en" = '1' ]; then + if [ "$action" = 'allow' ]; then + allowed_url="${allowed_url:+$allowed_url }${url}" + else + blocked_url="${blocked_url:+$blocked_url }${url}" + fi + fi +} + +detect_file_type() { + local file="$1" + if [ "$(head -1 "$file")" = '[Adblock Plus]' ]; then + echo 'adBlockPlus' + elif grep -q '^server=' "$file"; then + echo 'dnsmasqFile' + elif grep -q '^local=' "$file"; then + echo 'dnsmasq2File' + elif grep -q '^0.0.0.0' "$file" || grep -q '^127.0.0.1' "$file"; then + echo 'hosts' + else + echo 'domains' + fi +} + +load_environment() { + local i j + local validation_result="$1" param="$2" + + [ -z "$load_environment_flag" ] || return 0 + + if [ "$validation_result" != '0' ]; then + json add error "errorConfigValidationFail" + output "${_ERROR_}: $(get_text 'errorConfigValidationFail')!\\n" + output "Please check if the '$packageConfigFile' contains correct values for config options.\\n" + return 1 + fi + + if [ "$enabled" -eq 0 ]; then + json add error "errorServiceDisabled" + output "${_ERROR_}: $(get_text 'errorServiceDisabled')!\\n" + output "Run the following commands before starting service again:\\n" + output "uci set ${packageName}.config.enabled='1'; uci commit $packageName;\\n" + return 1 + fi + + if [ "$debug" -ne 0 ]; then + exec 1>>"/tmp/$packageName.log" + exec 2>&1 + set -x + fi + + if [ -n "$dnsmasq_config_file_url" ]; then + case "$dns" in + dnsmasq.conf) :;; + *) + if [ "$param" != 'quiet' ]; then + json add warning "warningExternalDnsmasqConfig" + output "${_WARNING_}: $(get_text 'warningExternalDnsmasqConfig')!\\n" + fi + ;; + esac + fi + + case "$dns" in + 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 + allow_non_ascii=0 + fi + ;; + unbound.adb_list) + allow_non_ascii=1;; + esac + + case "$dns" in + dnsmasq.ipset) + if dnsmasq -v 2>/dev/null | grep -q 'no-ipset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'ipset'; then + if [ "$param" != 'quiet' ]; then + json add error "errorNoDnsmasqIpset" + output "${_ERROR_}: $(get_text 'errorNoDnsmasqIpset')!\\n" + fi + dns='dnsmasq.servers' + fi + if ! ipset help hash:net; then + if [ "$param" != 'quiet' ]; then + json add error "errorNoIpset" + output "${_ERROR_}: $(get_text 'errorNoIpset')!\\n" + fi + dns='dnsmasq.servers' + fi + ;; + dnsmasq.nftset) + if dnsmasq -v 2>/dev/null | grep -q 'no-nftset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'nftset'; then + if [ "$param" != 'quiet' ]; then + json add error "errorNoDnsmasqNftset" + output "${_ERROR_}: $(get_text 'errorNoDnsmasqNftset')!\\n" + fi + dns='dnsmasq.servers' + fi + if [ -z "$nft" ]; then + if [ "$param" != 'quiet' ]; then + json add error "errorNoNft" + output "${_ERROR_}: $(get_text 'errorNoNft')!\\n" + fi + dns='dnsmasq.servers' + fi + ;; + esac + + if [ "$(sanitize_dir "$compressed_cache_dir")" = '/' ]; then + compressed_cache_dir='' + elif [ -n "$(sanitize_dir "$compressed_cache_dir")" ]; then + compressed_cache_dir="$(sanitize_dir "$compressed_cache_dir")" + else + json add warning 'warningInvalidCompressedCacheDir' "$compressed_cache_dir" + compressed_cache_dir="/etc" + fi + + case "$dns" in + dnsmasq.addnhosts) + outputFilter="$dnsmasqAddnhostsFilter" + outputFile="$dnsmasqAddnhostsFile" + outputCache="$dnsmasqAddnhostsCache" + outputGzip="${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + if [ "$ipv6_enabled" -ne 0 ]; then + outputFilterIPv6="$dnsmasqAddnhostsFilterIPv6" + fi + rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$unboundFile" "$unboundCache" "$unboundGzip" + ;; + dnsmasq.conf) + outputFilter="$dnsmasqConfFilter" + outputFile="$dnsmasqConfFile" + outputCache="$dnsmasqConfCache" + outputGzip="${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$unboundFile" "$unboundCache" "$unboundGzip" + ;; + dnsmasq.ipset) + outputFilter="$dnsmasqIpsetFilter" + outputFile="$dnsmasqIpsetFile" + outputCache="$dnsmasqIpsetCache" + outputGzip="${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$unboundFile" "$unboundCache" "$unboundGzip" + ;; + dnsmasq.nftset) + if [ "$ipv6_enabled" -ne 0 ]; then + outputFilter="$dnsmasqNftsetFilterIPv6" + else + outputFilter="$dnsmasqNftsetFilter" + fi + outputFile="$dnsmasqNftsetFile" + outputCache="$dnsmasqNftsetCache" + outputGzip="${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$unboundFile" "$unboundCache" "$unboundGzip" + ;; + dnsmasq.servers) + outputFilter="$dnsmasqServersFilter" + outputFile="$dnsmasqServersFile" + outputCache="$dnsmasqServersCache" + outputGzip="${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$unboundFile" "$unboundCache" "$unboundGzip" + ;; + unbound.adb_list) + outputFilter="$unboundFilter" + outputFile="$unboundFile" + outputCache="$unboundCache" + outputGzip="$unboundGzip" + rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + ;; + esac + + for i in "$jsonFile" "$outputFile" "$outputCache" "$outputGzip"; do + if ! mkdir -p "$(dirname "$i")"; then + if [ "$param" != 'quiet' ]; then + json add error "errorOutputDirCreate" "$i" + output "${_ERROR_}: $(get_text 'errorOutputDirCreate' "$i")!\\n" + fi + fi + done + + is_present 'gawk' && awk='gawk' + if ! is_present '/usr/libexec/grep-gnu' || ! is_present '/usr/libexec/sed-gnu' || \ + ! is_present '/usr/libexec/sort-coreutils' || ! is_present 'gawk'; then + local s="opkg update; opkg --force-overwrite install" + is_present 'gawk' || s="$s gawk" + is_present '/usr/libexec/grep-gnu' || s="$s grep" + is_present '/usr/libexec/sed-gnu' || s="$s sed" + is_present '/usr/libexec/sort-coreutils' || s="$s coreutils-sort" + if [ "$param" != 'quiet' ]; then + json add warning "warningMissingRecommendedPackages" "${i}" + output "${_WARNING_}: $(get_text 'warningMissingRecommendedPackages'), install them by running:\\n" + output "$s;\\n" + fi + fi + # Prefer curl because it supports the file:// scheme. + if is_present 'curl'; then + dl_command='curl --silent --insecure' + dl_command="${dl_command}${curl_additional_param:+ $curl_additional_param}" + dl_command="${dl_command}${curl_max_file_size:+ --max-filesize $curl_max_file_size}" + dl_command="${dl_command}${curl_retry:+ --retry $curl_retry}" + dl_command="${dl_command}${download_timeout:+ --connect-timeout $download_timeout}" + dl_flag='-o' + elif is_present '/usr/libexec/wget-ssl'; then + dl_command='/usr/libexec/wget-ssl --no-check-certificate -q' + dl_command="${dl_command}${download_timeout:+ --timeout $download_timeout}" + dl_flag="-O" + size_command='/usr/libexec/wget-ssl --no-check-certificate -q -O /dev/null --server-response' + size_command="${size_command}${download_timeout:+ --timeout $download_timeout}" + elif is_present wget && wget --version 2>/dev/null | grep -q "+https"; then + dl_command="wget --no-check-certificate -q" + dl_command="${dl_command}${download_timeout:+ --timeout $download_timeout}" + dl_flag="-O" + size_command='wget --no-check-certificate -q -O /dev/null --server-response' + size_command="${size_command}${download_timeout:+ --timeout $download_timeout}" + else + dl_command="uclient-fetch --no-check-certificate -q" + dl_command="${dl_command}${download_timeout:+ --timeout $download_timeout}" + dl_flag="-O" + fi + led="${led:+/sys/class/leds/$led}" + if curl --version 2>/dev/null | grep -q "https" \ + || wget --version 2>/dev/null | grep -q "+https" \ + || grep -q "libustream-mbedtls" /usr/lib/opkg/status \ + || grep -q "libustream-openssl" /usr/lib/opkg/status \ + || grep -q "libustream-wolfssl" /usr/lib/opkg/status; then + isSSLSupported=1 + else + unset isSSLSupported + fi + config_load "$packageName" + config_foreach append_url 'file_url' + load_environment_flag=1 + cache 'test' && return 0 + cache 'test_gzip' && return 0 + if [ "$param" = 'on_boot' ]; then + load_network "$param" + return "$?" + else + return 0 + fi +} + +get_url_filesize() { + local url="$1" size size_command + [ -n "$url" ] || return 0 + is_present 'curl' || return 0 + size_command='curl --silent --insecure --fail --head --request GET' + size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')" + echo -en "$size" +} + +get_local_filesize() { + local file="$1" size + [ -f "$file" ] || return 0 + if is_present stat; then + size="$(stat -c%s "$file")" + elif is_present wc; then + size="$(wc -c < "$file")" + fi + echo -en "$size" +} + +resolver() { + local cfg="$1" param="$2" + case "$param" in + dnsmasq.addnhosts) + if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then + uci_remove 'dhcp' "$cfg" 'serversfile' + fi + uci_add_list_if_new 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile" + ;; + cleanup|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|unbound.adb_list) + uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile" + if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then + uci_remove 'dhcp' "$cfg" 'serversfile' + fi + ;; + dnsmasq.servers) + uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile" + if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" != "$dnsmasqServersFile" ]; then + uci_set 'dhcp' "$cfg" 'serversfile' "$dnsmasqServersFile" + fi + ;; + esac +} + +dns() { + local param output_text i + case $1 in + on_start) + if [ ! -s "$outputFile" ]; then + json set status "statusFail" + json add error "errorOutputFileCreate" + output "${_ERROR_}: $(get_text 'errorOutputFileCreate')!\\n" + return 1 + fi + + config_load 'dhcp' + if [ "$dnsmasq_instance" = "*" ]; then + config_foreach resolver 'dnsmasq' "$dns" + elif [ -n "$dnsmasq_instance" ]; then + for i in $dnsmasq_instance; do + resolver "@dnsmasq[$i]" "$dns" || resolver "$i" "$dns" + done + fi + + case "$dns" in + dnsmasq.addnhosts|dnsmasq.servers) + chmod 660 "$outputFile" + chown root:dnsmasq "$outputFile" + param=dnsmasq_restart + output_text='Reloading dnsmasq' + ;; + dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset) + chmod 660 "$outputFile" + chown root:dnsmasq "$outputFile" + param=dnsmasq_restart + output_text='Restarting dnsmasq' + ;; + unbound.adb_list) + param=unbound_restart + output_text='Restarting Unbound' + ;; + esac + + if [ -n "$(uci_changes dhcp)" ]; then + uci_commit dhcp + if [ "$param" = 'unbound_restart' ]; then + param='dnsmasq_restart; unbound_restart;' + output_text='Restarting Unbound/dnsmasq' + else + param=dnsmasq_restart + output_text='Restarting dnsmasq' + fi + fi + output 1 "$output_text " + output 2 "$output_text " + json set message "$output_text" + if eval "$param"; then + json set status "statusSuccess" + led_on "$led" + output_okn + else + output_fail + json set status "statusFail" + json add error "errorDNSReload" + output "${_ERROR_}: $(get_text 'errorDNSReload')!\\n" + return 1 + fi + ;; + on_stop) + case "$dns" in + dnsmasq.addnhosts|dnsmasq.servers) + param=dnsmasq_restart + ;; + dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset) + param=dnsmasq_restart + ;; + unbound.adb_list) + param=unbound_restart + ;; + esac + if [ -n "$(uci_changes dhcp)" ]; then + uci_commit dhcp + if [ "$param" = 'unbound_restart' ]; then + param='dnsmasq_restart; unbound_restart;' + else + param=dnsmasq_restart + fi + fi + eval "$param" + return $? + ;; + quiet) + case "$dns" in + dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers) + param=dnsmasq_restart + ;; + unbound.adb_list) + param=unbound_restart + ;; + esac + eval "$param" + return $? + ;; + esac +} + +json() { +# shellcheck disable=SC2034 + local action="$1" param="$2" value="$3" + shift 3 +# shellcheck disable=SC2124 + local extras="$@" line + local status message error stats + local reload restart curReload curRestart ret i + if [ -s "$jsonFile" ]; then + json_load_file "$jsonFile" 2>/dev/null + json_select 'data' 2>/dev/null + for i in status message error stats reload restart; do + json_get_var "$i" "$i" 2>/dev/null + done + fi + case "$action" in + get) + case "$param" in + triggers) + curReload="$parallel_downloads $debug $download_timeout \ + $allowed_domain $blocked_domain $allowed_url $blocked_url $dns \ + $config_update_enabled $config_update_url $dnsmasq_config_file_url \ + $curl_additional_param $curl_max_file_size $curl_retry" + curRestart="$compressed_cache $compressed_cache_dir $force_dns $led \ + $force_dns_port" + if [ ! -s "$jsonFile" ]; then + ret='on_boot' + elif [ "$curReload" != "$reload" ]; then + ret='download' + elif [ "$curRestart" != "$restart" ]; then + ret='restart' + fi + printf "%b" "$ret" + return;; + *) + printf "%b" "$(eval echo "\$$param")"; return;; + esac + ;; + add) + line="$(eval echo "\$$param")" + eval "$param"='${line:+$line }${value}${extras:+|$extras}' + ;; + del) + case "$param" in + all) + unset status message error stats;; + triggers) + unset reload restart;; + *) + unset "$param";; + esac + ;; + set) + case "$param" in + triggers) + reload="$parallel_downloads $debug $download_timeout \ + $allowed_domain $blocked_domain $allowed_url $blocked_url $dns \ + $config_update_enabled $config_update_url $dnsmasq_config_file_url \ + $curl_additional_param $curl_max_file_size $curl_retry" + restart="$compressed_cache $compressed_cache_dir $force_dns $led \ + $force_dns_port" + ;; + *) + eval "$param"='${value}${extras:+|$extras}';; + esac + ;; + esac + json_init + json_add_object 'data' + json_add_string version "$PKG_VERSION" + json_add_string status "$status" + json_add_string message "$message" + json_add_string error "$error" + json_add_string stats "$stats" + json_add_string reload "$reload" + json_add_string restart "$restart" + json_close_object + mkdir -p "$(dirname "$jsonFile")" + json_dump > "$jsonFile" + sync +} + +cache() { + local R_TMP + case "$1" in + create|backup) + [ -s "$outputFile" ] && { mv -f "$outputFile" "$outputCache"; } >/dev/null 2>/dev/null + return $? + ;; + restore|use) + [ -s "$outputCache" ] && mv "$outputCache" "$outputFile" >/dev/null 2>/dev/null + return $? + ;; + test) + [ -s "$outputCache" ] + return $? + ;; + test_gzip) + [ -s "$outputGzip" ] && gzip -t -c "$outputGzip" + return $? + ;; + create_gzip) + rm -f "$outputGzip" >/dev/null 2>/dev/null + R_TMP="$(mktemp -u -q -t ${packageName}_tmp.XXXXXXXX)" + if gzip < "$outputFile" > "$R_TMP"; then + if mv "$R_TMP" "$outputGzip"; then + rm -f "$R_TMP" + return 0 + else + rm -f "$R_TMP" + return 1 + fi + else + return 1 + fi + ;; + expand|unpack|unpack_gzip) + [ -s "$outputGzip" ] && gzip -dc < "$outputGzip" > "$outputCache" + return $? + ;; + esac +} + +_process_file_url() { + if [ "$2" != '0' ]; then + json add error "errorConfigValidationFail" + output "${_ERROR_}: $(get_text 'errorConfigValidationFail')!\\n" + output "Please check if the '$packageConfigFile' contains correct values for config options.\\n" + fi + if [ "$parallel_downloads" -gt 0 ]; then + process_file_url "$1" & + else + process_file_url "$1" + fi +} + +process_file_url() { + local cfg="$1" new_size + local label type D_TMP R_TMP filter + if [ -z "$cfg" ] || [ -n "${2}${3}" ]; then + url="$2" + action="$3" + fi + + [ "$enabled" = '1' ] || return 0 + [ -n "$url" ] || return 1 + + label="${url##*//}" + label="${label%%/*}" + label="File: $label" + case "$action" in + allow) type='Allowed'; D_TMP="$A_TMP" + ;; + block) type='Blocked'; D_TMP="$B_TMP" + ;; + file) type='File'; D_TMP="$B_TMP" + ;; + esac + if [ "${1:0:5}" = "https" ] && [ -z "$isSSLSupported" ]; then + output 1 "$_FAIL_" + output 2 "[DL] $type $label $__FAIL__\\n" + echo "errorNoSSLSupport|${1}" >> "$sharedMemoryError" + return 0 + fi + while [ -z "$R_TMP" ] || [ -e "$R_TMP" ]; do + R_TMP="$(mktemp -u -q -t ${packageName}_tmp.XXXXXXXX)" + done + if [ -z "$url" ] || ! $dl_command "$url" "$dl_flag" "$R_TMP" 2>/dev/null || \ + [ ! -s "$R_TMP" ]; then + output 1 "$_FAIL_" + output 2 "[DL] $type $label $__FAIL__\\n" + echo "errorDownloadingList|${url}" >> "$sharedMemoryError" + else + [ -n "$cfg" ] && new_size="$(get_local_filesize "$R_TMP")" + if [ -n "$new_size" ] && [ "$size" != "$new_size" ]; then + uci set "${packageName}.${cfg}.size=$size" + fi + format="$(detect_file_type "$R_TMP")" + case "$format" in + adBlockPlus) filter="$adBlockPlusFilter";; +# dnsmasqFile) filter="$dnsmasqFileFilter";; +# dnsmasq2File) filter="$dnsmasq2FileFilter";; + domains) filter="$domainsFilter";; + hosts) filter="$hostsFilter";; + esac + [ -n "$filter" ] && sed -i "$filter" "$R_TMP" + if [ ! -s "$R_TMP" ]; then + output 1 "$_FAIL_" + output 2 "[DL] $type $label ($format) $__FAIL__\\n" + echo "errorParsingList|${1}" >> "$sharedMemoryError" + else + cat "${R_TMP}" >> "$D_TMP" + output 1 "$_OK_" + output 2 "[DL] $type $label ($format) $__OK__\\n" + fi + fi + rm -f "$R_TMP" + return 0 +} + +download_dnsmasq_file() { + local hf allow_filter j=0 R_TMP + + json set message "$(get_text "statusDownloading")..." + json set status "statusDownloading" + + rm -f "$A_TMP" "$B_TMP" "$outputFile" "$outputCache" "$outputGzip" + if [ "$($awk '/^MemFree/ {print int($2/1000)}' "/proc/meminfo")" -lt 32 ]; then + output 3 'Low free memory, restarting resolver ' + if dns 'quiet'; then + output_okn + else + output_failn + fi + fi + touch $A_TMP; touch $B_TMP; + output 1 'Downloading dnsmasq file ' + rm -f "$sharedMemoryError" + process_file_url '' "$dnsmasq_config_file_url" 'file' + if [ -s "$sharedMemoryError" ]; then + while IFS= read -r line; do + json add error "$line" + done < "$sharedMemoryError" + rm -f "$sharedMemoryError" + fi + output 2 'Moving dnsmasq file ' + if mv "$B_TMP" "$outputFile"; then + output 2 "$__OK__\\n" + else + output 2 "$__FAIL__\\n" + json add error "errorMovingDataFile" + fi + output 1 '\n' +} + +download_lists() { + local hf allow_filter j=0 R_TMP + + json set message "$(get_text "statusDownloading")..." + json set status "statusDownloading" + + rm -f "$A_TMP" "$B_TMP" "$outputFile" "$outputCache" "$outputGzip" + if [ "$($awk '/^MemFree/ {print int($2/1000)}' "/proc/meminfo")" -lt 32 ]; then + output 3 'Low free memory, restarting resolver ' + if dns 'quiet'; then + output_okn + else + output_failn + fi + fi + touch $A_TMP; touch $B_TMP; + output 1 'Downloading lists ' + rm -f "$sharedMemoryError" + config_load "$packageName" + config_foreach load_validate_file_url_section 'file_url' _process_file_url + wait + if [ -n "$(uci changes "$packageName")" ]; then + output 2 "Saving updated file size(s) " + uci commit "$packageName" && output_okn || output_failn + fi + output 1 '\n' + + if [ -s "$sharedMemoryError" ]; then + while IFS= read -r line; do + json add error "$line" + done < "$sharedMemoryError" + rm -f "$sharedMemoryError" + fi + + if [ "$canary_domains_icloud" -ne 0 ]; then + canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsiCloud}" + fi + if [ "$canary_domains_mozilla" -ne 0 ]; then + canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsMozilla}" + fi + + for hf in $blocked_domain $canaryDomains; do echo "$hf" | sed "$domainsFilter" >> $B_TMP; done + allowed_domain="${allowed_domain} +$(cat $A_TMP)" + for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; allow_filter="$allow_filter/(^|\.)${hf}$/d;"; done + + [ ! -s "$B_TMP" ] && return 1 + + output 1 'Processing downloads ' + output 2 'Sorting combined list ' + json set status "statusProcessing" + json set message "$(get_text "statusProcessing"): sorting combined list" + if [ "$allow_non_ascii" -gt 0 ]; then + if sort -u "$B_TMP" > "$A_TMP"; then + output_ok + else + output_failn + json add error "errorSorting" + fi + else + if sort -u "$B_TMP" | grep -E -v '[^a-zA-Z0-9=/.-]' > "$A_TMP"; then + output_ok + else + output_failn + json add error "errorSorting" + fi + fi + + if [ "$dns" = 'dnsmasq.conf' ] || \ + [ "$dns" = 'dnsmasq.ipset' ] || \ + [ "$dns" = 'dnsmasq.nftset' ] || \ + [ "$dns" = 'dnsmasq.servers' ] || \ + [ "$dns" = 'unbound.adb_list' ]; then + # TLD optimization written by Dirk Brenken (dev@brenken.org) + output 2 'Optimizing combined list ' + json set message "$(get_text "statusProcessing"): optimizing combined list" +# sed -E 'G;:t;s/(.*)(\.)(.*)(\n)(.*)/\1\4\5\2\3/;tt;s/(.*)\n(\.)(.*)/\3\2\1/' is actually slower than command below + if $awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "$A_TMP" > "$B_TMP"; then + if sort "$B_TMP" > "$A_TMP"; then + if $awk '{if(NR=1){tld=$NF};while(getline){if($NF!~tld"\\."){print tld;tld=$NF}}print tld}' "$A_TMP" > "$B_TMP"; then + if $awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "$B_TMP" > "$A_TMP"; then + if sort -u "$A_TMP" > "$B_TMP"; then + output_ok + else + output_failn + json add error "errorOptimization" + mv "$A_TMP" "$B_TMP" + fi + else + output_failn + json add error "errorOptimization" + fi + else + output_failn + json add error "errorOptimization" + mv "$A_TMP" "$B_TMP" + fi + else + output_failn + json add error "errorOptimization" + fi + else + output_failn + json add error "errorOptimization" + mv "$A_TMP" "$B_TMP" + fi + else + mv "$A_TMP" "$B_TMP" + fi + + output 2 'Allowing domains ' + json set message "$(get_text "statusProcessing"): allowing domains" + if sed -i -E "$allow_filter" "$B_TMP"; then + output_ok + else + output_failn + json add error "errorAllowListProcessing" + fi + + output 2 'Formatting merged file ' + json set message "$(get_text "statusProcessing"): formatting merged file" + if [ -z "$outputFilterIPv6" ]; then + if sed "$outputFilter" "$B_TMP" > "$A_TMP"; then + output_ok + else + output_failn + json add error "errorDataFileFormatting" + fi + else + case "$dns" in + dnsmasq.addnhosts) + if sed "$outputFilter" "$B_TMP" > "$A_TMP" && \ + sed "$outputFilterIPv6" "$B_TMP" >> "$A_TMP"; then + output_ok + else + output_failn + json add error "errorDataFileFormatting" + fi + ;; + esac + fi + + case "$dns" in + dnsmasq.addnhosts) + output 2 'Creating dnsmasq addnhosts file ' + json set message "$(get_text "statusProcessing"): creating dnsmasq addnhosts file" + ;; + dnsmasq.conf) + output 2 'Creating dnsmasq config file ' + json set message "$(get_text "statusProcessing"): creating dnsmasq config file" + ;; + dnsmasq.ipset) + output 2 'Creating dnsmasq ipset file ' + json set message "$(get_text "statusProcessing"): creating dnsmasq ipset file" + ;; + dnsmasq.nftset) + output 2 'Creating dnsmasq nft set file ' + json set message "$(get_text "statusProcessing"): creating dnsmasq nft set file" + ;; + dnsmasq.servers) + output 2 'Creating dnsmasq servers file ' + json set message "$(get_text "statusProcessing"): creating dnsmasq servers file" + ;; + unbound.adb_list) + output 2 'Creating Unbound adb_list file ' + json set message "$(get_text "statusProcessing"): creating Unbound adb_list file" + ;; + esac + + if mv "$A_TMP" "$outputFile"; then + output_ok + else + output_failn + json add error "errorMovingDataFile" + fi + if [ "$compressed_cache" -gt 0 ]; then + output 2 'Creating compressed cache ' + json set message "$(get_text "statusProcessing"): creating compressed cache" + if cache 'create_gzip'; then + output_ok + else + output_failn + json add error "errorCreatingCompressedCache" + fi + else + rm -f "$outputGzip" + fi + output 2 'Removing temporary files ' + json set message "$(get_text "statusProcessing"): removing temporary files" + rm -f "/tmp/${packageName}_tmp.*" "$A_TMP" "$B_TMP" "$outputCache" || j=1 + if [ $j -eq 0 ]; then + output_ok + else + output_failn + json add error "errorRemovingTempFiles" + fi + output 1 '\n' +} + +adb_allow() { + local c hf string="$1" + local validation_result="$3" + load_environment "$validation_result" 'quiet' || return 1 + if [ ! -s "$outputFile" ]; then + output "No block-list ('$outputFile') found.\\n" + return 0 + elif [ -z "$string" ]; then + output "Usage: /etc/init.d/${packageName} allow 'domain' ...\\n" + return 0 + elif [ -n "$dnsmasq_config_file_url" ]; then + output "Allowing individual domains is not possible when using external dnsmasq config file.\\n" + return 0 + fi + case "$dns" 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 " + hf="$(echo "$c" | sed 's/\./\\./g')" + if sed -i "/(^|\.)${hf}$/d;" "$outputFile" && \ + uci_add_list_if_new "${packageName}" 'config' 'allowed_domain' "$c"; then + output_ok + else + output_fail + fi + done + if [ "$compressed_cache" -gt 0 ]; then + output 2 'Creating compressed cache ' + if cache 'create_gzip'; then + output_ok + else + output_failn + fi + fi + output 2 "Committing changes to config " + if [ -n "$(uci_changes "$packageName")" ] && uci_commit "$packageName"; then + allowed_domain="$(uci_get "$packageName" 'config' 'allowed_domain')" + json set triggers + json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})" + output_ok; + if [ "$dns" = 'dnsmasq.ipset' ]; then + output 2 "Flushing adb ipset " + if ipset -q -! flush adb; then output_ok; else output_fail; fi + fi + if [ "$dns" = 'dnsmasq.nftset' ]; then + output 2 "Flushing adb nft sets " + nft flush set inet fw4 adb6 + if nft flush set inet fw4 adb4; 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_if_new "$packageName" 'config' 'allowed_domain' "$string"; then + output_ok + else + output_fail + fi + done + if [ "$compressed_cache" -gt 0 ]; then + output 2 'Creating compressed cache ' + if cache 'create_gzip'; then + output_ok + else + output_failn + fi + fi + output 2 "Committing changes to config " + if [ -n "$(uci_changes "$packageName")" ] && uci_commit "$packageName"; then + allowed_domain="$(uci_get "$packageName" 'config' 'allowed_domain')" + json set triggers + json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})" + output_ok; + output 2 "Restarting Unbound " + if unbound_restart; then output_okn; else output_failn; fi + else + output_fail; + fi + ;; + esac +} + +adb_check() { + local c param="$1" + local validation_result="$3" + load_environment "$validation_result" 'quiet' || return 1 + if [ ! -s "$outputFile" ]; then + output "No block-list ('$outputFile') found.\\n" + return 0 + elif [ -z "$param" ]; then + output "Usage: /etc/init.d/${packageName} check 'domain' ...\\n" + return 0 + fi + for string in ${param}; do + c="$(grep -c "$string" "$outputFile")" + if [ "$c" -gt 0 ]; then + if [ "$c" -eq 1 ]; then + output "Found 1 match for '$string' in '$outputFile'.\\n" + else + output "Found $c matches for '$string' in '$outputFile'.\\n" + fi + if [ "$c" -le 20 ]; then + case "$dns" 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|/4#inet#adb#adb4||;';; + dnsmasq.servers) + grep "$string" "$outputFile" | sed 's|server=/||;s|/$||;';; + unbound.adb_list) + grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';; + esac + fi + else + output "The '$string' is not found in current block-list ('$outputFile').\\n" + fi + done +} + +adb_config_update() { + local R_TMP label + local param validation_result="$3" + case "$1" in + on_boot) param="$1";; + *) param='quiet';; + esac + load_environment "$validation_result" "$param" || return 1 + label="${config_update_url##*//}" + label="${label%%/*}"; + [ "$config_update_enabled" -ne 0 ] || return 0 + + if [ "$param" != 'download' ]; then + cache 'test' && return 0 + cache 'test_gzip' && return 0 + fi + output 1 'Updating config ' + while [ -z "$R_TMP" ] || [ -e "$R_TMP" ]; do + R_TMP="$(mktemp -u -q -t ${packageName}_tmp.XXXXXXXX)" + done + if ! $dl_command "$config_update_url" "$dl_flag" "$R_TMP" 2>/dev/null || [ ! -s "$R_TMP" ]; then + output 1 "$_FAIL_\\n" + output 2 "[DL] Config Update: $label $__FAIL__\\n" + json add error "errorDownloadingConfigUpdate" + else + if [ -s "$R_TMP" ] && sed -f "$R_TMP" -i "$packageConfigFile" 2>/dev/null; then + output 1 "$_OK_\\n" + output 2 "[DL] Config Update: $label $__OK__\\n" + else + output 1 "$_FAIL_\\n" + output 2 "[DL] Config Update: $label $__FAIL__\\n" + json add error "errorParsingConfigUpdate" + fi + fi + rm -f "$R_TMP" + return 0 +} + +_config_add_url_size() { + local cfg="$1" url size + config_get url "$cfg" url + size="$(get_url_filesize "$url")" + output "$url${size:+: $size} " + if [ -n "$size" ]; then + uci set "${packageName}.${cfg}.size=$size" + output_okn + else + output_failn + fi +} + +adb_sizes() { + local i + local validation_result="$3" + load_environment "$validation_result" 'quiet' || return 1 + config_load "$packageName" + config_foreach _config_add_url_size 'file_url' + uci commit "$packageName" +} + +# shellcheck disable=SC2120 +adb_start() { + local action status error message stats c + local param="$1" validation_result="$3" + + load_environment "$validation_result" "$param" || return 1 + + status="$(json get status)" + error="$(json get error)" + message="$(json get message)" + stats="$(json get stats)" + action="$(json get triggers)" + + if [ "$action" = 'on_boot' ] || [ "$param" = 'on_boot' ]; then + if cache 'test_gzip' || cache 'test'; then + action='restore' + else + action='download' + fi + elif [ "$action" = 'download' ] || [ "$param" = 'download' ] || [ -n "$error" ]; then + action='download' + elif [ ! -s "$outputFile" ]; then + if cache 'test_gzip' || cache 'test'; then + action='restore' + else + action='download' + fi + elif [ "$action" = 'restart' ] || [ "$param" = 'restart' ]; then + action='restart' + elif [ -s "$outputFile" ] && [ "$status" = "statusSuccess" ] && [ -z "$error" ]; then + status_service + return 0 + else + action='download' + fi + + json del all + json set triggers + + if [ "$action" = 'restore' ]; then + output 0 "Starting $serviceName... " + output 3 "Starting $serviceName...\\n" + json set status "statusStarting" + if cache 'test_gzip' && ! cache 'test' && [ ! -s "$outputFile" ]; then + output 3 'Found compressed cache file, unpacking it ' + json set message 'found compressed cache file, unpacking it.' + if cache 'unpack_gzip'; then + output_okn + else + output_failn + json add error "errorRestoreCompressedCache" + output "${_ERROR_}: $(get_text 'errorRestoreCompressedCache')!\\n" + action='download' + fi + fi + if cache 'test' && [ ! -s "$outputFile" ]; then + output 3 'Found cache file, reusing it ' + json set message 'found cache file, reusing it.' + if cache 'restore'; then + output_okn + dns 'on_start' + else + output_failn + json add error "errorRestoreCache" + output "${_ERROR_}: $(get_text 'errorRestoreCache')!\\n" + action='download' + fi + fi + fi + if [ "$action" = 'download' ]; then + if [ -s "$outputFile" ] || cache 'test' || cache 'test_gzip'; then + output 0 "Force-reloading $serviceName... " + output 3 "Force-reloading $serviceName...\\n" + json set status "statusForceReloading" + else + output 0 "Starting $serviceName... " + output 3 "Starting $serviceName...\\n" + json set status "statusStarting" + fi + if [ "$dns" = 'dnsmasq.conf' ] && [ -n "$dnsmasq_config_file_url" ]; then + download_dnsmasq_file + else + download_lists + fi + dns 'on_start' + fi + if [ "$action" = 'restart' ]; then + output 0 "Restarting $serviceName... " + output 3 "Restarting $serviceName...\\n" + json set status "statusRestarting" + dns 'on_start' + fi + if [ "$action" = 'start' ]; then + output 0 "Starting $serviceName... " + output 3 "Starting $serviceName...\\n" + json set status "statusStarting" + dns 'on_start' + fi + if [ -s "$outputFile" ] && [ "$(json get status)" != "statusFail" ]; then + output 0 "$__OK__\\n"; + json del message + json set status "statusSuccess" + json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})" + status_service + else + output 0 "$__FAIL__\\n"; + json set status "statusFail" + json add error "errorOhSnap" + status_service + fi + + procd_open_instance 'main' + procd_set_param command /bin/true + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_open_data + json_add_string 'status' "$(json get status)" + json_add_string 'errors' "$(json get error)" + json_add_string 'warnings' "$(json get warning)" + if [ -s "$outputFile" ]; then + json_add_int 'entries' "$(wc -l < "$outputFile")" + else + json_add_int 'entries' '0' + fi + json_add_array firewall + if [ "$force_dns" -ne 0 ]; then + for c in ${force_dns_port/,/ }; do + if netstat -tuln | grep LISTEN | grep ":${c}" >/dev/null 2>&1; then + json_add_object "" + json_add_string type redirect + json_add_string target DNAT + json_add_string src lan + json_add_string proto "tcp udp" + json_add_string src_dport "$c" + json_add_string dest_port "$c" + json_add_string family any + json_add_boolean reflection 0 + json_close_object + else + json_add_object "" + json_add_string type rule + json_add_string src lan + json_add_string dest "*" + json_add_string proto "tcp udp" + json_add_string dest_port "$c" + json_add_string target REJECT + json_close_object + fi + done + fi + case "$dns" in + dnsmasq.ipset) + json_add_object "" + json_add_string type ipset + json_add_string name adb + json_add_string match dest_net + json_add_string storage hash + json_close_object + json_add_object "" + json_add_string type rule + json_add_string ipset adb + json_add_string src lan + json_add_string dest "*" + json_add_string proto "tcp udp" + json_add_string target REJECT + json_close_object + ;; + dnsmasq.nftset) + json_add_object "" + json_add_string type ipset + json_add_string name adb4 + json_add_string family 4 + json_add_string match dest_net + json_close_object + json_add_object "" + json_add_string type rule + json_add_string ipset adb4 + json_add_string src lan + json_add_string dest "*" + json_add_string proto "tcp udp" + json_add_string target REJECT + json_close_object + if [ "$ipv6_enabled" -ne 0 ]; then + json_add_object "" + json_add_string type ipset + json_add_string name adb6 + json_add_string family 6 + json_add_string match dest_net + json_close_object + json_add_object "" + json_add_string type rule + json_add_string ipset adb6 + json_add_string src lan + json_add_string dest "*" + json_add_string proto "tcp udp" + json_add_string target REJECT + json_close_object + fi + ;; + esac + json_close_array + procd_close_data + procd_close_instance +} + +adb_status() { + local c url status message error stats + local validation_result="$3" + load_environment "$validation_result" 'quiet' || return 1 + status="$(json get status)" + message="$(json get message)" + error="$(json get error)" + stats="$(json get stats)" + if [ "$status" = "statusSuccess" ]; then + output "$stats "; output_okn; + else + [ -n "$status" ] && status="$(get_text "$status")" + if [ -n "$status" ] && [ -n "$message" ]; then + status="${status}: $message" + fi + [ -n "$status" ] && output "$serviceName $status\\n" + fi + if [ -n "$error" ]; then + for c in $error; do + url="${c##*|}" + c="${c%|*}" + case "$c" in + errorDownloadingList|errorParsingList) + output "${_ERROR_}: $(get_text "$c") $url!\\n";; + *) + output "${_ERROR_}: $(get_text "$c")!\\n";; + esac + n=$((n+1)) + done + fi +} + +# shellcheck disable=SC2120 +adb_stop() { + local validation_result="$3" + load_environment "$validation_result" 'quiet' || return 1 + if [ -s "$outputFile" ]; then + output "Stopping $serviceName... " + cache 'create' + if dns 'on_stop'; then + ipset -q -! flush adb + ipset -q -! destroy adb + nft delete set inet fw4 adb4 + nft delete set inet fw4 adb6 + led_off "$led" + output 0 "$__OK__\\n"; output_okn; + json set status "statusStopped" + json del message + else + output 0 "$__FAIL__\\n"; output_fail; + json set status "statusFail" + json add error "errorStopping" + output "${_ERROR_}: $(get_text 'errorStopping')!\\n" + fi + fi +} + +adb_pause() { + local timeout="${1:-$pause_timeout}" + local validation_result="$3" + adb_stop 'on_pause' '' "$validation_result" + output "Sleeping for $timeout seconds... " + if sleep "$timeout"; then + output_okn + else + output_failn + fi + adb_start 'on_pause' '' "$validation_result" +} + +allow() { load_validate_config 'config' adb_allow "'$*'"; } +boot() { + ubus -t 30 wait_for network.interface 2>/dev/null + rc_procd start_service 'on_boot' +} +check() { load_validate_config 'config' adb_check "'$*'"; } +dl() { rc_procd start_service 'download'; } +killcache() { + local compressed_cache_dir + config_load "$packageName" + config_get compressed_cache_dir 'config' 'compressed_cache_dir' '/etc' + if [ "$(sanitize_dir "$compressed_cache_dir")" = '/' ]; then + compressed_cache_dir='' + elif [ -n "$(sanitize_dir "$compressed_cache_dir")" ]; then + compressed_cache_dir="$(sanitize_dir "$compressed_cache_dir")" + else + compressed_cache_dir="/etc" + fi + rm -f "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}" + rm -f "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}" + rm -f "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}" + rm -f "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}" + rm -f "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}" + rm -f "$unboundCache" "$unboundGzip" + config_load 'dhcp' + config_foreach resolver 'dnsmasq' 'cleanup' + uci_commit 'dhcp' + return 0 +} +reload_service() { rc_procd start_service 'restart'; } +restart_service() { rc_procd start_service 'restart'; } +service_started() { procd_set_config_changed firewall; } +service_stopped() { procd_set_config_changed firewall; } +service_triggers() { + local wan wan6 i + local procd_trigger_wan6 + config_load "$packageName" + config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0' + . /lib/functions/network.sh + network_flush_cache + network_find_wan wan + wan="${wan:-wan}" + if [ "$procd_trigger_wan6" -ne 0 ]; then + network_find_wan6 wan6 + wan6="${wan6:-wan6}" + fi + for i in "$wan" "$wan6"; do + [ -n "$i" ] && procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" start + done + procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload +} +sizes() { load_validate_config 'config' adb_sizes "''"; } +start_service() { + load_validate_config 'config' adb_config_update "'$*'" + load_validate_config 'config' adb_start "'$*'" +} +status_service() { load_validate_config 'config' adb_status "''"; } +stop_service() { load_validate_config 'config' adb_stop "'$*'"; } +pause() { load_validate_config 'config' adb_pause "'$*'"; } +version() { echo "$PKG_VERSION"; } + +load_validate_file_url_section() { + uci_load_validate "$packageName" "$packageName" "$1" "$2" \ + 'enabled:bool:1' \ + 'action:or("allow", "block"):block' \ + 'size:or(uinteger, "")' \ + 'url:string' +} + +load_validate_config() { + . /lib/functions/network.sh + . /usr/share/libubox/jshn.sh + local enabled + local force_dns + local force_dns_port + local parallel_downloads + local debug + local compressed_cache + local compressed_cache_dir + local ipv6_enabled + local allow_non_ascii + local canary_domains_icloud + local canary_domains_mozilla + local config_update_enabled + local config_update_url + local download_timeout + local pause_timeout + local curl_additional_param + local curl_max_file_size + local curl_retry + local verbosity + local procd_trigger_wan6 + local procd_boot_wan_timeout + local led + local dns + local dnsmasq_instance + local allowed_domain + local blocked_domain + local dnsmasq_config_file_url + uci_load_validate "$packageName" "$packageName" "$1" "${2}${3:+ $3}" \ + 'enabled:bool:0' \ + 'force_dns:bool:1' \ + 'force_dns_port:list(integer):53,853' \ + 'parallel_downloads:bool:1' \ + 'debug:bool:0' \ + 'compressed_cache:bool:0' \ + 'compressed_cache_dir:directory:/etc' \ + 'ipv6_enabled:bool:0' \ + 'allow_non_ascii:bool:0' \ + 'canary_domains_icloud:bool:0' \ + 'canary_domains_mozilla:bool:0' \ + 'config_update_enabled:bool:0' \ + 'config_update_url:string:https://cdn.jsdelivr.net/gh/openwrt/packages/net/adblock-fast/files/adblock-fast.conf.update' \ + 'download_timeout:range(1,60):20' \ + 'pause_timeout:range(10,120):60' \ + 'curl_additional_param:or("", string)' \ + 'curl_max_file_size:or("", uinteger)' \ + 'curl_retry:range(0,30):3' \ + 'verbosity:range(0,2):2' \ + 'procd_trigger_wan6:bool:0' \ + 'procd_boot_wan_timeout:integer:60' \ + 'led:or("", "none", file, device, string)' \ + 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.nftset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ + 'dnsmasq_instance:list(or(integer, string)):*' \ + 'allowed_domain:list(string)' \ + 'blocked_domain:list(string)' \ + 'dnsmasq_config_file_url:string' +} diff --git a/net/adblock-fast/files/etc/uci-defaults/90-adblock-fast b/net/adblock-fast/files/etc/uci-defaults/90-adblock-fast new file mode 100644 index 000000000..5366b46e6 --- /dev/null +++ b/net/adblock-fast/files/etc/uci-defaults/90-adblock-fast @@ -0,0 +1,165 @@ +#!/bin/sh +# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca) +# shellcheck disable=SC1091,SC2015,SC3037,SC3043,SC2317,SC3060 + +readonly packageName='adblock-fast' +readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m' +readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m' +readonly __OK__='\033[0;32m[\xe2\x9c\x93]\033[0m' +readonly __FAIL__='\033[0;31m[\xe2\x9c\x97]\033[0m' +readonly _ERROR_='\033[0;31mERROR\033[0m' +readonly _WARNING_='\033[0;33mWARNING\033[0m' +output() { +# Can take a single parameter (text) to be output at any verbosity +# Or target verbosity level and text to be output at specifc verbosity + local msg memmsg logmsg + local sharedMemoryOutput="/dev/shm/$packageName-output" + verbosity="${verbosity:-2}" + if [ "$#" -ne 1 ]; then + if [ $((verbosity & $1)) -gt 0 ] || [ "$verbosity" = "$1" ]; then + shift + else + return 0 + fi + fi + [ -t 1 ] && printf "%b" "$1" + msg="$1"; + if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then + [ -s "$sharedMemoryOutput" ] && memmsg="$(cat "$sharedMemoryOutput")" + logmsg="$(printf "%b" "${memmsg}${msg}" | sed 's/\x1b\[[0-9;]*m//g')" + logger -t "${packageName:-service}" "$(printf "%b" "$logmsg")" + rm -f "$sharedMemoryOutput" + else + printf "%b" "$msg" >> "$sharedMemoryOutput" + fi +} +output_ok() { output 1 "$_OK_"; output 2 "$__OK__\\n"; } +output_okn() { output 1 "$_OK_\\n"; output 2 "$__OK__\\n"; } +output_fail() { output 1 "$_FAIL_"; output 2 "$__FAIL__\\n"; } +output_failn() { output 1 "$_FAIL_\\n"; output 2 "$__FAIL__\\n"; } +is_present() { command -v "$1" >/dev/null 2>&1; } +get_url_filesize() { + local url="$1" size size_command + [ -n "$1" ] || return 0 + is_present 'curl' || return 0 + size_command='curl --silent --insecure --fail --head --request GET' + size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')" + echo -en "$size" +} + +# Transition from simple-adblock +_enable_url() { + local cfg="$1" url="$2" action="$3" + local u a + config_get u "$cfg" 'url' + config_get a "$cfg" 'action' 'block' + if [ "$u" = "$url" ] && [ "$a" = "$action" ]; then + uci del "${packageName}.${cfg}.enabled" && _found=1 + fi +} + +enable_add_url() { + local url="$1" action="$2" _found + config_load "$packageName" + config_foreach _enable_url 'file_url' "$url" "$action" + if [ -z "$_found" ]; then + uci add "${packageName}" 'file_url' >/dev/null 2>&1 + uci set "${packageName}.@file_url[-1].url=$url" + uci set "${packageName}.@file_url[-1].size=$(get_url_filesize "$url")" + uci set "${packageName}.@file_url[-1].action=$action" + fi +} + +if [ -s '/etc/config/simple-adblock' ] \ + && [ ! -s '/etc/config/adblock-fast-opkg' ] \ + && [ "$(uci get adblock-fast.config.enabled)" = '0' ]; then + cp -f '/etc/config/adblock-fast' '/etc/config/adblock-fast-opkg' + enabled="$(uci get simple-adblock.config.enabled)" + if [ -x '/etc/init.d/simple-adblock' ]; then + output "Stopping and disabling simple-adblock " + if /etc/init.d/simple-adblock stop >/dev/null 2>&1 \ + && /etc/init.d/simple-adblock disable \ + && uci set simple-adblock.config.enabled=0 \ + && uci commit simple-adblock; then + output_okn + else + output_failn + fi + else + output "Disabling simple-adblock." + if uci set simple-adblock.config.enabled=0 \ + && uci commit simple-adblock; then + output_okn + else + output_failn + fi + fi + output "Migrating simple-adblock config file " + for i in allow_non_ascii canary_domains_icloud canary_domains_mozilla \ + compressed_cache compressed_cache_dir config_update_enabled \ + curl_additional_param curl_max_file_size curl_retry download_timeout \ + debug dns dns_instance dnsmasq_config_file_url force_dns led \ + parallel_downloads procd_trigger_wan6 procd_boot_wan_timeout verbosity; do + j="$(uci -q get simple-adblock.config.${i})" + [ -n "$j" ] && uci set "${packageName}.config.${i}=${j}" + done + [ -n "$enabled" ] && uci set "${packageName}.config.enabled=${enabled}" + j="$(uci -q get simple-adblock.config.config_update_url)" + if [ "${j//simple-adblock/}" = "$j" ]; then + uci set "${packageName}.config.config_update_url=$j" + fi + ccd="$(uci get simple-adblock.config.compressed_cache_dir)" + ccd="${ccd:-/etc}" + for j in $(uci -q get simple-adblock.config.allowed_domain); do + [ -n "$j" ] && uci add_list "${packageName}.config.allowed_domain=${j}" + done + for j in $(uci -q get simple-adblock.config.blocked_domain); do + [ -n "$j" ] && uci add_list "${packageName}.config.blocked_domain=${j}" + done + for j in $(uci -q get simple-adblock.config.force_dns_port); do + [ -n "$j" ] && uci add_list "${packageName}.config.force_dns_port=${j}" + done + output_okn + + for i in allowed_domains_url blocked_adblockplus_url blocked_domains_url \ + blocked_hosts_url; do + output "Migrating simple-adblock ${i} " + for j in $(uci -q get simple-adblock.config.${i}); do + if [ "$i" = 'allowed_domains_url' ]; then + enable_add_url "$j" 'allow' + else + enable_add_url "$j" 'block' + fi + done + output_okn + done + uci commit "$packageName" + output "Migrating simple-adblock cache file(s) " + for i in '/var/run/simple-adblock/dnsmasq.addnhosts.cache' \ + '/var/run/simple-adblock/dnsmasq.conf.cache' \ + '/var/run/simple-adblock/dnsmasq.ipset.cache' \ + '/var/run/simple-adblock/dnsmasq.nftset.cache' \ + '/var/run/simple-adblock/dnsmasq.servers.cache' \ + '/var/run/simple-adblock/unbound.cache'; do + if [ -s "$i" ]; then + current_dir="$(dirname "$i")" + mkdir -p "${current_dir//simple-adblock/adblock-fast}" + mv -f "$i" "${i//simple-adblock/adblock-fast}" && output_okn || output_failn + fi + done + for i in 'simple-adblock.dnsmasq.addnhosts.gz' \ + 'simple-adblock.dnsmasq.conf.gz' \ + 'simple-adblock.dnsmasq.ipset.gz' \ + 'simple-adblock.dnsmasq.nftset.gz' \ + 'simple-adblock.dnsmasq.servers.gz' \ + 'simple-adblock.unbound.gz'; do + i="${ccd}/${i}" + if [ -s "$i" ]; then + mkdir -p "${ccd//simple-adblock/adblock-fast}" + mv -f "$i" "${i//simple-adblock/adblock-fast}" && output_okn || output_failn + fi + done + output_okn +fi + +exit 0 |