zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "luci-app-passwall: sync upstream"

Browse Source 
This reverts commit b846fbeb5e.
This commit is contained in:
sbwml 2025-05-04 12:36:18 +08:00
parent b846fbeb5e
commit 7a52a4f353
5 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -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"})

6
luci-app-passwall/po/zh-cn/passwall.po
View File

@ -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 "你确定要隐藏吗？"

4
luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
View File

@ -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

3
luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
View File

@ -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
}

4
patch-luci-app-passwall.patch
View File

@ -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."))