Browse Source

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

[22.03] simple-adblock: allow domains bugfix & canary domains support
lilik-openwrt-22.03
Stan Grishin 2 years ago
committed by GitHub
parent
commit
0756af3c9e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
  1. +1
    -1
      net/simple-adblock/Makefile
  2. +2
    -0
      net/simple-adblock/files/simple-adblock.conf
  3. +21
    -6
      net/simple-adblock/files/simple-adblock.init

+ 1
- 1
net/simple-adblock/Makefile View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock PKG_NAME:=simple-adblock
PKG_VERSION:=1.9.1 PKG_VERSION:=1.9.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later


+ 2
- 0
net/simple-adblock/files/simple-adblock.conf View File

@ -16,6 +16,8 @@ config simple-adblock 'config'
# list force_dns_port '4434' # list force_dns_port '4434'
# list force_dns_port '5443' # list force_dns_port '5443'
# list force_dns_port '8443' # list force_dns_port '8443'
option canary_domains_icloud '0'
option canary_domains_mozilla '0'
option led 'none' option led 'none'
option boot_delay '120' option boot_delay '120'
option download_timeout '10' option download_timeout '10'


+ 21
- 6
net/simple-adblock/files/simple-adblock.init View File

@ -72,6 +72,9 @@ readonly _WARNING_='\033[0;33mWARNING\033[0m'
readonly ipset="$(command -v ipset)" readonly ipset="$(command -v ipset)"
# shellcheck disable=SC2155 # shellcheck disable=SC2155
readonly nft="$(command -v nft)" readonly nft="$(command -v nft)"
readonly canaryDomainsMozilla='use-application-dns.net'
readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com'
# readonly canaryDomains="$canaryDomainsMozilla $canaryDomainsiCloud"
debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; } debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; }
@ -688,10 +691,17 @@ download_lists() {
rm -f "$sharedMemoryError" rm -f "$sharedMemoryError"
fi fi
for hf in ${blocked_domain}; do echo "$hf" | sed "$domainsFilter" >> $B_TMP; done
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} allowed_domain="${allowed_domain}
$(cat $A_TMP)" $(cat $A_TMP)"
for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; w_filter="$w_filter/${hf}$/d;"; done
for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; w_filter="$w_filter/^${hf}$/d;/\.${hf}$/d;"; done
[ ! -s "$B_TMP" ] && return 1 [ ! -s "$B_TMP" ] && return 1
@ -846,7 +856,7 @@ $(cat $A_TMP)"
} }
adb_allow() { adb_allow() {
local c string="$1"
local c hf string="$1"
local validation_result="$3" local validation_result="$3"
load_environment "$validation_result" load_environment "$validation_result"
if [ ! -s "$outputFile" ]; then if [ ! -s "$outputFile" ]; then
@ -858,10 +868,11 @@ adb_allow() {
dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers) dnsmasq.addnhosts|dnsmasq.conf|dnsmasq.ipset|dnsmasq.nftset|dnsmasq.servers)
output 1 "Allowing domain(s) and restarting 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
for c in $string; do
output 2 " $c " output 2 " $c "
if sed -i "/${string}/d" "$outputFile" && \
uci_add_list_if_new "${packageName}" 'config' 'allowed_domain' "$string"; then
hf="$(echo "$c" | sed 's/\./\\./g')"
if sed -i "/^${hf}$/d;/\.${hf}$/d;" "$outputFile" && \
uci_add_list_if_new "${packageName}" 'config' 'allowed_domain' "$c"; then
output_ok output_ok
else else
output_fail output_fail
@ -1356,6 +1367,8 @@ load_validate_config() {
local compressed_cache local compressed_cache
local ipv6_enabled local ipv6_enabled
local allow_non_ascii local allow_non_ascii
local canary_domains_icloud
local canary_domains_mozilla
local config_update_enabled local config_update_enabled
local config_update_url local config_update_url
local boot_delay local boot_delay
@ -1379,6 +1392,8 @@ load_validate_config() {
'compressed_cache:bool:0' \ 'compressed_cache:bool:0' \
'ipv6_enabled:bool:0' \ 'ipv6_enabled:bool:0' \
'allow_non_ascii:bool:0' \ 'allow_non_ascii:bool:0' \
'canary_domains_icloud:bool:0' \
'canary_domains_mozilla:bool:0' \
'config_update_enabled:bool:0' \ 'config_update_enabled:bool:0' \
'config_update_url:string:https://cdn.jsdelivr.net/gh/openwrt/packages/net/simple-adblock/files/simple-adblock.conf.update' \ 'config_update_url:string:https://cdn.jsdelivr.net/gh/openwrt/packages/net/simple-adblock/files/simple-adblock.conf.update' \
'boot_delay:range(0,240):120' \ 'boot_delay:range(0,240):120' \


Loading…
Cancel
Save