openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

https-dns-proxy: update to 2025.10.07-r1

Browse Source 
Makefile:
* update to latest upstream: 7b27ecd559
* update version, release
* drop CONFIGURE_ARGS as the build is curl-independent
* update the link to the documentation

README:
* add small README with the link to documentation

Config:
* rename procd_fw_src_interfaces to force_dns_src_interface to better reflect meaning
* add heartbeat_domain, heartbeat_sleep_timeout, heartbeat_wait_timeout options
* add default user, group and listen_addr options to the main config
* drop the user, group and listen_addr options from the instance configs

Init-script:
* start much earlier so that on boot, the procd_add_raw_trigger works on all systems
* create a ubus() helper function so that service delete does not produce "Command not found"
* new options handling where the global config options can be used for instance options
* some renaming of global/instance variables due to abovementioned redesign
* new open port detection, no longer relying on netstat
* new uci_changes() logic where it returns 0 or 1 instead of text
* new append_parm logic for not adding default value options to CLI
* new boolean options handling logic
* move config loading to load_package_config() function
* new logic for calling procd_set_config_changed firewall based solely on "$force_dns"
* source network.sh based on "${IPKG_INSTROOT}" path
* rename procd_fw_src_interfaces to force_dns_src_interface to better reflect meaning
* rename use_http1 to force_http1
* rename use_ipv6_resolvers_only to force_ipv6_resolvers

Uci-defaults:
* migrate to new option names

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2025-10-07 16:38:50 +00:00
parent 0d939af403
commit ad2477e102
6 changed files with 203 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/https-dns-proxy/Makefile
View File

