From 7a52a4f35321b7db1870fe4ada2c91d684a3a954 Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 4 May 2025 12:36:18 +0800 Subject: [PATCH] Revert "luci-app-passwall: sync upstream" This reverts commit b846fbeb5e5b47c8b9822fd2fb288555f5a1fe4d. --- .../luasrc/model/cbi/passwall/client/global.lua | 8 -------- luci-app-passwall/po/zh-cn/passwall.po | 6 ------ .../root/usr/share/passwall/helper_chinadns_add.lua | 4 +--- .../root/usr/share/passwall/helper_smartdns_add.lua | 3 +-- patch-luci-app-passwall.patch | 4 ++-- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 4ff4fe270..5d01c8f8a 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -610,14 +610,6 @@ if api.is_finded("smartdns") then o:depends({dns_shunt = "smartdns", tcp_proxy_mode = "proxy", chn_list = "direct"}) end -o = s:taboption("DNS", Flag, "force_https_soa", translate("Force HTTPS SOA"), translate("Force queries with qtype 65 to respond with an SOA record.")) -o.default = "1" -o.rmempty = false -o:depends({dns_shunt = "chinadns-ng"}) -if api.is_finded("smartdns") then - o:depends({dns_shunt = "smartdns"}) -end - o = s:taboption("DNS", Flag, "chinadns_ng_cert_verify", translate("DoT Cert verify"), translate("Verify DoT SSL cert. (May fail on some platforms!)")) o.default = "0" o:depends({direct_dns_mode = "dot"}) diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 77679a1c8..aaeca1528 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -241,12 +241,6 @@ msgstr "验证 DoT SSL 证书。（在某些平台可能无法验证，谨慎开 msgid "Try this feature if the rule modification does not take effect." msgstr "如果修改规则后没有生效，请尝试此功能。" -msgid "Force HTTPS SOA" -msgstr "停用 HTTPS 记录解析" - -msgid "Force queries with qtype 65 to respond with an SOA record." -msgstr "强制使 qtype 65 查询返回 SOA。" - msgid "Are you sure to hide?" msgstr "你确定要隐藏吗？" diff --git a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua index 2ea4164e7..ce687a4f9 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua @@ -106,15 +106,13 @@ local setflag = (NFTFLAG == "1") and "inet@passwall@" or "" local only_global = (DEFAULT_MODE == "proxy" and CHNLIST == "0" and GFWLIST == "0") and 1 -local force_https_soa = uci:get(appname, "@global[0]", "force_https_soa") or 1 - config_lines = { LOG_FILE ~= "/dev/null" and "verbose" or "", "bind-addr ::", "bind-port " .. LISTEN_PORT, "china-dns " .. DNS_LOCAL, "trust-dns " .. DNS_TRUST, - tonumber(force_https_soa) == 1 and "filter-qtype 65" or "" + "filter-qtype 65" } for i = 1, 6 do diff --git a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua index c07a185fd..97591ea8f 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua @@ -160,10 +160,9 @@ if not REMOTE_GROUP or REMOTE_GROUP == "nil" then sys.call('sed -i "/passwall/d" /etc/smartdns/custom.conf >/dev/null 2>&1') end -local force_https_soa = uci:get(appname, "@global[0]", "force_https_soa") or 1 local proxy_server_name = "passwall-proxy-server" config_lines = { - tonumber(force_https_soa) == 1 and "force-qtype-SOA 65" or "force-qtype-SOA -65", + "force-qtype-SOA 65", "server 114.114.114.114 -bootstrap-dns", DNS_MODE == "socks" and string.format("proxy-server socks5://%s -name %s", REMOTE_PROXY_SERVER, proxy_server_name) or nil } diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 3d401d2f5..eefd996db 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,7 +20,7 @@ index b0a2282..bab556b 100644 define Package/$(PKG_NAME)/postrm diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua -index 175a7e6..4ff4fe2 100644 +index 9672c44..5d01c8f 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -506,6 +506,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") @@ -36,7 +36,7 @@ index 175a7e6..4ff4fe2 100644 o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "tcp"}) o:depends({dns_mode = "udp"}) -@@ -618,7 +624,7 @@ o:depends({direct_dns_mode = "dot"}) +@@ -610,7 +616,7 @@ o:depends({direct_dns_mode = "dot"}) o:depends({dns_mode = "dot"}) o = s:taboption("DNS", Flag, "dns_redirect", translate("DNS Redirect"), translate("Force special DNS server to need proxy devices."))