From 87abb0e334bd5cc47880d63d0bb10ad2f9bfb393 Mon Sep 17 00:00:00 2001 From: gSpot Date: Thu, 14 Oct 2021 22:43:01 +0300 Subject: [PATCH] ruantiblock: Minor fixes. autoinstall.sh: Dnsmasq rebind protection for .onion. --- autoinstall/autoinstall.sh | 3 +++ packages/19.07/ruantiblock_0.9.0-2_all.ipk | Bin 12026 -> 12030 bytes ruantiblock/files/usr/bin/ruantiblock | 2 +- tor/etc/tor/torrc | 6 ++---- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh index b1ec90b..5869b4d 100755 --- a/autoinstall/autoinstall.sh +++ b/autoinstall/autoinstall.sh @@ -222,6 +222,9 @@ InstallTorConfig() { _if_lan="eth0" fi $UCI_CMD set ruantiblock.config.if_lan="$_if_lan" + # dnsmasq rebind protection + $UCI_CMD set dhcp.@dnsmasq[0].rebind_localhost='1' + $UCI_CMD set dhcp.@dnsmasq[0].rebind_domain='.onion' $UCI_CMD commit } diff --git a/packages/19.07/ruantiblock_0.9.0-2_all.ipk b/packages/19.07/ruantiblock_0.9.0-2_all.ipk index 00e9bdc11d908da0d55341ee1d171ffb246cc1fa..c8c4893f90c07a08db0dcb4783176fa9257a6bfc 100644 GIT binary patch literal 12030 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 literal 12026 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 YUw{4e*I$4A^?&WZ0i8VEnE+4#0Ow_d)&Kwi diff --git a/ruantiblock/files/usr/bin/ruantiblock b/ruantiblock/files/usr/bin/ruantiblock index 509d439..7f4a651 100755 --- a/ruantiblock/files/usr/bin/ruantiblock +++ b/ruantiblock/files/usr/bin/ruantiblock @@ -446,7 +446,7 @@ GetDataFiles() { printf "\n" >> "$DNSMASQ_DATA_FILE" else ### Запись для .onion в $DNSMASQ_DATA_FILE - printf "server=/onion/%s\nipset=/onion/%s\n" "${ONION_DNS_ADDR}" "${IPSET_ONION}" >> "$DNSMASQ_DATA_FILE" + printf "server=/.onion/%s\nipset=/.onion/%s\n" "${ONION_DNS_ADDR}" "${IPSET_ONION}" >> "$DNSMASQ_DATA_FILE" fi rm -f "$UPDATE_PID_FILE" return $_return_code diff --git a/tor/etc/tor/torrc b/tor/etc/tor/torrc index 0f87133..e46acd5 100644 --- a/tor/etc/tor/torrc +++ b/tor/etc/tor/torrc @@ -1,12 +1,10 @@ -User admin -PidFile /var/run/tor.pid +User tor DataDirectory /var/lib/tor VirtualAddrNetwork 10.254.0.0/16 AutomapHostsOnResolve 1 TransPort 192.168.1.1:9040 TransPort 127.0.0.1:9040 -DNSPort 9053 -DNSListenAddress 127.0.0.1 +DNSPort 127.0.0.1:9053 #SOCKSPort 192.168.1.1:9050 # Tor socks-proxy GeoIPFile /usr/share/tor/geoip GeoIPv6File /usr/share/tor/geoip6