@@ -1,13 +1,14 @@
# SPDX-License-Identifier: MIT
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy PKG_NAME:=https-dns-proxy
PKG_VERSION:=2025.05.11 PKG_VERSION:=2025.10.07
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
PKG_SOURCE_VERSION:=a34e20d6e24df603427d91bac8f58c2d3a8aa0a6 PKG_MIRROR_HASH:=2d0e5f031c8de7f42fa7f2e79d5638f9e4899c056d710fc3638a03112b383be5
PKG_MIRROR_HASH:=43a2dc631f925dbf43efaf53da925e1e8eb61f30cc02020ff3a5024b27e2dd91 PKG_SOURCE_VERSION:=7b27ecd5598d03bbe79651cc80efca886d433cd9
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@@ -20,11 +21,6 @@ TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += -Wl,--gc-sections TARGET_LDFLAGS += -Wl,--gc-sections
CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DSW_VERSION=$(PKG_VERSION)-r$(PKG_RELEASE) CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DSW_VERSION=$(PKG_VERSION)-r$(PKG_RELEASE)
CONFIGURE_ARGS += \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \
$(if $(CONFIG_LIBCURL_HTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
$(if $(CONFIG_LIBCURL_HTTP3),--with-nghttp3="$(STAGING_DIR)/usr" --with-ngtcp2="$(STAGING_DIR)/usr",--without-nghttp3 --without-ngtcp2) \
define Package/https-dns-proxy define Package/https-dns-proxy
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@@ -39,7 +35,7 @@ endef
define Package/https-dns-proxy/description define Package/https-dns-proxy/description
Light-weight DNS-over-HTTPS, non-caching translation proxy for the RFC 8484 DoH standard. Light-weight DNS-over-HTTPS, non-caching translation proxy for the RFC 8484 DoH standard.
It receives regular, unencrypted (UDP) DNS requests and resolves them via DoH resolver. It receives regular, unencrypted (UDP) DNS requests and resolves them via DoH resolver.
Please see https://docs.openwrt.melmac.net/https-dns-proxy/ for more information. Please see https://docs.openwrt.melmac.ca/https-dns-proxy/ for more information.
endef endef
define Package/https-dns-proxy/conffiles define Package/https-dns-proxy/conffiles

23
net/https-dns-proxy/files/README.md
View File

@@ -1,3 +1,22 @@
# README # https-dns-proxy
README has been moved to [https://docs.openwrt.melmac.net/https-dns-proxy/](https://docs.openwrt.melmac.net/https-dns-proxy/). [![OpenWrt](https://img.shields.io/badge/OpenWrt-Compatible-blueviolet)](https://openwrt.org)
[![Web UI](https://img.shields.io/badge/Web_UI-Available-blue)](https://docs.openwrt.melmac.ca/https-dns-proxy/)
[![Resolvers](https://img.shields.io/badge/Resolvers-40%2B%20Built--in-brightgreen)](https://docs.openwrt.melmac.ca/https-dns-proxy/)
[![Minimal Footprint](https://img.shields.io/badge/Size-~40KB-green)](https://github.com/stangri/https-dns-proxy)
[![License](https://img.shields.io/badge/License-MIT-lightgrey)](https://github.com/stangri/https-dns-proxy/blob/master/LICENSE)
A lightweight, RFC8484-compliant DNS-over-HTTPS (DoH) proxy service for OpenWrt.
Includes optional integration with `dnsmasq`, automatic fallback, and canary domain support.
## Features
- Small footprint (~40KB installed)
- Seamless dnsmasq integration and fallback
- Optional LuCI Web UI with 40+ built-in resolvers
**Full documentation:**
[https://docs.openwrt.melmac.ca/https-dns-proxy/](https://docs.openwrt.melmac.ca/https-dns-proxy/)
Based on [@aarond10](https://github.com/aarond10)'s excellent [https_dns_proxy](https://github.com/aarond10/https_dns_proxy)

14
net/https-dns-proxy/files/etc/config/https-dns-proxy
View File

@@ -13,21 +13,21 @@ config main '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'
list procd_fw_src_interfaces 'lan' list force_dns_src_interface 'lan'
option procd_trigger_wan6 '0' option procd_trigger_wan6 '0'
option heartbeat_domain 'heartbeat.melmac.ca'
option heartbeat_sleep_timeout '10'
option heartbeat_wait_timeout '10'
option user 'nobody'
option group 'nogroup'
option listen_addr '127.0.0.1'
config https-dns-proxy config https-dns-proxy
option bootstrap_dns '1.1.1.1,1.0.0.1' option bootstrap_dns '1.1.1.1,1.0.0.1'
option resolver_url 'https://cloudflare-dns.com/dns-query' option resolver_url 'https://cloudflare-dns.com/dns-query'
option listen_addr '127.0.0.1'
option listen_port '5053' option listen_port '5053'
option user 'nobody'
option group 'nogroup'
config https-dns-proxy config https-dns-proxy
option bootstrap_dns '8.8.8.8,8.8.4.4' option bootstrap_dns '8.8.8.8,8.8.4.4'
option resolver_url 'https://dns.google/dns-query' option resolver_url 'https://dns.google/dns-query'
option listen_addr '127.0.0.1'
option listen_port '5054' option listen_port '5054'
option user 'nobody'
option group 'nogroup'

248
net/https-dns-proxy/files/etc/init.d/https-dns-proxy
View File

@@ -3,13 +3,13 @@
# shellcheck disable=SC1091,SC3043,SC3060 # shellcheck disable=SC1091,SC3043,SC3060
# shellcheck disable=SC2034 # shellcheck disable=SC2034
START=90 START=20
# shellcheck disable=SC2034 # shellcheck disable=SC2034
STOP=15 STOP=15
# shellcheck disable=SC2034 # shellcheck disable=SC2034
USE_PROCD=1 USE_PROCD=1
[ -n "${IPKG_INSTROOT}" ] && return 0 [ -n "${IPKG_INSTROOT}" ] && exit 0
if type extra_command 1>/dev/null 2>&1; then if type extra_command 1>/dev/null 2>&1; then
extra_command 'version' 'Show version information' extra_command 'version' 'Show version information'
@@ -30,15 +30,74 @@ readonly DEFAULT_BOOTSTRAP="${BOOTSTRAP_CF},${BOOTSTRAP_GOOGLE}"
readonly canaryDomainsMozilla='use-application-dns.net' readonly canaryDomainsMozilla='use-application-dns.net'
readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com' readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com'
# Silence "Command failed: Not found" for redundant procd service delete calls
__UBUS_BIN="$(command -v ubus || echo /bin/ubus)"
ubus() {
if [ "$1" = "call" ] && [ "$2" = "service" ] && [ "$3" = "delete" ]; then
"$__UBUS_BIN" "$@" >/dev/null 2>&1 || true
else
"$__UBUS_BIN" "$@"
fi
}
hdp_boot_flag= hdp_boot_flag=
dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 1; /etc/init.d/dnsmasq restart >/dev/null 2>&1; } # package global config variables
is_alnum() { case "$1" in (*[![:alnum:]_@]*|"") return 1;; esac; } canary_domains_icloud=
canary_domains_mozilla=
dnsmasq_config_update=
force_dns=
force_dns_port=
force_dns_src_interface=
procd_trigger_wan6=
global_listen_addr=
global_tcp_client_limit=
global_polling_interval=
global_proxy_server=
global_force_http1=
global_force_http3=
global_force_ipv6=
global_max_idle_time=
global_conn_loss_time=
global_ca_certs_file=
global_user=
global_group=
global_verbosity=
global_logfile=
global_statistic_interval=
global_log_limit=
dnsmasq_restart() { /etc/init.d/dnsmasq restart >/dev/null 2>&1; }
is_alnum() { case "$1" in (*[![:alnum:]_\ @]*|"") return 1;; esac; }
is_fw4_restart_needed() { [ "$(uci_get "$packageName" 'config' 'force_dns' '1')" = '1' ]; } is_fw4_restart_needed() { [ "$(uci_get "$packageName" 'config' 'force_dns' '1')" = '1' ]; }
is_mac_address() { expr "$1" : '[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]$' >/dev/null; } is_mac_address() { expr "$1" : '[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]$' >/dev/null; }
is_integer() { case "$1" in ''|*[!0-9]*) return 1;; esac; [ "$1" -ge 1 ] && [ "$1" -le 65535 ] || return 1; return 0; }
is_ipv4() { expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' >/dev/null; } is_ipv4() { expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' >/dev/null; }
is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; } is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; }
is_resolver_working() { resolveip -t 3 one.one.one.one >/dev/null 2>&1; } is_port_listening() {
local hex
is_integer "$1" || return 1
hex="$(printf '%04X' "$1")"
# TCP: state 0A == LISTEN
if awk -v h="$hex" 'NR>1{split($2,a,":"); if (toupper(a[2])==h && $4=="0A") {found=1}} END{exit found?0:1}' /proc/net/tcp /proc/net/tcp6 2>/dev/null; then
return 0
fi
# UDP: presence indicates a bound socket
if awk -v h="$hex" 'NR>1{split($2,a,":"); if (toupper(a[2])==h) {found=1}} END{exit found?0:1}' /proc/net/udp /proc/net/udp6 2>/dev/null; then
return 0
fi
return 1
}
is_resolver_working() {
local heartbeat_domain heartbeat_sleep_timeout heartbeat_wait_timeout
config_load "$packageName"
config_get heartbeat_domain 'config' 'heartbeat_domain' 'heartbeat.melmac.ca'
config_get heartbeat_sleep_timeout 'config' 'heartbeat_sleep_timeout' '10'
config_get heartbeat_wait_timeout 'config' 'heartbeat_wait_timeout' '30'
[ "$heartbeat_domain" = '-' ] && return 0
is_integer "$heartbeat_sleep_timeout" && sleep "$heartbeat_sleep_timeout"
resolveip -t "$heartbeat_wait_timeout" "$heartbeat_domain" >/dev/null 2>&1
}
output() { output() {
[ -z "$verbosity" ] && verbosity="$(uci_get "$packageName" 'config' 'verbosity' '1')" [ -z "$verbosity" ] && verbosity="$(uci_get "$packageName" 'config' 'verbosity' '1')"
[ "$#" -ne '1' ] && { [ "$#" -ne '1' ] && {
@@ -55,7 +114,7 @@ output_ok() { output "$_OK_"; }
output_okn() { output "${_OK_}\\n"; } output_okn() { output "${_OK_}\\n"; }
output_fail() { output "$_FAIL_"; } output_fail() { output "$_FAIL_"; }
output_failn() { output "${_FAIL_}\\n"; } output_failn() { output "${_FAIL_}\\n"; }
str_contains() { [ -n "$1" ] &&[ -n "$2" ] && [ "${1//$2}" != "$1" ]; } str_contains() { [ "${1//$2}" != "$1" ]; }
str_contains_word() { echo "$1" | grep -qw "$2"; } str_contains_word() { echo "$1" | grep -qw "$2"; }
uci_add_list_if_new() { uci_add_list_if_new() {
local PACKAGE="$1" local PACKAGE="$1"
@@ -73,7 +132,8 @@ uci_changes() {
local PACKAGE="$1" local PACKAGE="$1"
local CONFIG="$2" local CONFIG="$2"
local OPTION="$3" local OPTION="$3"
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" [ -s "${UCI_CONFIG_DIR:-/etc/config/}${PACKAGE}" ] && \
[ -n "$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}")" ]
} }
version() { echo "$PKG_VERSION"; } version() { echo "$PKG_VERSION"; }
@@ -94,12 +154,13 @@ append_parm() {
local option="$2" local option="$2"
local switch="$3" local switch="$3"
local default="$4" local default="$4"
local skip_value="$5"
local _loctmp local _loctmp
config_get _loctmp "$section" "$option" "$default" config_get _loctmp "$section" "$option" "$default"
[ -n "$_loctmp" ] && xappend "$switch $_loctmp" [ -n "$_loctmp" ] && [ "$_loctmp" != "$skip_value" ] && xappend "$switch $_loctmp"
} }
append_counter() { append_cnt() {
local section="$1" local section="$1"
local option="$2" local option="$2"
local switch="$3" local switch="$3"
@@ -112,7 +173,7 @@ append_counter() {
done done
} }
append_bootstrap() { append_boot() {
local section="$1" local section="$1"
local option="$2" local option="$2"
local switch="$3" local switch="$3"
@@ -123,48 +184,84 @@ append_bootstrap() {
[ -z "$_loctmp" ] && return 0 [ -z "$_loctmp" ] && return 0
IFS=" ," IFS=" ,"
for i in $_loctmp; do for i in $_loctmp; do
if { [ "$ipv6_resolvers_only" -eq 0 ] && is_ipv4 "$i"; } || \ if { [ -z "$force_ipv6" ] && is_ipv4 "$i"; } || \
{ [ "$ipv6_resolvers_only" -ne 0 ] && is_ipv6 "$i"; }; then { [ -n "$force_ipv6" ] && is_ipv6 "$i"; }; then
[ -z "$_newtmp" ] && _newtmp="$i" || _newtmp="${_newtmp},${i}" [ -z "$_newtmp" ] && _newtmp="$i" || _newtmp="${_newtmp},${i}"
fi fi
done done
IFS="$_old_ifs" IFS="$_old_ifs"
[ -n "$_newtmp" ] && xappend "$switch $_newtmp" [ -n "$_newtmp" ] && xappend "$switch $_newtmp"
[ "$ipv6_resolvers_only" -eq 0 ] && xappend '-4' [ -z "$force_ipv6" ] && xappend '-4'
} }
boot() { boot() {
# ubus -t 30 wait_for network.interface 2>/dev/null
rc_procd start_service 'on_boot' && service_started 'on_boot' rc_procd start_service 'on_boot' && service_started 'on_boot'
if ! is_resolver_working; then }
hdp_boot_flag=1
rc_procd stop_service 'on_failed_health_check' && service_stopped 'on_failed_health_check' load_package_config() {
fi local param="$1"
config_load "$packageName"
config_load "$packageName"
config_get_bool canary_domains_icloud 'config' 'canary_domains_icloud' '1'
config_get_bool canary_domains_mozilla 'config' 'canary_domains_mozilla' '1'
config_get_bool force_dns 'config' 'force_dns' '1'
config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'
config_get_bool global_force_http1 'config' 'force_http1' '0'
config_get_bool global_force_http3 'config' 'force_http3' '0'
config_get_bool global_force_ipv6 'config' 'global_force_ipv6_resolvers' '0'
config_get dnsmasq_config_update 'config' 'dnsmasq_config_update' '*'
config_get force_dns_port 'config' 'force_dns_port' '53 853'
config_get force_dns_src_interface 'config' 'force_dns_src_interface' 'lan'
config_get global_listen_addr 'config' 'listen_addr' '127.0.0.1'
config_get global_tcp_client_limit 'config' 'tcp_client_limit' '20'
config_get global_polling_interval 'config' 'polling_interval' '120'
config_get global_proxy_server 'config' 'proxy_server'
config_get global_max_idle_time 'config' 'max_idle_time' '118'
config_get global_conn_loss_time 'config' 'conn_loss_time' '15'
config_get global_ca_certs_file 'config' 'ca_certs_file'
config_get global_user 'config' 'user' 'nobody'
config_get global_group 'config' 'group' 'nogroup'
config_get global_verbosity 'config' 'verbosity' '0'
config_get global_logfile 'config' 'logfile'
config_get global_statistic_interval 'config' 'statistic_interval' '0'
config_get global_log_limit 'config' 'log_limit' '0'
[ "$canary_domains_icloud" = '1' ] && canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsiCloud}"
[ "$canary_domains_mozilla" = '1' ] && canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsMozilla}"
[ "$force_dns" = '1' ] || unset force_dns
[ "$procd_trigger_wan6" = '1' ] || unset procd_trigger_wan6
} }
start_instance() { start_instance() {
local cfg="$1" param="$2" local cfg="$1" param="$2"
local PROG_param local PROG_param
local listen_addr listen_port ipv6_resolvers_only p url iface local listen_addr listen_port force_ipv6 p url iface
config_get url "$cfg" 'resolver_url' config_get url "$cfg" 'resolver_url'
config_get_bool ipv6_resolvers_only "$cfg" 'use_ipv6_resolvers_only' '0' config_get listen_addr "$cfg" 'listen_addr' "$global_listen_addr"
append_parm "$cfg" 'resolver_url' '-r' config_get listen_port "$cfg" 'listen_port' "$port"
append_parm "$cfg" 'listen_addr' '-a' '127.0.0.1' config_get_bool force_ipv6 "$cfg" 'force_ipv6_resolvers' "$global_force_ipv6"
append_parm "$cfg" 'listen_port' '-p' "$port" [ "$force_ipv6" = '1' ] || unset force_ipv6
append_parm "$cfg" 'dscp_codepoint' '-c'
append_bootstrap "$cfg" 'bootstrap_dns' '-b' "$DEFAULT_BOOTSTRAP" append_parm "$cfg" 'resolver_url' '-r'
append_parm "$cfg" 'user' '-u' 'nobody' append_parm "$cfg" 'listen_addr' '-a' "$global_listen_addr" '127.0.0.1'
append_parm "$cfg" 'group' '-g' 'nogroup' append_parm "$cfg" 'listen_port' '-p' "$port"
append_parm "$cfg" 'ca_certs_file' '-C' append_boot "$cfg" 'bootstrap_dns' '-b' "$DEFAULT_BOOTSTRAP"
append_parm "$cfg" 'polling_interval' '-i' append_parm "$cfg" 'dscp_codepoint' '-c'
append_parm "$cfg" 'proxy_server' '-t' append_parm "$cfg" 'tcp_client_limit' '-T' "$global_tcp_client_limit" '20'
append_parm "$cfg" 'logfile' '-l' append_parm "$cfg" 'polling_interval' '-i' "$global_polling_interval" '120'
append_bool "$cfg" 'use_http1' '-x' append_parm "$cfg" 'proxy_server' '-t' "$global_proxy_server"
append_counter "$cfg" 'verbosity' '-v' '0' append_bool "$cfg" 'force_http1' '-x' "$global_force_http1"
append_bool "$cfg" 'force_http3' '-q' "$global_force_http3"
append_parm "$cfg" 'max_idle_time' '-m' "$global_max_idle_time" '118'
append_parm "$cfg" 'conn_loss_time' '-L' "$global_conn_loss_time" '15'
append_parm "$cfg" 'ca_certs_file' '-C' "$global_ca_certs_file"
append_parm "$cfg" 'user' '-u' "$global_user"
append_parm "$cfg" 'group' '-g' "$global_group"
append_parm "$cfg" 'logfile' '-l' "$global_logfile"
append_parm "$cfg" 'statistic_interval' '-s' "$global_statistic_interval" '0'
append_parm "$cfg" 'log_limit' '-F' "$global_log_limit" '0'
append_cnt "$cfg" 'verbosity' '-v' "$global_verbosity"
config_get listen_addr "$cfg" 'listen_addr' '127.0.0.1'
config_get listen_port "$cfg" 'listen_port' "$port"
if [ "$dnsmasq_config_update" = '*' ]; then if [ "$dnsmasq_config_update" = '*' ]; then
config_load 'dhcp' config_load 'dhcp'
config_foreach dnsmasq_doh_server 'dnsmasq' 'add' "${listen_addr}" "${listen_port}" config_foreach dnsmasq_doh_server 'dnsmasq' 'add' "${listen_addr}" "${listen_port}"
@@ -186,13 +283,13 @@ start_instance() {
procd_set_param respawn procd_set_param respawn
procd_open_data procd_open_data
json_add_object mdns json_add_object mdns
procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy" procd_add_mdns_service "$packageName" 'udp' "$listen_port" "DNS over HTTPS proxy"
json_close_object json_close_object
if [ "$force_dns" -ne '0' ]; then if [ -n "$force_dns" ]; then
json_add_array firewall json_add_array firewall
for iface in ${procd_fw_src_interfaces/,/ }; do for iface in ${force_dns_src_interface//,/ }; do
for p in ${force_dns_port/,/ }; do for p in ${force_dns_port//,/ }; do
if netstat -tuln | grep 'LISTEN' | grep ":${p}" >/dev/null 2>&1 || [ "$p" = '53' ]; then if is_port_listening "$p"; then
json_add_object '' json_add_object ''
json_add_string type 'redirect' json_add_string type 'redirect'
json_add_string target 'DNAT' json_add_string target 'DNAT'
@@ -216,7 +313,7 @@ start_instance() {
done done
done done
json_close_array json_close_array
force_dns='0' unset force_dns
fi fi
procd_close_data procd_close_data
procd_close_instance procd_close_instance
@@ -232,30 +329,19 @@ start_instance() {
start_service() { start_service() {
local param="$1" local param="$1"
local canaryDomains canary_domains_icloud canary_domains_mozilla local canaryDomains
local dnsmasq_config_update force_dns force_dns_port local force_dns="$force_dns"
local procd_fw_src_interfaces
local port=5053 local port=5053
[ "$param" = 'on_boot' ] && hdp_boot_flag='true' && return 0
output "Starting $serviceName instances ${param:+$param }" output "Starting $serviceName instances ${param:+$param }"
config_load "$packageName" load_package_config "$param"
config_get_bool canary_domains_icloud 'config' 'canary_domains_icloud' '1'
config_get_bool canary_domains_mozilla 'config' 'canary_domains_mozilla' '1'
config_get_bool force_dns 'config' 'force_dns' '1'
config_get dnsmasq_config_update 'config' 'dnsmasq_config_update' '*'
config_get force_dns_port 'config' 'force_dns_port' '53 853'
config_get procd_fw_src_interfaces 'config' 'procd_fw_src_interfaces' 'lan'
if [ "$canary_domains_icloud" -ne 0 ]; then
canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsiCloud}"
fi
if [ "$canary_domains_mozilla" -ne 0 ]; then
canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsMozilla}"
fi
dhcp_backup 'create' dhcp_backup 'create'
config_load "$packageName" config_load "$packageName"
config_foreach start_instance "$packageName" "$param" config_foreach start_instance "$packageName" "$param"
output "\\n" output "\\n"
if [ -n "$(uci_changes dhcp)" ]; then if uci_changes 'dhcp'; then
output "Updating dnsmasq config " output "Updating dnsmasq config "
if uci_commit 'dhcp'; then if uci_commit 'dhcp'; then
output_okn output_okn
@@ -274,63 +360,53 @@ start_service() {
fi fi
;; ;;
esac esac
# if ! is_resolver_working; then
# rc_procd stop_service 'on_failed_health_check' && service_stopped 'on_failed_health_check'
# fi
} }
stop_service() { stop_service() {
local param="$1" local param="$1"
local canaryDomains canary_domains_icloud canary_domains_mozilla local canaryDomains
local dnsmasq_config_update local _error=
local s=0
output "Stopping $serviceName ${param:+$param }" output "Stopping $serviceName ${param:+$param }"
config_load "$packageName" load_package_config "$param"
config_get dnsmasq_config_update 'config' 'dnsmasq_config_update' '*'
config_get_bool canary_domains_icloud 'config' 'canary_domains_icloud' '1'
config_get_bool canary_domains_mozilla 'config' 'canary_domains_mozilla' '1'
if [ "$canary_domains_icloud" -ne 0 ]; then
canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsiCloud}"
fi
if [ "$canary_domains_mozilla" -ne 0 ]; then
canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsMozilla}"
fi
dhcp_backup 'restore' dhcp_backup 'restore'
if [ -n "$(uci_changes dhcp)" ]; then if uci_changes 'dhcp'; then
uci_commit 'dhcp' uci_commit 'dhcp'
dnsmasq_restart || s=1 dnsmasq_restart || _error=1
fi fi
# shellcheck disable=SC2015 # shellcheck disable=SC2015
[ "$s" = '0' ] && output_okn || output_failn [ -z "$_error" ] && output_okn || output_failn
} }
# shellcheck disable=SC2015 # shellcheck disable=SC2015
service_triggers() { service_triggers() {
local wan wan6 i local wan wan6 i
local procd_trigger_wan6
if [ -n "$hdp_boot_flag" ]; then if [ -n "$hdp_boot_flag" ]; then
output "Setting trigger (on_boot) " output "Setting trigger (on_boot) "
procd_add_raw_trigger "interface.*.up" 5000 "/etc/init.d/${packageName}" restart 'on_interface_up' && output_okn || output_failn procd_add_raw_trigger "interface.*.up" 5000 "/etc/init.d/${packageName}" reload 'on_interface_up' && output_okn || output_failn
else else
config_load "$packageName" . "${IPKG_INSTROOT}/lib/functions/network.sh"
config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'
. /lib/functions/network.sh
network_flush_cache network_flush_cache
network_find_wan wan network_find_wan wan
wan="${wan:-wan}" wan="${wan:-wan}"
if [ "$procd_trigger_wan6" -ne 0 ]; then if [ -n "$procd_trigger_wan6" ]; then
network_find_wan6 wan6 network_find_wan6 wan6
wan6="${wan6:-wan6}" wan6="${wan6:-wan6}"
fi fi
output "Setting trigger${wan6:+s} for $wan ${wan6:+$wan6 }" output "Setting trigger${wan6:+s} for $wan ${wan6:+$wan6 }"
for i in $wan $wan6; do for i in $wan $wan6; do
procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" restart 'on_interface_trigger' && output_ok || output_fail procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" reload 'on_interface_trigger' && output_ok || output_fail
done done
output '\n' output '\n'
procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload 'on_config_change' procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload 'on_config_change'
fi fi
} }
service_started() { is_fw4_restart_needed && procd_set_config_changed firewall; } service_started() { [ -n "$force_dns" ] && procd_set_config_changed firewall; }
service_stopped() { is_fw4_restart_needed && procd_set_config_changed firewall; } service_stopped() { [ -n "$force_dns" ] && procd_set_config_changed firewall; }
restart() { procd_send_signal "$packageName"; rc_procd start_service "$*"; } restart() { reload "$@"; }
dnsmasq_instance_append_force_dns_port() { dnsmasq_instance_append_force_dns_port() {
local cfg="$1" instance_port local cfg="$1" instance_port
@@ -343,7 +419,7 @@ dnsmasq_doh_server() {
local cfg="$1" param="$2" address="${3:-127.0.0.1}" port="$4" i local cfg="$1" param="$2" address="${3:-127.0.0.1}" port="$4" i
case "$param" in case "$param" in
add) add)
if [ "$force_dns" -ne 0 ]; then if [ -n "$force_dns" ]; then
for i in $canaryDomains; do for i in $canaryDomains; do
uci_add_list_if_new 'dhcp' "$cfg" 'server' "/${i}/" uci_add_list_if_new 'dhcp' "$cfg" 'server' "/${i}/"
done done

9
net/https-dns-proxy/files/etc/uci-defaults/50-https-dns-proxy-migrate-options.sh
View File

@@ -1,3 +1,8 @@
#!/bin/sh #!/bin/sh
sed -i "s|update_dnsmasq_config|dnsmasq_config_update|" "/etc/config/https-dns-proxy"
sed -i "s|wan6_trigger|procd_trigger_wan6|" "/etc/config/https-dns-proxy"
sed -i "s|update_dnsmasq_config|dnsmasq_config_update|" "/etc/config/https-dns-proxy"
sed -i "s|wan6_trigger|procd_trigger_wan6|" "/etc/config/https-dns-proxy"
sed -i "s|procd_fw_src_interfaces|force_dns_src_interface|" "/etc/config/https-dns-proxy"
sed -i "s|use_http1|force_http1|" "/etc/config/https-dns-proxy"
sed -i "s|use_ipv6_resolvers_only|force_ipv6_resolvers|" "/etc/config/https-dns-proxy"

15
net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch
View File

@@ -1,15 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,9 @@ if (NOT CMAKE_INSTALL_BINDIR)
set(CMAKE_INSTALL_BINDIR bin)
endif()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
-set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
-set(CMAKE_C_FLAGS_RELEASE "-O2")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
+#set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
+#set(CMAKE_C_FLAGS_RELEASE "-O2")
if ((CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR
(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10))