extra_command 'show_blocklist' 'List currently blocked domains'
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
- check_lists Checks if specified domain is found in enabled block-lists
- dl Force-downloads all enabled block-list
- pause Pauses AdBlocking for specified number of seconds (default: 60)
- show_blocklist List currently blocked domains
- sizes Displays the file-sizes of enabled block-lists
- version Show version information'
fi
readonly packageName='adblock-fast'
readonly PKG_VERSION='dev-test'
-readonly packageCompat='2'
+readonly packageCompat='4'
readonly serviceName="$packageName $PKG_VERSION"
readonly packageConfigFile="/etc/config/${packageName}"
readonly dnsmasqAddnhostsFile="/var/run/${packageName}/dnsmasq.addnhosts"
readonly dnsmasqAddnhostsFilter='s|^|127.0.0.1 |;s|$||'
readonly dnsmasqAddnhostsFilterIPv6='s|^|:: |;s|$||'
readonly dnsmasqAddnhostsOutputFilter='s|^127.0.0.1 ||;s|^:: ||;'
-readonly dnsmasqConfFile="/tmp/dnsmasq.d/${packageName}"
+readonly dnsmasqConfFile="${packageName}"
readonly dnsmasqConfCache="/var/run/${packageName}/dnsmasq.conf.cache"
readonly dnsmasqConfGzip="${packageName}.dnsmasq.conf.gz"
readonly dnsmasqConfFilter='s|^|local=/|;s|$|/|'
readonly dnsmasqConfOutputFilter='s|local=/||;s|/$||;'
-readonly dnsmasqIpsetFile="/tmp/dnsmasq.d/${packageName}.ipset"
+readonly dnsmasqIpsetFile="${packageName}.ipset"
readonly dnsmasqIpsetCache="/var/run/${packageName}/dnsmasq.ipset.cache"
readonly dnsmasqIpsetGzip="${packageName}.dnsmasq.ipset.gz"
readonly dnsmasqIpsetFilter='s|^|ipset=/|;s|$|/adb|'
readonly dnsmasqIpsetOutputFilter='s|ipset=/||;s|/adb$||;'
-readonly dnsmasqNftsetFile="/tmp/dnsmasq.d/${packageName}.nftset"
+readonly dnsmasqNftsetFile="${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 dnsmasqServersCache="/var/run/${packageName}/dnsmasq.servers.cache"
readonly dnsmasqServersGzip="${packageName}.dnsmasq.servers.gz"
readonly dnsmasqServersFilter='s|^|server=/|;s|$|/|'
+readonly dnsmasqServersAllowFilter='s|(.*)|server=/\1/#|'
+readonly dnsmasqServersBlockedCountFilter='\|/#|d'
readonly dnsmasqServersOutputFilter='s|server=/||;s|/$||;'
readonly smartdnsDomainSetFile="/var/run/${packageName}/smartdns.domainset"
readonly smartdnsDomainSetCache="/var/run/${packageName}/smartdns.domainset.cache"
dl_command=
dl_flag=
isSSLSupported=
+outputAllowFilter=
+outputBlockedCountFilter=
outputFilter=
outputFilterIPv6=
outputFile=
+outputDnsmasqFileList=
outputGzip=
outputCache=
outputOutputFilter=
;;
esac
}
+count_blocked_domains() {
+ if [ -n "$outputBlockedCountFilter" ]; then
+ sed "$outputBlockedCountFilter" "$outputFile" | wc -l
+ else
+ wc -l < "$outputFile"
+ fi
+}
debug() { local __i __j; for __i in "$@"; do eval "__j=\$$__i"; echo "${__i}: ${__j} "; done; }
dns_set_output_values() {
case "$1" in
outputCache="$dnsmasqServersCache"
outputGzip="${compressed_cache_dir}/${dnsmasqServersGzip}"
outputOutputFilter="$dnsmasqServersOutputFilter"
+ outputAllowFilter="$dnsmasqServersAllowFilter"
+ outputBlockedCountFilter="$dnsmasqServersBlockedCountFilter"
;;
smartdns.domainset)
outputFilter="$smartdnsDomainSetFilter"
outputOutputFilter="$unboundOutputFilter"
;;
esac
+ resolver 'on_load'
}
dnsmasq_hup() { killall -q -s HUP dnsmasq; }
dnsmasq_kill() { killall -q -s KILL dnsmasq; }
return 1
fi
}
-is_integer() {
- case "$1" in
- (*[!0123456789]*) return 1;;
- ('') return 1;;
- (*) return 0;;
- esac
-}
+is_integer() { case "$1" in ''|*[!0-9]*) return 1;; esac; }
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"; }
# shellcheck disable=SC3057
led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; }
logger() { /usr/bin/logger -t "$packageName" "$@"; }
nft() { "$nft" "$@" >/dev/null 2>&1; }
-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"; }
+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"; }
print_json_bool() { json_init; json_add_boolean "$1" "$2"; json_dump; json_cleanup; }
print_json_int() { json_init; json_add_int "$1" "$2"; json_dump; json_cleanup; }
print_json_string() { json_init; json_add_string "$1" "$2"; json_dump; json_cleanup; }
smartdns_restart() { /etc/init.d/smartdns restart >/dev/null 2>&1; }
str_contains() { test "$1" != "$(str_replace "$1" "$2" '')"; }
str_contains_word() { echo "$1" | grep -q -w "$2"; }
+str_first_word() { echo "${1%% *}"; }
# shellcheck disable=SC2018,SC2019
str_to_lower() { echo "$1" | tr 'A-Z' 'a-z'; }
# shellcheck disable=SC2018,SC2019
str_to_upper() { echo "$1" | tr 'a-z' 'A-Z'; }
-str_replace() { printf "%b" "$1" | sed -e "s/$(printf "%b" "$2")/$(printf "%b" "$3")/g"; }
+# shellcheck disable=SC3060
+str_replace() { echo "${1//$2/$3}"; }
ubus_get_data() { ubus call service list "{ 'name': '$packageName' }" | jsonfilter -e "@['${packageName}'].instances.main.data.${1}"; }
ubus_get_ports() { ubus call service list "{ 'name': '$packageName' }" | jsonfilter -e "@['${packageName}'].instances.main.data.firewall.*.dest_port"; }
uci_get_protocol() { uci_get 'network' "$1" 'proto'; }
echo -en "$size"
}
-output() {
-# Target verbosity level with the first parameter being an integer
- is_integer() {
- case "$1" in
- (*[!0123456789]*) return 1;;
- ('') return 1;;
- (*) return 0;;
- esac
- }
- local msg memmsg logmsg text
- local sharedMemoryOutput="/dev/shm/$packageName-output"
- if [ -z "$verbosity" ] && [ -n "$packageName" ]; then
- verbosity="$(uci_get "$packageName" 'config' 'verbosity' '2')"
- fi
- if [ $# -ne 1 ] && is_integer "$1"; then
- if [ $((verbosity & $1)) -gt 0 ] || [ "$verbosity" = "$1" ]; then shift; text="$*"; else return 0; fi
- fi
- text="${text:-$*}";
- [ -t 1 ] && printf "%b" "$text"
# shellcheck disable=SC3060
- msg="${text//$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
+output() {
+ [ -z "$verbosity" ] && verbosity="$(uci_get "$packageName" 'config' 'verbosity' '1')"
+ [ "$#" -ne '1' ] && {
+ case "$1" in [0-9]) [ $((verbosity & $1)) -gt 0 ] && shift || return 0;; esac }
+ local msg="$*" queue="/dev/shm/$packageName-output"
+ [ -t 1 ] && printf "%b" "$msg"
+ [ "$msg" != "${msg//\\n}" ] && {
+ [ -s "$queue" ] && msg="$(cat "$queue")${msg}" && rm -f "$queue"
+ msg="$(printf "%b" "$msg" | sed 's/\x1b\[[0-9;]*m//g')"
+ logger -t "$packageName [$$]" "$(printf "%b" "$msg")"
+ } || printf "%b" "$msg" >> "$queue"
}
uci_add_list_if_new() {
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";;
+ errorOutputFileCreate) r="failed to create %s 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}'";;
+ errorCopyingDataFile) r="failed to copy data file to '%s'";;
+ errorMovingDataFile) r="failed to move data file to '%s'";;
errorCreatingCompressedCache) r="failed to create compressed cache";;
errorRemovingTempFiles) r="failed to remove temporary files";;
errorRestoreCompressedCache) r="failed to unpack compressed cache";;
errorDetectingFileType) r="failed to detect format";;
errorNothingToDo) r="no blocked list URLs nor blocked-domains enabled";;
errorTooLittleRam) r="free ram (%s) is not enough to process all enabled block-lists";;
+ errorCreatingBackupFile) r="failed to create backup file %s";;
+ errorDeletingDataFile) r="failed to delete data file %s";;
+ errorRestoringBackupFile) r="failed to restore backup file %s";;
+ errorNoOutputFile) r="failed to create final block-list %s";;
statusNoInstall) r="$serviceName is not installed or not found";;
statusStopped) r="Stopped";;
warningMissingRecommendedPackages) r="some recommended packages are missing";;
warningInvalidCompressedCacheDir) r="invalid compressed cache directory '%s'";;
warningFreeRamCheckFail) r="can't detect free RAM";;
+ *) r="Unknown text '$1'";;
esac
shift
# shellcheck disable=SC2059
network_flush_cache
network_find_wan wan_if
if [ -n "$wan_if" ]; then
- output "WAN interface found: '${wan_if}'.\\n"
+ output "WAN interface found: '${wan_if}'.\n"
break
fi
if [ "$counter" -gt "$wan_if_timeout" ]; then
- output "WAN interface timeout, assuming 'wan'.\\n"
+ output "WAN interface timeout, assuming 'wan'.\n"
wan_if='wan'
break
fi
counter=$((counter+1))
- output "Waiting to discover WAN Interface...\\n"
+ output "Waiting to discover WAN Interface...\n"
sleep 1
done
network_flush_cache
network_get_gateway wan_gw "$wan_if"
if [ -n "$wan_gw" ]; then
- output "WAN gateway found: '${wan_gw}.'\\n"
+ output "WAN gateway found: '${wan_gw}.'\n"
return 0
fi
counter=$((counter+1))
- output "Waiting to discover $wan_if gateway...\\n"
+ output "Waiting to discover $wan_if gateway...\n"
sleep 1
done
json add error 'errorNoWanGateway'
- output "${_ERROR_}: $(get_text 'errorNoWanGateway')!\\n"; return 1;
+ output "${_ERROR_}: $(get_text 'errorNoWanGateway')!\n"; return 1;
}
append_url() {
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"
+ 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"
+ 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 [ "$param" != 'quiet' ]; then
json add warning 'warningExternalDnsmasqConfig'
- output "${_WARNING_}: $(get_text 'warningExternalDnsmasqConfig')!\\n"
+ output "${_WARNING_}: $(get_text 'warningExternalDnsmasqConfig')!\n"
fi
;;
esac
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"
+ 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"
+ output "${_ERROR_}: $(get_text 'errorNoIpset')!\n"
fi
dns='dnsmasq.servers'
fi
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"
+ 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"
+ output "${_ERROR_}: $(get_text 'errorNoNft')!\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"
+ output "${_ERROR_}: $(get_text 'errorNoIpset')!\n"
fi
dns='smartdns.domainset'
fi
if [ -z "$nft" ]; then
if [ "$param" != 'quiet' ]; then
json add error 'errorNoNft'
- output "${_ERROR_}: $(get_text 'errorNoNft')!\\n"
+ output "${_ERROR_}: $(get_text 'errorNoNft')!\n"
fi
dns='smartdns.domainset'
fi
compressed_cache_dir="$(sanitize_dir "$compressed_cache_dir")"
else
json add warning 'warningInvalidCompressedCacheDir' "$compressed_cache_dir"
- output "${_WARNING_}: $(get_text 'warningInvalidCompressedCacheDir' "$compressed_cache_dir")!\\n"
+ output "${_WARNING_}: $(get_text 'warningInvalidCompressedCacheDir' "$compressed_cache_dir")!\n"
compressed_cache_dir="/etc"
fi
dns_set_output_values "$dns"
[ "$dns" = 'dnsmasq.addnhosts' ] || rm -f "$dnsmasqAddnhostsFile" "$dnsmasqAddnhostsCache" "${compressed_cache_dir}/${dnsmasqAddnhostsGzip}"
- [ "$dns" = 'dnsmasq.conf' ] || rm -f "$dnsmasqConfFile" "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}"
- [ "$dns" = 'dnsmasq.ipset' ] || rm -f "$dnsmasqIpsetFile" "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}"
- [ "$dns" = 'dnsmasq.nftset' ] || rm -f "$dnsmasqNftsetFile" "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}"
+ [ "$dns" = 'dnsmasq.conf' ] || rm -f "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}"
+ [ "$dns" = 'dnsmasq.ipset' ] || rm -f "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}"
+ [ "$dns" = 'dnsmasq.nftset' ] || rm -f "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}"
[ "$dns" = 'dnsmasq.servers' ] || rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}"
[ "$dns" = 'smartdns.domainset' ] || rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
[ "$dns" = 'smartdns.ipset' ] || rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
if ! mkdir -p "${i%/*}"; then
if [ "$param" != 'quiet' ]; then
json add error 'errorOutputDirCreate' "$i"
- output "${_ERROR_}: $(get_text 'errorOutputDirCreate' "$i")!\\n"
+ output "${_ERROR_}: $(get_text 'errorOutputDirCreate' "$i")!\n"
fi
fi
done
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
- is_present 'gawk' || s="${s:+$s }gawk"
- is_present '/usr/libexec/grep-gnu' || s="${s:+$s }grep"
- is_present '/usr/libexec/sed-gnu' || s="${s:+$s }sed"
- is_present '/usr/libexec/sort-coreutils' || s="${s:+$s }coreutils-sort"
+ is_present 'gawk' || { json add warning 'warningMissingRecommendedPackages' 'gawk'; s="${s:+$s }gawk"; }
+ is_present '/usr/libexec/grep-gnu' || { json add warning 'warningMissingRecommendedPackages' 'grep'; s="${s:+$s }grep"; }
+ is_present '/usr/libexec/sed-gnu' || { json add warning 'warningMissingRecommendedPackages' 'sed'; s="${s:+$s }sed"; }
+ is_present '/usr/libexec/sort-coreutils' || { json add warning 'warningMissingRecommendedPackages' 'coreutils-sort'; s="${s:+$s }coreutils-sort"; }
if [ "$param" != 'quiet' ]; then
- json add warning 'warningMissingRecommendedPackages' "$s"
- output "${_WARNING_}: $(get_text 'warningMissingRecommendedPackages'), install them by running:\\n"
- output "opkg update; opkg --force-overwrite install $s;\\n"
+ output "${_WARNING_}: $(get_text 'warningMissingRecommendedPackages'), install them by running:\n"
+ output "opkg update; opkg --force-overwrite install $s;\n"
fi
fi
# Prefer curl because it supports the file:// scheme.
config_load "$packageName"
config_foreach append_url 'file_url'
load_environment_flag=1
- cache 'test' && return 0
+ cache 'test' && return 0
cache 'test_gzip' && return 0
if [ "$param" = 'on_boot' ]; then
load_network "$param"
resolver() {
_dnsmasq_instance_config() {
- local cfg="$1" param="$2"
+ local cfg="$1" param="$2" confdir confdirFile
[ -s "/etc/config/dhcp" ] || return 0
case "$param" in
dnsmasq.addnhosts)
fi
uci_add_list_if_new 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
;;
- cleanup|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|unbound.adb_list)
+ cleanup|unbound.adb_list)
+# shellcheck disable=SC2016
+ if grep -q 'config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq${cfg:+.$cfg}.d"' '/etc/init.d/dnsmasq'; then
+ config_get confdir "$cfg" 'confdir' "/tmp/dnsmasq${cfg:+.$cfg}.d"
+ else
+ config_get confdir "$cfg" 'confdir' '/tmp/dnsmasq.d'
+ fi
+ rm -f "${confdir}/${dnsmasqConfFile}" "${confdir}/${dnsmasqIpsetFile}" "${confdir}/${dnsmasqNftsetFile}"
+ uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
+ if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then
+ uci_remove 'dhcp' "$cfg" 'serversfile'
+ fi
+ ;;
+ dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
uci_remove_list 'dhcp' "$cfg" 'addnhosts' "$dnsmasqAddnhostsFile"
if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then
uci_remove 'dhcp' "$cfg" 'serversfile'
;;
esac
}
+# shellcheck disable=SC2016,SC2317
+ _dnsmasq_instance_init() {
+ local cfg="$1" param="$2" confdir confdirFile
+ [ -s "/etc/config/dhcp" ] || return 0
+ case "$param" in
+ dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
+ if grep -q 'config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq${cfg:+.$cfg}.d"' '/etc/init.d/dnsmasq'; then
+ config_get confdir "$cfg" 'confdir' "/tmp/dnsmasq${cfg:+.$cfg}.d"
+ else
+ config_get confdir "$cfg" 'confdir' '/tmp/dnsmasq.d'
+ fi
+ confdirFile="${confdir}/${outputFile}"
+ if ! str_contains "$outputDnsmasqFileList" "$confdirFile"; then
+ outputDnsmasqFileList="${outputDnsmasqFileList:+$outputDnsmasqFileList }${confdirFile}"
+ fi
+ ;;
+ esac
+ }
_smartdns_instance_config() {
[ -s "/etc/config/smartdns" ] || return 0
local cfg="$1" param="$2"
case $1 in
cleanup)
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 "$dnsmasqConfCache" "${compressed_cache_dir}/${dnsmasqConfGzip}"
+ rm -f "$dnsmasqIpsetCache" "${compressed_cache_dir}/${dnsmasqIpsetGzip}"
+ rm -f "$dnsmasqNftsetCache" "${compressed_cache_dir}/${dnsmasqNftsetGzip}"
rm -f "$dnsmasqServersFile" "$dnsmasqServersCache" "${compressed_cache_dir}/${dnsmasqServersGzip}"
rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
[ -n "$(uci_changes 'smartdns')" ] && uci_commit 'smartdns'
fi
;;
+ on_load)
+ case "$dns" in
+ dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
+ [ -z "$outputDnsmasqFileList" ] || return 0
+ config_load 'dhcp'
+ if [ "$dnsmasq_instance" = "*" ]; then
+ config_foreach _dnsmasq_instance_init 'dnsmasq' "$dns"
+ elif [ -n "$dnsmasq_instance" ]; then
+ for i in $dnsmasq_instance; do
+ _dnsmasq_instance_init "@dnsmasq[$i]" "$dns" || _dnsmasq_instance_init "$i" "$dns"
+ done
+ fi
+ outputFile="$(str_first_word "$outputDnsmasqFileList")"
+ ;;
+ esac
+ ;;
on_start)
if [ ! -s "$outputFile" ]; then
json set status 'statusFail'
- json add error 'errorOutputFileCreate'
- output "${_ERROR_}: $(get_text 'errorOutputFileCreate')!\\n"
+ json add error 'errorOutputFileCreate' "$outputFile"
+ output "${_ERROR_}: $(get_text 'errorOutputFileCreate' "$outputFile")!\n"
return 1
fi
-
config_load 'dhcp'
if [ "$dnsmasq_instance" = "*" ]; then
config_foreach _dnsmasq_instance_config 'dnsmasq' "$dns"
case "$dns" in
dnsmasq.*)
- chmod 660 "$outputFile"
- chown root:dnsmasq "$outputFile" >/dev/null 2>/dev/null
+ if [ -n "$outputDnsmasqFileList" ]; then
+ local i
+ for i in $outputDnsmasqFileList; do
+ chmod 660 "$i"
+ chown root:dnsmasq "$i" >/dev/null 2>/dev/null
+ done
+ elif [ -s "$outputFile" ]; then
+ chmod 660 "$outputFile"
+ chown root:dnsmasq "$outputFile" >/dev/null 2>/dev/null
+ else
+ json set status 'statusFail'
+ json add error 'errorNoOutputFile' "$outputFile"
+ output "${_ERROR_}: $(get_text 'errorNoOutputFile' "$outputFile")!\n"
+ return 1
+ fi
param='dnsmasq_restart'
output_text='Restarting dnsmasq'
;;
output_fail
json set status 'statusFail'
json add error 'errorDNSReload'
- output "${_ERROR_}: $(get_text 'errorDNSReload')!\\n"
+ output "${_ERROR_}: $(get_text 'errorDNSReload')!\n"
return 1
fi
;;
local R_TMP
case "$1" in
create|backup)
- [ -s "$outputFile" ] && { mv -f "$outputFile" "$outputCache"; } >/dev/null 2>/dev/null
- return $?
+ if [ -n "$outputDnsmasqFileList" ]; then
+ local i __firstFile
+ for i in $outputDnsmasqFileList; do
+ if [ -z "$__firstFile" ]; then
+ __firstFile="$i"
+ if ! mv "$i" "$outputCache"; then
+ json add error 'errorCreatingBackupFile' "$outputCache"
+ fi
+ else
+ if ! rm -f "$i"; then
+ json add error 'errorDeletingDataFile' "$i"
+ fi
+ fi
+ done
+ else
+ [ -s "$outputFile" ] && { mv -f "$outputFile" "$outputCache"; } >/dev/null 2>/dev/null
+ return $?
+ fi
;;
restore|use)
- [ -s "$outputCache" ] && mv "$outputCache" "$outputFile" >/dev/null 2>/dev/null
- return $?
+ if [ -n "$outputDnsmasqFileList" ]; then
+ local i __firstFile
+ for i in $outputDnsmasqFileList; do
+ if [ -z "$__firstFile" ]; then
+ __firstFile="$i"
+ if ! mv "$outputCache" "$i"; then
+ json add error 'errorRestoringBackupFile' "$i"
+ fi
+ else
+ if ! cp "$__firstFile" "$i"; then
+ json add error 'errorRestoringBackupFile' "$i"
+ fi
+ fi
+ done
+ else
+ [ -s "$outputCache" ] && mv "$outputCache" "$outputFile" >/dev/null 2>/dev/null
+ return $?
+ fi
;;
test)
[ -s "$outputCache" ]
process_file_url_wrapper() {
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"
+ 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" &
}
process_file_url() {
+ _sanitize_source() {
+ local type="$1" file="$2"
+ case "$type" in
+ hosts)
+ sed -i '/# Title: StevenBlack/,/# Start StevenBlack/d' "$file"
+# sed -i -E '/^(.*)[\t ](local|localhost|localhost.localdomain)$/d;/^255.255.255.255[\t ]broadcasthost$/d;/^0.0.0.0[\t ]0.0.0.0$/d' "$file"
+# sed -i -E '/^(.*)[\t ](ip6-localhost|ip6-loopback|ip6-localnet|ip6-mcastprefix|ip6-allnodes|ip6-allrouters|ip6-allhosts)/d' "$file"
+ ;;
+ esac
+ }
local cfg="$1" new_size
local label type D_TMP R_TMP filter
if [ -z "$cfg" ] || [ -n "${2}${3}" ]; then
esac
if is_https_url "$url" && [ -z "$isSSLSupported" ]; then
output 1 "$_FAIL_"
- output 2 "[DL] $type $label $__FAIL__\\n"
+ output 2 "[DL] $type $label $__FAIL__\n"
echo "errorNoSSLSupport|${1}" >> "$runningErrorFile"
return 0
fi
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"
+ output 2 "[DL] $type $label $__FAIL__\n"
echo "errorDownloadingList|${url}" >> "$runningErrorFile"
else
append_newline "$R_TMP"
dnsmasq2) filter="$dnsmasq2FileFilter";;
dnsmasq3) filter="$dnsmasq3FileFilter";;
domains) filter="$domainsFilter";;
- hosts) filter="$hostsFilter";;
+ hosts)
+ filter="$hostsFilter"
+ _sanitize_source 'hosts' "$R_TMP"
+ ;;
*)
output 1 "$_FAIL_"
- output 2 "[DL] $type $label $__FAIL__\\n"
+ output 2 "[DL] $type $label $__FAIL__\n"
echo "errorDetectingFileType|${url}" >> "$runningErrorFile"
rm -f "$R_TMP"
return 0
fi
if [ ! -s "$R_TMP" ]; then
output 1 "$_FAIL_"
- output 2 "[DL] $type $label ($format) $__FAIL__\\n"
+ output 2 "[DL] $type $label ($format) $__FAIL__\n"
echo "errorParsingList|${url}" >> "$runningErrorFile"
else
append_newline "$R_TMP"
cat "${R_TMP}" >> "$D_TMP"
output 1 "$_OK_"
- output 2 "[DL] $type $label ($format) $__OK__\\n"
+ output 2 "[DL] $type $label ($format) $__OK__\n"
fi
fi
rm -f "$R_TMP"
rm -f "$runningErrorFile"
fi
output 2 'Moving dnsmasq file '
- if mv "$B_TMP" "$outputFile"; then
- output 2 "$__OK__\\n"
+ local i __firstFile
+ for i in $outputDnsmasqFileList; do
+ if [ -z "$__firstFile" ]; then
+ __firstFile="$i"
+ if mv "$B_TMP" "$i"; then
+ output 2 "$__OK__\n"
+ else
+ output 2 "$__FAIL__\n"
+ json add error 'errorMovingDataFile' "$i"
+ fi
else
- output 2 "$__FAIL__\\n"
- json add error 'errorMovingDataFile'
+ if cp "$__firstFile" "$i"; then
+ output 2 "$__OK__\n"
+ else
+ output 2 "$__FAIL__\n"
+ json add error 'errorCopyingDataFile' "$i"
+ fi
fi
+ done
output 1 '\n'
}
free_mem="$(get_ram_available)"
if [ -z "$free_mem" ]; then
json add warnning 'warningFreeRamCheckFail'
- output "${_WARNING_}: $(get_text 'warningFreeRamCheckFail')!\\n"
+ output "${_WARNING_}: $(get_text 'warningFreeRamCheckFail')!\n"
return 0
fi
config_load "$packageName"
config_foreach _config_calculate_sizes 'file_url'
if [ $((free_mem)) -lt $((total_sizes * 2)) ]; then
json add error 'errorTooLittleRam' "$free_mem"
- output "${_ERROR_}: $(get_text 'errorTooLittleRam' "$free_mem")!\\n"
+ output "${_ERROR_}: $(get_text 'errorTooLittleRam' "$free_mem")!\n"
return 1
else
return 0
wait
if [ -n "$(uci_changes "$packageName")" ]; then
output 2 "Saving updated file size(s) "
- if uci_commit "$packageName"; then output_okn; else output_failn; fi
+ if uci_commit "$packageName"; then output_ok; else output_fail; fi
fi
output 1 '\n'
for hf in $blocked_domain $canaryDomains; do
printf "%s\n" "$(echo "$hf" | sed "$domainsFilter")" >> "$B_TMP"
done
- allowed_domain="${allowed_domain}
-$(sed '/^[[:space:]]*$/d' "$A_TMP")"
- for hf in ${allowed_domain}; do
- hf="$(echo "$hf" | sed 's/\./\\./g')"
- echo "/(^|\.)${hf}$/d;" >> "$SED_TMP"
- done
-
sed -i '/^[[:space:]]*$/d' "$B_TMP"
[ ! -s "$B_TMP" ] && return 1
+ allowed_domain="${allowed_domain}
+$(sed '/^[[:space:]]*$/d' "$A_TMP")"
+
output 1 'Processing downloads '
output 2 'Sorting combined list '
json set status 'statusProcessing'
if sort -u "$B_TMP" > "$A_TMP"; then
output_ok
else
- output_failn
+ output_fail
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
+ output_fail
json add error 'errorSorting'
fi
fi
- if [ "$dns" = 'dnsmasq.conf' ] || \
- [ "$dns" = 'dnsmasq.ipset' ] || \
- [ "$dns" = 'dnsmasq.nftset' ] || \
- [ "$dns" = 'dnsmasq.servers' ] || \
- [ "$dns" = 'smartdns.domainset' ] || \
- [ "$dns" = 'smartdns.ipset' ] || \
- [ "$dns" = 'smartdns.nftset' ] || \
- [ "$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
-# shellcheck disable=SC2016
- 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
+ case "$dns" in
+ 'dnsmasq.conf' | 'dnsmasq.ipset' | 'dnsmasq.nftset' | 'dnsmasq.servers' | \
+ 'smartdns.domainset' | 'smartdns.ipset' | 'smartdns.nftset' | \
+ 'unbound.adb_list' )
+ # 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
+ # shellcheck disable=SC2016
+ 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'
- mv "$A_TMP" "$B_TMP"
fi
else
output_failn
json add error 'errorOptimization'
+ mv "$A_TMP" "$B_TMP"
fi
else
output_failn
json add error 'errorOptimization'
- mv "$A_TMP" "$B_TMP"
fi
else
output_failn
json add error 'errorOptimization'
+ mv "$A_TMP" "$B_TMP"
fi
- else
- output_failn
- json add error 'errorOptimization'
+ ;;
+ *)
mv "$A_TMP" "$B_TMP"
- fi
- else
- mv "$A_TMP" "$B_TMP"
- fi
+ ;;
+ esac
- if [ -s "$SED_TMP" ]; then
- output 2 'Allowing domains '
+ if [ -n "$allowed_domain" ]; then
+ output 2 'Removing allowed domains from combined list'
json set message "$(get_text 'statusProcessing'): allowing domains"
- if sed -i -E -f "$SED_TMP" "$B_TMP"; then
- output_ok
+ for hf in ${allowed_domain}; do
+ hf="$(echo "$hf" | sed 's/\./\\./g')"
+ echo "/(^|\.)${hf}$/d;" >> "$SED_TMP"
+ done
+ if [ -s "$SED_TMP" ]; then
+ if sed -i -E -f "$SED_TMP" "$B_TMP"; then
+ output_ok
+ else
+ output_failn
+ json add error 'errorAllowListProcessing'
+ fi
else
output_failn
json add error 'errorAllowListProcessing'
fi
fi
- output 2 'Formatting merged file '
- json set message "$(get_text 'statusProcessing'): formatting merged file"
+
+ output 2 'Formatting combined list file '
+ json set message "$(get_text 'statusProcessing'): formatting combined list file"
if [ -z "$outputFilterIPv6" ]; then
if sed "$outputFilter" "$B_TMP" > "$A_TMP"; then
output_ok
esac
fi
+ if [ -n "$outputAllowFilter" ] && [ -n "$allowed_domain" ]; then
+ rm -f "$SED_TMP"; touch "$SED_TMP";
+ output 2 'Allowing domains '
+ json set message "$(get_text 'statusProcessing'): allowing domains"
+ for hf in ${allowed_domain}; do
+ echo "$hf" | sed -E "$outputAllowFilter" >> "$SED_TMP"
+ done
+ if [ -s "$SED_TMP" ]; then
+ if cat "$SED_TMP" "$A_TMP" > "$B_TMP"; then
+ output_ok
+ else
+ output_failn
+ json add error 'errorAllowListProcessing'
+ fi
+ else
+ output_failn
+ json add error 'errorAllowListProcessing'
+ fi
+ else
+ mv "$A_TMP" "$B_TMP"
+ 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 '
+ output 2 'Creating dnsmasq config file(s) '
json set message "$(get_text 'statusProcessing'): creating dnsmasq config file"
;;
dnsmasq.ipset)
- output 2 'Creating dnsmasq ipset file '
+ output 2 'Creating dnsmasq ipset file(s) '
json set message "$(get_text 'statusProcessing'): creating dnsmasq ipset file"
;;
dnsmasq.nftset)
- output 2 'Creating dnsmasq nft set file '
+ output 2 'Creating dnsmasq nft set file(s) '
json set message "$(get_text 'statusProcessing'): creating dnsmasq nft set file"
;;
dnsmasq.servers)
;;
esac
- if mv "$A_TMP" "$outputFile"; then
- output_ok
- else
- output_failn
- json add error 'errorMovingDataFile'
- fi
case "$dns" in
+ dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset)
+ local i __firstFile
+ for i in $outputDnsmasqFileList; do
+ if [ -z "$__firstFile" ]; then
+ __firstFile="$i"
+ if mv "$B_TMP" "$i"; then
+ output 2 "$__OK__\n"
+ else
+ output 2 "$__FAIL__\n"
+ json add error 'errorMovingDataFile' "$i"
+ fi
+ else
+ if cp "$__firstFile" "$i"; then
+ output 2 "$__OK__\n"
+ else
+ output 2 "$__FAIL__\n"
+ json add error 'errorCopyingDataFile' "$i"
+ fi
+ fi
+ done
+ ;;
unbound.adb_list)
+ if mv "$B_TMP" "$outputFile"; then
+ output_ok
+ else
+ output_failn
+ json add error 'errorMovingDataFile' "$outputFile"
+ fi
sed -i '1 i\server:' "$outputFile"
;;
+ *)
+ if mv "$B_TMP" "$outputFile"; then
+ output_ok
+ else
+ output_failn
+ json add error 'errorMovingDataFile' "$outputFile"
+ fi
+ ;;
esac
if [ "$compressed_cache" -gt 0 ]; then
output 2 'Creating compressed cache '
local validation_result="$3"
load_environment "$validation_result" 'quiet' || return 1
if [ ! -s "$outputFile" ]; then
- output "No block-list ('$outputFile') found.\\n"
+ output "No block-list ('$outputFile') found.\n"
return 0
elif [ -z "$string" ]; then
- output "Usage: /etc/init.d/${packageName} allow 'domain' ...\\n"
+ 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"
+ output "Allowing individual domains is not possible when using external dnsmasq config file.\n"
return 0
fi
case "$dns" in
dnsmasq.*)
output 1 "Allowing domain(s) and restarting dnsmasq "
- output 2 "Allowing domain(s) \\n"
+ 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
+ local f
+ for f in ${outputDnsmasqFileList:-$outputFile}; do
+ if sed -i "\:\(/\|\.\)${hf}/:d" "$f"; then
+ output_ok
+ else
+ output_fail
+ fi
+ done
+ if [ -n "$outputAllowFilter" ]; then
+ if echo "$c" | sed -E "$outputAllowFilter" >> "$outputFile"; then
+ output_ok
+ else
+ output_fail
+ fi
+ fi
+ if uci_add_list_if_new "${packageName}" 'config' 'allowed_domain' "$c"; then
output_ok
else
output_fail
if cache 'create_gzip'; then
output_ok
else
- output_failn
+ output_fail
fi
fi
output 2 "Committing changes to config "
if uci_commit "$packageName"; then
allowed_domain="$(uci_get "$packageName" 'config' 'allowed_domain')"
config_cache 'create'
- json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
- output_ok;
+ json set stats "$serviceName is blocking $(count_blocked_domains) 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
output 2 "Restarting dnsmasq "
if dnsmasq_restart; then output_okn; else output_failn; fi
else
- output_fail;
+ output_failn
fi
;;
smartdns.*)
output 1 "Allowing domain(s) and restarting smartdns "
- output 2 "Allowing domain(s) \\n"
+ output 2 "Allowing domain(s) \n"
for c in $string; do
output 2 " $c "
hf="$(echo "$c" | sed 's/\./\\./g')"
if cache 'create_gzip'; then
output_ok
else
- output_failn
+ output_fail
fi
fi
output 2 "Committing changes to config "
if uci_commit "$packageName"; then
allowed_domain="$(uci_get "$packageName" 'config' 'allowed_domain')"
config_cache 'create'
- json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
+ json set stats "$serviceName is blocking $(count_blocked_domains) domains (with ${dns})"
output_ok;
output 2 "Restarting Unbound "
if unbound_restart; then output_okn; else output_failn; fi
else
- output_fail;
+ output_failn
fi
;;
unbound.*)
output 1 "Allowing domain(s) and restarting Unbound "
- output 2 "Allowing domain(s) \\n"
+ output 2 "Allowing domain(s) \n"
for c in $string; do
output 2 " $c "
hf="$(echo "$c" | sed 's/\./\\./g')"
if uci_commit "$packageName"; then
allowed_domain="$(uci_get "$packageName" 'config' 'allowed_domain')"
config_cache 'create'
- json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
+ json set stats "$serviceName is blocking $(count_blocked_domains) domains (with ${dns})"
output_ok;
output 2 "Restarting Unbound "
if unbound_restart; then output_okn; else output_failn; fi
else
- output_fail;
+ output_failn
fi
;;
esac
local validation_result="$3"
load_environment "$validation_result" 'quiet' || return 1
if [ ! -s "$outputFile" ]; then
- output "No block-list ('$outputFile') found.\\n"
+ output "No block-list ('$outputFile') found.\n"
return 0
elif [ -z "$param" ]; then
- output "Usage: /etc/init.d/${packageName} check 'domain' ...\\n"
+ 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"
+ output "Found 1 match for '$string' in '$outputFile'.\n"
else
- output "Found $c matches for '$string' in '$outputFile'.\\n"
+ output "Found $c matches for '$string' in '$outputFile'.\n"
fi
if [ "$c" -le 20 ]; then
grep "$string" "$outputFile" | sed "$outputOutputFilter"
fi
else
- output "The '$string' is not found in current block-list ('$outputFile').\\n"
+ output "The '$string' is not found in current block-list ('$outputFile').\n"
fi
done
}
[ "$en" = '0' ] && return 0
[ "$action" != 'block' ] && return 0
if is_https_url "$url" && [ -z "$isSSLSupported" ]; then
- output "[DL] $url $__FAIL__\\n"
+ output "[DL] $url $__FAIL__\n"
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 "[DL] $url $__FAIL__\\n"
+ output "[DL] $url $__FAIL__\n"
else
append_newline "$R_TMP"
for string in ${param}; do
c="$(grep -c "$string" "$R_TMP")"
if [ "$c" -gt 0 ]; then
if [ "$c" -eq 1 ]; then
- output "Found 1 match for '$string' in '$url'.\\n"
+ output "Found 1 match for '$string' in '$url'.\n"
else
- output "Found $c matches for '$string' in '$url'.\\n"
+ output "Found $c matches for '$string' in '$url'.\n"
fi
grep "$string" "$R_TMP"
else
- output "The '$string' is not found in '$url'.\\n"
+ output "The '$string' is not found in '$url'.\n"
fi
done
rm -f "$R_TMP"
local validation_result="$3"
load_environment "$validation_result" 'quiet' || return 1
if [ -z "$param" ]; then
- output "Usage: /etc/init.d/${packageName} check_lists 'domain' ...\\n"
+ output "Usage: /etc/init.d/${packageName} check_lists 'domain' ...\n"
return 0
fi
config_load "$packageName"
done
if ! $dl_command "$config_update_url" "$dl_flag" "$R_TMP" 2>/dev/null || [ ! -s "$R_TMP" ]; then
append_newline "$R_TMP"
- output 1 "$_FAIL_\\n"
- output 2 "[DL] Config Update: $label $__FAIL__\\n"
+ 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"
+ 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"
+ output 1 "$_FAIL_\n"
+ output 2 "[DL] Config Update: $label $__FAIL__\n"
json add error 'errorParsingConfigUpdate'
fi
fi
if [ "$action" = 'restore' ]; then
output 0 "Starting $serviceName... "
- output 3 "Starting $serviceName...\\n"
+ 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 '
else
output_failn
json add error 'errorRestoreCompressedCache'
- output "${_ERROR_}: $(get_text 'errorRestoreCompressedCache')!\\n"
+ output "${_ERROR_}: $(get_text 'errorRestoreCompressedCache')!\n"
action='download'
fi
fi
else
output_failn
json add error 'errorRestoreCache'
- output "${_ERROR_}: $(get_text 'errorRestoreCache')!\\n"
+ output "${_ERROR_}: $(get_text 'errorRestoreCache')!\n"
action='download'
fi
fi
if [ -z "$blocked_url" ] && [ -z "$blocked_domain" ]; then
json set status 'statusFail'
json add error 'errorNothingToDo'
- output "${_ERROR_}: $(get_text 'errorNothingToDo')!\\n"
+ output "${_ERROR_}: $(get_text 'errorNothingToDo')!\n"
else
if [ -s "$outputFile" ] || cache 'test' || cache 'test_gzip'; then
output 0 "Force-reloading $serviceName... "
- output 3 "Force-reloading $serviceName...\\n"
+ output 3 "Force-reloading $serviceName...\n"
json set status 'statusForceReloading'
else
output 0 "Starting $serviceName... "
- output 3 "Starting $serviceName...\\n"
+ output 3 "Starting $serviceName...\n"
json set status 'statusStarting'
fi
resolver 'cleanup'
fi
if [ "$action" = 'restart' ]; then
output 0 "Restarting $serviceName... "
- output 3 "Restarting $serviceName...\\n"
+ output 3 "Restarting $serviceName...\n"
json set status 'statusRestarting'
resolver 'on_start'
fi
if [ "$action" = 'start' ]; then
output 0 "Starting $serviceName... "
- output 3 "Starting $serviceName...\\n"
+ output 3 "Starting $serviceName...\n"
json set status 'statusStarting'
resolver 'on_start'
fi
if [ -s "$outputFile" ] && [ "$(json get status)" != "statusFail" ]; then
- output 0 "$__OK__\\n";
+ output 0 "$__OK__\n";
json del message
json set status 'statusSuccess'
- json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
+ json set stats "$serviceName is blocking $(count_blocked_domains) domains (with ${dns})"
status_service 'quiet'
else
- output 0 "$__FAIL__\\n";
+ output 0 "$__FAIL__\n";
json set status 'statusFail'
json add error 'errorOhSnap'
status_service 'quiet'
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")"
+ json_add_int 'entries' "$(count_blocked_domains)"
else
json_add_int 'entries' '0'
fi
if [ -n "$status" ] && [ -n "$message" ]; then
status="${status}: $message"
fi
- [ -n "$status" ] && output "$serviceName $status!\\n"
+ [ -n "$status" ] && output "$serviceName $status!\n"
fi
if [ "$param" != 'quiet' ] && [ -n "$error" ]; then
for c in $error; do
local error_param="${c##*|}"
local error_code="${c%|*}"
- output "${_ERROR_}: $(get_text "$error_code" "$error_param")!\\n"
+ output "${_ERROR_}: $(get_text "$error_code" "$error_param")!\n"
done
fi
if [ "$param" != 'quiet' ] && [ -n "$warning" ]; then
for c in $warning; do
local warning_param="${c##*|}"
local warning_code="${c%|*}"
- output "${_WARNING_}: $(get_text "$warning_code" "$warning_param").\\n"
+ output "${_WARNING_}: $(get_text "$warning_code" "$warning_param").\n"
done
fi
return 0
nft delete set inet fw4 adb4
nft delete set inet fw4 adb6
led_off "$led"
- output 0 "$__OK__\\n"; output_okn;
+ output 0 "$__OK__\n"; output_okn;
json set status 'statusStopped'
json del message
else
- output 0 "$__FAIL__\\n"; output_fail;
+ output 0 "$__FAIL__\n"; output_fail;
json set status 'statusFail'
json add error 'errorStopping'
- output "${_ERROR_}: $(get_text 'errorStopping')!\\n"
+ output "${_ERROR_}: $(get_text 'errorStopping')!\n"
fi
fi
return 0
projects / feed / packages.git / commitdiff