update 2026-08-14 20:53:13

This commit is contained in:
action committed 2026-08-14 20:53:13 +08:00
1 parent bbea37a7c8
commit 58e04d6ceb
1972 files changed
+1523368 -299

No files matched your search

@@ -7,23 +7,22 @@ require 'luci.util'
require 'luci.jsonc'
require 'luci.sys'
local api = require "luci.passwall2.api"
local appname = api.appname
local c_config = api.c_config
local datatypes = require "luci.cbi.datatypes"
local datatypes = api.datatypes
local split = api.split
local base64Decode = api.base64Decode
local jsonParse, jsonStringify = api.jsonc.parse, api.jsonc.stringify
local UrlEncode, UrlDecode = api.UrlEncode, api.UrlDecode
local fs = api.fs
local log = api.log
local i18n = api.i18n
local uci, uci_get, uci_set, uci_del, uci_foreach, uci_save = api.uci, api.uci_get_c, api.uci_set_c, api.uci_del_c, api.uci_foreach_c, api.uci_save_c
-- these global functions are accessed all the time by the event handler
-- so caching them is worth the effort
local tinsert = table.insert
local ssub, slen, schar, sbyte, sformat, sgsub = string.sub, string.len, string.char, string.byte, string.format, string.gsub
local split = api.split
local jsonParse, jsonStringify = luci.jsonc.parse, luci.jsonc.stringify
local base64Decode = api.base64Decode
local UrlEncode = api.UrlEncode
local UrlDecode = api.UrlDecode
local uci = api.uci
local fs = api.fs
local log = api.log
local i18n = api.i18n
local lyaml = require "lyaml"
local has_ss_rust = api.is_finded("sslocal")
@@ -32,9 +31,9 @@ local has_singbox = api.finded_com("sing-box")
local has_xray = api.finded_com("xray")
local has_hysteria2 = api.finded_com("hysteria")
local DEFAULT_ALLOWINSECURE = true
local DEFAULT_FILTER_KEYWORD_MODE = uci:get(c_config, "@global_subscribe[0]", "filter_keyword_mode") or "0"
local DEFAULT_FILTER_KEYWORD_DISCARD_LIST = uci:get(c_config, "@global_subscribe[0]", "filter_discard_list") or {}
local DEFAULT_FILTER_KEYWORD_KEEP_LIST = uci:get(c_config, "@global_subscribe[0]", "filter_keep_list") or {}
local DEFAULT_FILTER_KEYWORD_MODE = uci_get("@global_subscribe[0]", "filter_keyword_mode") or "0"
local DEFAULT_FILTER_KEYWORD_DISCARD_LIST = uci_get("@global_subscribe[0]", "filter_discard_list") or {}
local DEFAULT_FILTER_KEYWORD_KEEP_LIST = uci_get("@global_subscribe[0]", "filter_keep_list") or {}
-- Nodes should be retrieved using the core type (if not set on the node subscription page, the default type will be used automatically).
local DEFAULT_SS_TYPE = api.get_core("ss_type", {{has_ss_rust,"shadowsocks-rust"},{has_singbox,"sing-box"},{has_xray,"xray"}})
local DEFAULT_TROJAN_TYPE = api.get_core("trojan_type", {{has_singbox,"sing-box"},{has_xray,"xray"}})
@@ -131,13 +130,13 @@ do
local szType = "@global[0]"
local option = "node"
local node_id = uci:get(c_config, szType, option)
local node_id = uci_get(szType, option)
CONFIG[#CONFIG + 1] = {
log = true,
remarks = i18n.translatef("Node"),
currentNode = node_id and uci:get_all(c_config, node_id) or nil,
currentNode = node_id and uci_get(node_id) or nil,
set = function(o, server)
uci:set(c_config, szType, option, server)
uci_set(szType, option, server)
o.newNodeId = server
end
}
@@ -146,7 +145,7 @@ do
if true then
local i = 0
local option = "node"
uci:foreach(c_config, "socks", function(t)
uci_foreach("socks", function(t)
i = i + 1
local id = t[".name"]
local node_id = t[option]
@@ -154,14 +153,14 @@ do
log = true,
id = id,
remarks = i18n.translatef("Socks node list [%s]", i),
currentNode = node_id and uci:get_all(c_config, node_id) or nil,
currentNode = node_id and uci_get(node_id) or nil,
set = function(o, server)
if not server or server == "" then
if #nodes_table > 0 then
server = nodes_table[1][".name"]
end
end
uci:set(c_config, t[".name"], option, server)
uci_set(t[".name"], option, server)
o.newNodeId = server
end
}
@@ -171,7 +170,7 @@ do
local newNodes = {}
for k, asb_node_id in ipairs(t.autoswitch_backup_node) do
if asb_node_id then
local currentNode = uci:get_all(c_config, asb_node_id) or {}
local currentNode = uci_get(asb_node_id) or {}
if currentNode[".type"] == "nodes" then
currentNodes[#currentNodes + 1] = {
log = true,
@@ -193,7 +192,7 @@ do
set = function(o, newNodes)
if o then
if not newNodes then newNodes = o.newNodes end
uci:set_list(c_config, id, "autoswitch_backup_node", newNodes or {})
uci_set(id, "autoswitch_backup_node", newNodes or {})
end
end
}
@@ -209,25 +208,25 @@ do
local ip, port = str:match("^([%d%.]+):(%d+)$")
return ip and datatypes.ipaddr(ip) and tonumber(port) and tonumber(port) <= 65535
end
uci:foreach(c_config, "haproxy_config", function(t)
uci_foreach("haproxy_config", function(t)
i = i + 1
local node_id = t[option]
CONFIG[#CONFIG + 1] = {
log = true,
id = t[".name"],
remarks = i18n.translatef("HAProxy node list [%s]", i),
currentNode = node_id and uci:get_all(c_config, node_id) or nil,
currentNode = node_id and uci_get(node_id) or nil,
set = function(o, server)
-- Modify the LBS value only if it is not in IP:Port format.
if not is_ip_port(t[option]) then
uci:set(c_config, t[".name"], option, server)
uci_set(t[".name"], option, server)
o.newNodeId = server
end
end,
delete = function(o)
-- Deletion is only performed if the current LBS value is not in IP:port format.
if not is_ip_port(t[option]) then
uci:delete(c_config, t[".name"])
uci_del(t[".name"])
end
end
}
@@ -236,7 +235,7 @@ do
if true then
local i = 0
uci:foreach(c_config, "acl_rule", function(t)
uci_foreach("acl_rule", function(t)
i = i + 1
local option = "node"
local node_id = t[option]
@@ -244,20 +243,20 @@ do
log = true,
id = t[".name"],
remarks = i18n.translatef("ACL list [%s]", i),
currentNode = node_id and uci:get_all(c_config, node_id) or nil,
currentNode = node_id and uci_get(node_id) or nil,
set = function(o, server)
uci:set(c_config, t[".name"], option, server)
uci_set(t[".name"], option, server)
o.newNodeId = server
end
}
end)
end
uci:foreach(c_config, "nodes", function(node)
uci_foreach("nodes", function(node)
local node_id = node[".name"]
if node.protocol and node.protocol == '_shunt' then
local rules = {}
uci:foreach(c_config, "shunt_rules", function(e)
uci_foreach("shunt_rules", function(e)
if e[".name"] and e.remarks then
table.insert(rules, e)
table.insert(rules, {
@@ -278,7 +277,7 @@ do
for k, e in pairs(rules) do
local _node_id = node[e[".name"]] or nil
if _node_id then
local section = uci:get_all(c_config, _node_id) or {}
local section = uci_get(_node_id) or {}
if section[".type"] == "nodes" then
CONFIG[#CONFIG + 1] = {
log = false,
@@ -286,7 +285,7 @@ do
remarks = i18n.translatef("Shunt [%s] node", e.remarks),
set = function(o, server)
if not server then server = "" end
uci:set(c_config, node_id, e[".name"], server)
uci_set(node_id, e[".name"], server)
o.newNodeId = server
end
}
@@ -303,7 +302,7 @@ do
log = true,
node = b_node_id,
currentNode = (function()
local section = uci:get_all(c_config, b_node_id) or {}
local section = uci_get(b_node_id) or {}
if section[".type"] == "socks" then
return { Socks = b_node_id }
end
@@ -325,15 +324,15 @@ do
set = function(o, newNodes)
if o then
if not newNodes then newNodes = o.newNodes end
uci:set_list(c_config, node_id, "balancing_node", newNodes or {})
uci_set(node_id, "balancing_node", newNodes or {})
end
end
}
-- Backup Node
local currentNode = uci:get_all(c_config, node_id) or nil
local currentNode = uci_get(node_id) or nil
if currentNode and currentNode.fallback_node then
local section = uci:get_all(c_config, currentNode.fallback_node) or {}
local section = uci_get(currentNode.fallback_node) or {}
if section[".type"] == "nodes" then
CONFIG[#CONFIG + 1] = {
log = true,
@@ -341,11 +340,11 @@ do
remarks = i18n.translatef("Xray Load Balancing node [%s] backup node", node_id),
currentNode = section,
set = function(o, server)
uci:set(c_config, node_id, "fallback_node", server)
uci_set(node_id, "fallback_node", server)
o.newNodeId = server
end,
delete = function(o)
uci:delete(c_config, node_id, "fallback_node")
uci_del(node_id, "fallback_node")
end
}
end
@@ -360,7 +359,7 @@ do
log = true,
node = u_node_id,
currentNode = (function()
local section = uci:get_all(c_config, u_node_id) or {}
local section = uci_get(u_node_id) or {}
if section[".type"] == "socks" then
return { Socks = u_node_id }
end
@@ -382,47 +381,47 @@ do
set = function(o, newNodes)
if o then
if not newNodes then newNodes = o.newNodes end
uci:set_list(c_config, node_id, "urltest_node", newNodes or {})
uci_set(node_id, "urltest_node", newNodes or {})
end
end
}
else
-- Preproxy Node
local currentNode = uci:get_all(c_config, node_id) or nil
local currentNode = uci_get(node_id) or nil
if currentNode and currentNode.preproxy_node then
local section = uci:get_all(c_config, currentNode.preproxy_node) or {}
local section = uci_get(currentNode.preproxy_node) or {}
if section[".type"] == "nodes" then
CONFIG[#CONFIG + 1] = {
log = true,
id = node_id,
remarks = i18n.translatef("Node [%s] preproxy node", node_id),
currentNode = uci:get_all(c_config, currentNode.preproxy_node) or nil,
currentNode = uci_get(currentNode.preproxy_node) or nil,
set = function(o, server)
uci:set(c_config, node_id, "preproxy_node", server)
uci_set(node_id, "preproxy_node", server)
o.newNodeId = server
end,
delete = function(o)
uci:delete(c_config, node_id, "preproxy_node")
uci_del(node_id, "preproxy_node")
end
}
end
end
-- Landing node
local currentNode = uci:get_all(c_config, node_id) or nil
local currentNode = uci_get(node_id) or nil
if currentNode and currentNode.to_node then
local section = uci:get_all(c_config, currentNode.to_node) or {}
local section = uci_get(currentNode.to_node) or {}
if section[".type"] == "nodes" then
CONFIG[#CONFIG + 1] = {
log = true,
id = node_id,
remarks = i18n.translatef("Node [%s] landing node", node_id),
currentNode = uci:get_all(c_config, currentNode.to_node) or nil,
currentNode = uci_get(currentNode.to_node) or nil,
set = function(o, server)
uci:set(c_config, node_id, "to_node", server)
uci_set(node_id, "to_node", server)
o.newNodeId = server
end,
delete = function(o)
uci:delete(c_config, node_id, "to_node")
uci_del(node_id, "to_node")
end
}
end
@@ -2002,7 +2001,7 @@ local function curl(url, file, ua, mode, hwid)
end
function get_headers()
local cache_file = "/tmp/etc/" .. appname .. "_tmp/sub_curl_headers"
local cache_file = CACHE_PATH .. "/sub_curl_headers"
if fs.access(cache_file) then
return luci.sys.exec("cat " .. cache_file)
end
@@ -2084,19 +2083,19 @@ local function truncate_nodes(group)
end
end
end
uci:foreach(c_config, "nodes", function(node)
uci_foreach("nodes", function(node)
if node.add_mode == "2" then
if (not group) or (group:lower() == (node.group or ""):lower()) then
uci:delete(c_config, node['.name'])
uci_del(node['.name'])
end
end
end)
uci:foreach(c_config, "subscribe_list", function(o)
uci_foreach("subscribe_list", function(o)
if (not group) or (group:lower() == (o.remark or ""):lower()) then
uci:delete(c_config, o['.name'], "md5")
uci_del(o['.name'], "md5")
end
end)
api.uci_save(uci, c_config, true)
uci_save(true)
end
local function select_node(nodes, config, parentConfig)
@@ -2239,10 +2238,10 @@ local function update_node(manual)
end
if manual == 0 and next(group) then
uci:foreach(c_config, "nodes", function(node)
uci_foreach("nodes", function(node)
-- Do not delete nodes if no new nodes are found or nodes were manually imported...
if node.add_mode == "2" and (node.group and group[node.group:lower()] == true) then
uci:delete(c_config, node['.name'])
uci_del(node['.name'])
end
end)
end
@@ -2255,9 +2254,9 @@ local function update_node(manual)
-- Subscription Group Chain Agent
local function valid_chain_node(node)
if not node then return "" end
local cp = uci:get(c_config, node, "chain_proxy") or ""
local am = uci:get(c_config, node, "add_mode") or "0"
chain_node_type = (cp == "" and am ~= "2") and (uci:get(c_config, node, "type") or "") or ""
local cp = uci_get(node, "chain_proxy") or ""
local am = uci_get(node, "add_mode") or "0"
chain_node_type = (cp == "" and am ~= "2") and (uci_get(node, "type") or "") or ""
if chain_node_type ~= "Xray" and chain_node_type ~= "sing-box" then
chain_node_type = ""
return ""
@@ -2278,39 +2277,39 @@ local function update_node(manual)
local cfgid = uci:section(c_config, "nodes", api.gen_random_char())
for kkk, vvv in pairs(vv) do
if type(vvv) == "table" and next(vvv) ~= nil then
uci:set_list(c_config, cfgid, kkk, vvv)
uci_set(cfgid, kkk, vvv)
else
if kkk ~= "group" or vvv ~= "default" then
uci:set(c_config, cfgid, kkk, vvv)
uci_set(cfgid, kkk, vvv)
end
-- Sing-Box Node Domain resolver
if kkk == "type" and (vvv == "Xray" or vvv == "sing-box") then
if domain_resolver then
uci:set(c_config, cfgid, "domain_resolver", domain_resolver)
uci_set(cfgid, "domain_resolver", domain_resolver)
if domain_resolver_dns then
uci:set(c_config, cfgid, "domain_resolver_dns", domain_resolver_dns)
uci_set(cfgid, "domain_resolver_dns", domain_resolver_dns)
elseif domain_resolver_dns_https then
uci:set(c_config, cfgid, "domain_resolver_dns_https", domain_resolver_dns_https)
uci_set(cfgid, "domain_resolver_dns_https", domain_resolver_dns_https)
end
end
if domain_strategy then
if vvv == "sing-box" then
domain_strategy = (domain_strategy == "UseIPv4" and "ipv4_only") or (domain_strategy == "UseIPv6" and "ipv6_only") or domain_strategy
end
uci:set(c_config, cfgid, "domain_strategy", domain_strategy)
uci_set(cfgid, "domain_strategy", domain_strategy)
end
end
-- Subscription Group Chain Agent
if chain_node_type ~= "" and kkk == "type" and (vvv == "Xray" or vvv == "sing-box") then
if preproxy_node_group ~="" then
uci:set(c_config, cfgid, "chain_proxy", "1")
uci:set(c_config, cfgid, "preproxy_node", preproxy_node_group)
uci_set(cfgid, "chain_proxy", "1")
uci_set(cfgid, "preproxy_node", preproxy_node_group)
elseif to_node_group ~= "" then
uci:set(c_config, cfgid, "chain_proxy", "2")
uci:set(c_config, cfgid, "to_node", to_node_group)
uci_set(cfgid, "chain_proxy", "2")
uci_set(cfgid, "to_node", to_node_group)
elseif outbound_iface_group ~= "" then
uci:set(c_config, cfgid, "chain_proxy", "3")
uci:set(c_config, cfgid, "outbound_iface", outbound_iface_group)
uci_set(cfgid, "chain_proxy", "3")
uci_set(cfgid, "outbound_iface", outbound_iface_group)
end
end
end
@@ -2321,16 +2320,16 @@ local function update_node(manual)
for cfgid, info in pairs(subscribe_info) do
for key, value in pairs(info) do
if value ~= "" then
uci:set(c_config, cfgid, key, value)
uci_set(cfgid, key, value)
else
uci:delete(c_config, cfgid, key)
uci_del(cfgid, key)
end
end
end
if next(CONFIG) then
local nodes = {}
uci:foreach(c_config, "nodes", function(node)
uci_foreach("nodes", function(node)
nodes[#nodes + 1] = node
end)
@@ -2352,16 +2351,16 @@ local function update_node(manual)
end
end
api.uci_save(uci, c_config, true)
uci_save(true)
if arg[3] == "cron" then
if not fs.access("/var/lock/" .. appname .. ".lock") then
luci.sys.call("touch /tmp/lock/" .. appname .. "_cron.lock")
if not fs.access(api.LOCK_PREFIX .. ".lock") then
luci.sys.call("touch %s_cron.lock" % api.LOCK_PREFIX)
end
end
if manual ~= 1 then
luci.sys.call("/etc/init.d/" .. appname .. " restart > /dev/null 2>&1 &")
luci.sys.call("/etc/init.d/passwall2 restart > /dev/null 2>&1 &")
end
end
@@ -2485,10 +2484,10 @@ local execute = function()
local fail_list = {}
if arg[2] ~= "all" then
string.gsub(arg[2], '[^' .. "," .. ']+', function(w)
subscribe_list[#subscribe_list + 1] = uci:get_all(c_config, w) or {}
subscribe_list[#subscribe_list + 1] = uci_get(w) or {}
end)
else
uci:foreach(c_config, "subscribe_list", function(o)
uci_foreach("subscribe_list", function(o)
subscribe_list[#subscribe_list + 1] = o
end)
end
@@ -2531,7 +2530,7 @@ local execute = function()
log(1, i18n.translatef("Subscription: [%s] No changes, no update required.", remark))
else
parse_link(raw_data, "2", remark, value)
uci:set(c_config, cfgid, "md5", new_md5)
uci_set(cfgid, "md5", new_md5)
end
else
fail_list[#fail_list + 1] = value
@@ -2554,8 +2553,8 @@ local execute = function()
end
local function check_instance(action)
local sub_lock = "/var/lock/" .. appname .. "_subscribe.lock"
local rule_lock = "/var/lock/" .. appname .. "_rule_update.lock"
local sub_lock = api.LOCK_PREFIX .. "_subscribe.lock"
local rule_lock = api.LOCK_PREFIX .. "_rule_update.lock"
if action == "start" then
math.randomseed(os.time() + math.floor(os.clock() * 1000))