Skip to content

feat(adblock): separate firewall resolution from clients #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tbaile wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(adblock): separate firewall resolution from clients #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion packages/adblock/files/adblock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ f_extconf() {
set firewall."adblock_${zone}${port}".src="${zone}"
set firewall."adblock_${zone}${port}".proto="tcp udp"
set firewall."adblock_${zone}${port}".src_dport="${port}"
set firewall."adblock_${zone}${port}".dest_port="${port}"
set firewall."adblock_${zone}${port}".dest_port="5300"
set firewall."adblock_${zone}${port}".target="DNAT"
set firewall."adblock_${zone}${port}".family="any"
set firewall."adblock_${zone}${port}".ipset="!tsdns_bypass"
Expand All @@ -585,6 +585,25 @@ f_extconf() {
done
fi

if [ "${adb_enabled}" = "1" ] && [ "${adb_forcedns}" = "1" ] && /etc/init.d/firewall enabled && [ "$(uci -q get dhcp.adblock)" != "dnsmasq" ]; then
uci -q batch <<-EOC
set dhcp.adblock="dnsmasq"
set dhcp.adblock.port="5300"
set dhcp.adblock.noresolv="1"
set dhcp.adblock.max_ttl="60"
set dhcp.adblock.max_cache_ttl="60"
set dhcp.adblock.logqueries="0"
set dhcp.adblock.rebind_protection="0"
set dhcp.adblock.confdir="$adb_dnsdir"
add_list dhcp.adblock.ns_tag="automated"
add_list dhcp.adblock.server="127.0.0.1"
EOC
fi

if [ "${adb_enabled}" = "0" ] || [ "${adb_forcedns}" = "0" ]; then
uci -q delete dhcp.adblock
fi

# add adb_bypass
if [ "${adb_enabled}" = "1" ] && [ "${adb_forcedns}" = "1" ] && /etc/init.d/firewall enabled; then
if ! uci -q get firewall.tsdns_bypass >/dev/null; then
Expand Down Expand Up @@ -612,6 +631,7 @@ f_extconf() {
fi

f_uci "${config}"
f_uci "dhcp"
}

# restart dns backend
Expand Down
4 changes: 0 additions & 4 deletions packages/ns-threat_shield/files/ts-dns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ if [ "$TS_ENABLED" = 1 ]; then
# Setup new blacklist source
uci set adblock.global.adb_srcarc="$DEST_DIR"/combined.sources.gz

# Setup dnsmasq as backend
uci set adblock.global.adb_dns='dnsmasq'
uci set adblock.global.adb_dnsinstance='0'

# Setup wget with compression support
uci set adblock.global.adb_fetchutil='wget'
uci set adblock.global.adb_fetchparm="--compression=gzip --no-cache --no-cookies --max-redirect=0 --timeout=20 -O"
Expand Down
Loading