From 3d8c244bfbea1f3ffec24c5bfb679ba8d2d48d97 Mon Sep 17 00:00:00 2001 From: private <2519840456@qq.com> Date: Fri, 18 Jul 2025 00:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20patch-luci-app-passwall.pa?= =?UTF-8?q?tch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: private <2519840456@qq.com> --- patch-luci-app-passwall.patch | 471 ++++++++++++++++++++++++++++++++++ 1 file changed, 471 insertions(+) create mode 100644 patch-luci-app-passwall.patch diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch new file mode 100644 index 0000000..5bc55a9 --- /dev/null +++ b/patch-luci-app-passwall.patch @@ -0,0 +1,471 @@ +diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile +index 2568ff2..8f11744 100644 +--- a/luci-app-passwall/Makefile ++++ b/luci-app-passwall/Makefile +@@ -68,7 +68,7 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy + config PACKAGE_$(PKG_NAME)_INCLUDE_Geoview + bool "Include Geoview" + select PACKAGE_geoview +- default y if aarch64||arm||i386||x86_64 ++ default n + + config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy + bool "Include Haproxy" +@@ -184,7 +184,6 @@ define Package/$(PKG_NAME)/conffiles + /usr/share/passwall/rules/lanlist_ipv4 + /usr/share/passwall/rules/lanlist_ipv6 + /usr/share/passwall/rules/domains_excluded +-/www/luci-static/resources/qrcode.min.js + endef + + define Package/$(PKG_NAME)/postrm +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua +index 9d5edc7..d825e87 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua +@@ -3,7 +3,6 @@ local appname = "passwall" + local sys = api.sys + + m = Map(appname) +-api.set_apply_on_parse(m) + + s = m:section(TypedSection, "global", translate("ACLs"), "" .. translate("ACLs is a tools which used to designate specific IP proxy mode.") .. "") + s.anonymous = true +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +index 41b2e2b..c255149 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +@@ -2,11 +2,9 @@ local api = require "luci.passwall.api" + local appname = "passwall" + + m = Map(appname) +-m.redirect = api.url("acl") +-api.set_apply_on_parse(m) + + if not arg[1] or not m:get(arg[1]) then +- luci.http.redirect(m.redirect) ++ luci.http.redirect(api.url("acl")) + end + + local fs = api.fs +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua +index b39d6df..d105b3f 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua +@@ -2,7 +2,6 @@ local api = require "luci.passwall.api" + local appname = "passwall" + + m = Map(appname) +-api.set_apply_on_parse(m) + + -- [[ App Settings ]]-- + s = m:section(TypedSection, "global_app", translate("App Update"), +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 93ba2b8..6cb5892 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +@@ -10,7 +10,6 @@ local has_chnroute = fs.access("/usr/share/passwall/rules/chnroute") + local chinadns_tls = os.execute("chinadns-ng -V | grep -i wolfssl >/dev/null") + + m = Map(appname) +-api.set_apply_on_parse(m) + + local nodes_table = {} + for k, e in ipairs(api.get_valid_nodes()) do +@@ -512,6 +511,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") + o:value("149.112.112.112", "149.112.112.112 (Quad9)") + o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") + o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") ++if nixio.fs.access("/usr/share/mosdns/mosdns.sh") then ++ local mosdns_port = string.gsub(luci.sys.exec("uci -q get mosdns.config.listen_port"), "\n", "") ++ if mosdns_port ~= nil and result ~= "" then ++ o:value("127.0.0.1:" .. mosdns_port, "127.0.0.1:" .. mosdns_port .. " (MosDNS)") ++ end ++end + o:depends({dns_mode = "dns2socks"}) + o:depends({dns_mode = "tcp"}) + o:depends({dns_mode = "udp"}) +@@ -623,7 +628,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.")) +-o.default = "1" ++o.default = "0" + o.rmempty = false + + if (m:get("@global_forwarding[0]", "use_nft") or "0") == "1" then +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua +index 8be9f27..4c6b3f2 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua +@@ -15,7 +15,6 @@ for k, e in ipairs(api.get_valid_nodes()) do + end + + m = Map(appname) +-api.set_apply_on_parse(m) + + -- [[ Haproxy Settings ]]-- + s = m:section(TypedSection, "global_haproxy", translate("Basic Settings")) +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +index 31c6d12..b6a3511 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +@@ -2,11 +2,10 @@ local api = require "luci.passwall.api" + local appname = "passwall" + + m = Map(appname, translate("Node Config")) +-m.redirect = api.url("node_list") +-api.set_apply_on_parse(m) ++m.redirect = api.url() + + if not arg[1] or not m:get(arg[1]) then +- luci.http.redirect(m.redirect) ++ luci.http.redirect(api.url("node_list")) + end + + s = m:section(NamedSection, arg[1], "nodes", "") +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua +index 0cd8ad9..5659632 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua +@@ -4,7 +4,6 @@ local sys = api.sys + local datatypes = api.datatypes + + m = Map(appname) +-api.set_apply_on_parse(m) + + -- [[ Other Settings ]]-- + s = m:section(TypedSection, "global_other") +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +index fa5dc57..57e5949 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +@@ -46,6 +46,10 @@ end + + m = Map(appname) + ++-- [[ Subscribe Settings ]]-- ++s = m:section(TypedSection, "global_subscribe", "") ++s.anonymous = true ++ + function m.commit_handler(self) + if self.no_commit then + return +@@ -55,21 +59,6 @@ function m.commit_handler(self) + end) + end + +-if api.is_js_luci() then +- m.apply_on_parse = false +- m.on_after_apply = function(self) +- uci:foreach(appname, "subscribe_list", function(e) +- uci:delete(appname, e[".name"], "md5") +- end) +- uci:commit(appname) +- api.showMsg_Redirect() +- end +-end +- +--- [[ Subscribe Settings ]]-- +-s = m:section(TypedSection, "global_subscribe", "") +-s.anonymous = true +- + o = s:option(ListValue, "filter_keyword_mode", translate("Filter keyword Mode")) + o:value("0", translate("Close")) + o:value("1", translate("Discard List")) +@@ -157,7 +146,6 @@ s.sortable = true + s.template = "cbi/tblsection" + s.extedit = api.url("node_subscribe_config", "%s") + function s.create(e, t) +- m.no_commit = true + local id = TypedSection.create(e, t) + luci.http.redirect(e.extedit:format(id)) + end +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +index 28b4e88..2f5c9c7 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +@@ -9,19 +9,6 @@ if not arg[1] or not m:get(arg[1]) then + luci.http.redirect(m.redirect) + end + +-function m.commit_handler(self) +- self:del(arg[1], "md5") +-end +- +-if api.is_js_luci() then +- m.apply_on_parse = false +- m.on_after_apply = function(self) +- uci:delete(appname, arg[1], "md5") +- uci:commit(appname) +- api.showMsg_Redirect(self.redirect, 3000) +- end +-end +- + local has_ss = api.is_finded("ss-redir") + local has_ss_rust = api.is_finded("sslocal") + local has_trojan_plus = api.is_finded("trojan-plus") +@@ -69,6 +56,10 @@ s = m:section(NamedSection, arg[1]) + s.addremove = false + s.dynamic = false + ++function m.commit_handler(self) ++ self:del(arg[1], "md5") ++end ++ + o = s:option(Value, "remark", translate("Subscribe Remark")) + o.rmempty = false + +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +index d4f45b7..85608a8 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +@@ -11,7 +11,6 @@ local port_validate = function(self, value, t) + end + + m = Map(appname) +-api.set_apply_on_parse(m) + + -- [[ Delay Settings ]]-- + s = m:section(TypedSection, "global_delay", translate("Delay Settings")) +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua +index f94caec..baeb996 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua +@@ -4,8 +4,6 @@ local has_xray = api.finded_com("xray") + local has_singbox = api.finded_com("sing-box") + + m = Map(appname) +-api.set_apply_on_parse(m) +- + -- [[ Rule Settings ]]-- + s = m:section(TypedSection, "global_rules", translate("Rule status")) + s.anonymous = true +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +index 6d4631f..2738beb 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +@@ -10,7 +10,6 @@ local chnlist_path = "/usr/share/passwall/rules/chnlist" + local chnroute_path = "/usr/share/passwall/rules/chnroute" + + m = Map(appname) +-api.set_apply_on_parse(m) + + function clean_text(text) + local nbsp = string.char(0xC2, 0xA0) -- 不间断空格（U+00A0） +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua +index f387d70..1571e63 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua +@@ -4,7 +4,6 @@ local datatypes = api.datatypes + + m = Map(appname, "Sing-Box/Xray " .. translate("Shunt Rule")) + m.redirect = api.url() +-api.set_apply_on_parse(m) + + function clean_text(text) + local nbsp = string.char(0xC2, 0xA0) -- 不间断空格（U+00A0） +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +index ffb269b..b20475e 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +@@ -2,11 +2,9 @@ local api = require "luci.passwall.api" + local appname = "passwall" + + m = Map(appname) +-m.redirect = api.url() +-api.set_apply_on_parse(m) + + if not arg[1] or not m:get(arg[1]) then +- luci.http.redirect(m.redirect) ++ luci.http.redirect(api.url()) + end + + local has_singbox = api.finded_com("sing-box") +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua +index d6ee932..625c024 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua +@@ -1,7 +1,6 @@ + local api = require "luci.passwall.api" + + m = Map("passwall_server", translate("Server-Side")) +-api.set_apply_on_parse(m) + + t = m:section(NamedSection, "global", "global") + t.anonymous = true +diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua +index a42a0ac..6affd2c 100644 +--- a/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua ++++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua +@@ -4,11 +4,6 @@ local types_dir = "/usr/lib/lua/luci/model/cbi/passwall/server/type/" + + m = Map("passwall_server", translate("Server Config")) + m.redirect = api.url("server") +-api.set_apply_on_parse(m) +- +-if not arg[1] or not m:get(arg[1]) then +- luci.http.redirect(m.redirect) +-end + + s = m:section(NamedSection, arg[1], "user", "") + s.addremove = false +diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua +index d73daac..3bc978d 100644 +--- a/luci-app-passwall/luasrc/passwall/api.lua ++++ b/luci-app-passwall/luasrc/passwall/api.lua +@@ -38,68 +38,6 @@ function is_old_uci() + return sys.call("grep -E 'require[ \t]*\"uci\"' /usr/lib/lua/luci/model/uci.lua >/dev/null 2>&1") == 0 + end + +-function set_apply_on_parse(map) +- if not map then +- return +- end +- if is_js_luci() then +- map.apply_on_parse = false +- map.on_after_apply = function(self) +- showMsg_Redirect(self.redirect, 3000) +- end +- end +-end +- +-function showMsg_Redirect(redirectUrl, delay) +- local message = "PassWall " .. i18n.translate("Settings have been successfully saved and applied!") +- luci.http.write([[ +- +- ]]) +-end +- + function uci_save(cursor, config, commit, apply) + if is_old_uci() then + cursor:save(config) +diff --git a/luci-app-passwall/luasrc/view/passwall/global/status.htm b/luci-app-passwall/luasrc/view/passwall/global/status.htm +index eb5527e..133c295 100644 +--- a/luci-app-passwall/luasrc/view/passwall/global/status.htm ++++ b/luci-app-passwall/luasrc/view/passwall/global/status.htm +@@ -1,5 +1,11 @@ + <% + local api = require "luci.passwall.api" ++local fs = require "nixio.fs" ++local uci = require 'luci.model.uci'.cursor() ++local mode = 'normal' ++if fs.access('/etc/config/argon') then ++ mode = uci:get_first('argon', 'global', 'mode') ++end + -%> + +