https-dns-proxy: update to 2023-05-25-2

bugfix: proper mdns object creation
bugfix: prevent fw errors by allowing custom interfaces in config

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a31640ac7cfab78c75808e22fc7fc2da48bd8e7f)

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index af172e4afe17d41c00c6034eadff4246c8881b77..ce7d70eeb04ee8e58cbe06d1bdc4e0fb6730b840 100644 (file)
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https-dns-proxy
 PKG_VERSION:=2023-05-25
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/

diff --git a/net/https-dns-proxy/files/https-dns-proxy.init b/net/https-dns-proxy/files/https-dns-proxy.init
index 1495592e0f576b8d6b9f3dba582ddd347ecd293f..d63dad9c56be211cbef91c0b02b13d9df6fd3b93 100755 (executable)
--- a/net/https-dns-proxy/files/https-dns-proxy.init
+++ b/net/https-dns-proxy/files/https-dns-proxy.init
@@ -133,7 +133,7 @@ boot() {
 }
 
 start_instance() {
-       local cfg="$1" param listen_addr listen_port ipv6_resolvers_only p url
+       local cfg="$1" param listen_addr listen_port ipv6_resolvers_only p url iface
 
        config_get url "$cfg" 'resolver_url'
        config_get_bool ipv6_resolvers_only "$cfg" 'use_ipv6_resolvers_only' '0'
@@ -158,32 +158,36 @@ start_instance() {
        procd_set_param stdout 1
        procd_set_param respawn
        procd_open_data
-       procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy"
+       json_add_object mdns
+               procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy"
+       json_close_object
        json_add_string url "$url"
        if [ "$force_dns" -ne 0 ]; then
                json_add_array firewall
-               for p in $force_dns_port; do
-                       if netstat -tuln | grep 'LISTEN' | grep ":${p}" >/dev/null 2>&1 || [ "$p" = '53' ]; 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 "$p"
-                               json_add_string dest_port "$p"
-                               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 "$p"
-                               json_add_string target REJECT
-                               json_close_object
-                       fi
+               for iface in $procd_fw_src_interfaces; do
+                       for p in $force_dns_port; do
+                               if netstat -tuln | grep 'LISTEN' | grep ":${p}" >/dev/null 2>&1 || [ "$p" = '53' ]; then
+                                       json_add_object ''
+                                       json_add_string type redirect
+                                       json_add_string target DNAT
+                                       json_add_string src "$iface"
+                                       json_add_string proto 'tcp udp'
+                                       json_add_string src_dport "$p"
+                                       json_add_string dest_port "$p"
+                                       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 "$iface"
+                                       json_add_string dest '*'
+                                       json_add_string proto 'tcp udp'
+                                       json_add_string dest_port "$p"
+                                       json_add_string target REJECT
+                                       json_close_object
+                               fi
+                       done
                done
                json_close_array
        fi
@@ -216,14 +220,17 @@ start_instance() {
 start_service() {
        local canaryDomains canary_domains_icloud canary_domains_mozilla
        local dnsmasq_config_update force_dns force_dns_port 
+       local procd_fw_src_interfaces
+
        local port=5053
        output "Starting $serviceName "
        config_load "$packageName"
-       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'
-       config_get_bool force_dns                     'config' 'force_dns' '1'
-       config_get force_dns_port                     'config' 'force_dns_port' '53 853'
+       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