mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-16 21:43:33 +08:00
🎉 Sync 2026-10-14 03:01:37
This commit is contained in:
1 parent
57ac656612
commit
ef45574e85
78 files changed
+2683
-3911
No files matched your search
@@ -7,6 +7,7 @@ c_config = "passwall2"
|
||||
s_config = "passwall2_server"
|
||||
local com = require "luci.passwall2.com"
|
||||
nixio = require "nixio"
|
||||
require "nixio.util"
|
||||
fs = require "nixio.fs"
|
||||
sys = require "luci.sys"
|
||||
uci = require"luci.model.uci".cursor()
|
||||
@@ -17,6 +18,7 @@ i18n = require "luci.i18n"
|
||||
|
||||
curl_args = { "-skfL", "--connect-timeout 3", "--retry 3", "-H 'Accept: */*'" }
|
||||
command_timeout = 300
|
||||
DIRECT_GID = 9912
|
||||
OPENWRT_ARCH = nil
|
||||
DISTRIB_ARCH = nil
|
||||
|
||||
@@ -197,7 +199,7 @@ function del_cache_var(key)
|
||||
end
|
||||
|
||||
function set_cache_var(key, val)
|
||||
sys.call(string.format('. /usr/share/passwall2/utils.sh ; set_cache_var "%s" "%s"', key, val))
|
||||
sys.call(string.format('. /usr/share/passwall2/utils.sh ; set_cache_var %s %s', util.shellquote(tostring(key)), util.shellquote(tostring(val))))
|
||||
end
|
||||
|
||||
function get_cache_var(key)
|
||||
@@ -226,6 +228,30 @@ function exec_call(cmd)
|
||||
return tonumber(rc), trim(out)
|
||||
end
|
||||
|
||||
function exec_call_as_gid(cmd, gid)
|
||||
local reader, writer = nixio.pipe()
|
||||
if not reader then return 255, "Unable to create command pipe" end
|
||||
local pid = nixio.fork()
|
||||
if not pid then
|
||||
reader:close()
|
||||
writer:close()
|
||||
return 255, "Unable to fork command"
|
||||
elseif pid == 0 then
|
||||
reader:close()
|
||||
nixio.dup(writer, nixio.stdout)
|
||||
nixio.dup(writer, nixio.stderr)
|
||||
writer:close()
|
||||
if not nixio.setgid(gid) then os.exit(1) end
|
||||
nixio.exec("/bin/sh", "-c", cmd)
|
||||
os.exit(127)
|
||||
end
|
||||
writer:close()
|
||||
local out = reader:readall() or ""
|
||||
reader:close()
|
||||
local _, status, code = nixio.waitpid(pid)
|
||||
return status == "exited" and code or 255, trim(out)
|
||||
end
|
||||
|
||||
function base64Decode(text)
|
||||
if type(text) ~= "string" then return "" end
|
||||
local encoded = text:gsub("%z", ""):gsub("%c", ""):gsub("_", "/"):gsub("-", "+"):gsub("=+$", "")
|
||||
@@ -274,22 +300,38 @@ function get_domain_port_from_url(url)
|
||||
return domain, port
|
||||
end
|
||||
|
||||
-- Domain resolution
|
||||
function domainToIPv4(domain, dns)
|
||||
local Dns = dns or "223.5.5.5"
|
||||
local IPs = luci.sys.exec('nslookup %s %s | awk \'/^Name:/{getline; if ($1 == "Address:") print $2}\'' % { domain, Dns })
|
||||
for IP in string.gmatch(IPs, "%S+") do
|
||||
if datatypes.ipaddr(IP) and not datatypes.ip6addr(IP) then return IP end
|
||||
function resolve_domain(domain, dns)
|
||||
dns = dns or get_cache_var("DIRECT_DNS") or "223.5.5.5"
|
||||
local address, port = dns:match("^(.-)#(%d+)$")
|
||||
if not address then address, port = dns:match("^%[(.-)%]:(%d+)$") end
|
||||
if not address then address, port = dns:match("^([^:]+):(%d+)$") end
|
||||
address = (address or dns):gsub("^%[(.-)%]$", "%1")
|
||||
port = port or "53"
|
||||
local server = datatypes.ip6addr(address) and ("[" .. address .. "]") or address
|
||||
local rc, result
|
||||
for _, dns_server in ipairs({server .. ":" .. port, address .. "#" .. port, "223.5.5.5"}) do
|
||||
rc, result = exec_call_as_gid("LC_ALL=C nslookup " .. util.shellquote(domain) .. " " .. util.shellquote(dns_server), DIRECT_GID)
|
||||
local ips, seen, answer = {}, {}, false
|
||||
for line in result:gmatch("[^\r\n]+") do
|
||||
if line:match("^%s*Name:") then answer = true end
|
||||
local ip = answer and line:match("^%s*Address%s*%d*:%s*(%S+)")
|
||||
if ip and (datatypes.ip4addr(ip) or datatypes.ip6addr(ip)) and not seen[ip] then
|
||||
ips[#ips + 1] = ip
|
||||
seen[ip] = true
|
||||
end
|
||||
end
|
||||
if #ips > 0 then return ips end
|
||||
end
|
||||
return nil
|
||||
return nil, result, rc
|
||||
end
|
||||
|
||||
function curl_base(url, file, args)
|
||||
function curl_base(url, file, args, gid)
|
||||
if not args then args = {} end
|
||||
if file then
|
||||
args[#args + 1] = "-o " .. file
|
||||
end
|
||||
local cmd = string.format('curl %s "%s"', table_join(args), url)
|
||||
if gid then return exec_call_as_gid(cmd, gid) end
|
||||
return exec_call(cmd)
|
||||
end
|
||||
|
||||
@@ -311,36 +353,34 @@ end
|
||||
function curl_logic(url, file, args)
|
||||
local return_code, result = curl_proxy(url, file, args)
|
||||
if not return_code or return_code ~= 0 then
|
||||
return_code, result = curl_base(url, file, args)
|
||||
return_code, result = curl_direct(url, file, args)
|
||||
end
|
||||
return return_code, result
|
||||
end
|
||||
|
||||
function curl_direct(url, file, args)
|
||||
-- Direct access
|
||||
if not args then args = {} end
|
||||
local tmp_args = clone(args)
|
||||
if get_cache_var("ENABLED_DEFAULT_ACL") ~= "1" and get_cache_var("ENABLED_ACLS") ~= "1" then
|
||||
return curl_base(url, file, args)
|
||||
end
|
||||
local tmp_args = clone(args or {})
|
||||
tmp_args[#tmp_args + 1] = "--noproxy '*'"
|
||||
local domain, port = get_domain_port_from_url(url)
|
||||
if domain then
|
||||
local ip = domainToIPv4(domain)
|
||||
if ip then
|
||||
tmp_args[#tmp_args + 1] = "--resolve " .. domain .. ":" .. port .. ":" .. ip
|
||||
local ips, err = resolve_domain(domain)
|
||||
if not ips then return 6, err end
|
||||
for i, ip in ipairs(ips) do
|
||||
if datatypes.ip6addr(ip) then ips[i] = "[" .. ip .. "]" end
|
||||
end
|
||||
tmp_args[#tmp_args + 1] = "--resolve " .. util.shellquote(domain .. ":" .. port .. ":" .. table.concat(ips, ","))
|
||||
end
|
||||
return curl_base(url, file, tmp_args)
|
||||
return curl_base(url, file, tmp_args, DIRECT_GID)
|
||||
end
|
||||
|
||||
function curl_auto(url, file, args)
|
||||
local localhost_proxy = uci_get_c("@global[0]", "localhost_proxy") or "1"
|
||||
if localhost_proxy == "1" then
|
||||
if (uci_get_c("@global[0]", "localhost_proxy") or "1") == "1" then
|
||||
return curl_base(url, file, args)
|
||||
else
|
||||
local return_code, result = curl_proxy(url, file, args)
|
||||
if not return_code or return_code ~= 0 then
|
||||
return_code, result = curl_direct(url, file, args)
|
||||
end
|
||||
return return_code, result
|
||||
end
|
||||
return curl_logic(url, file, args)
|
||||
end
|
||||
|
||||
function url(...)
|
||||
@@ -853,19 +893,26 @@ function clone(org)
|
||||
end
|
||||
|
||||
local function get_bin_version_cache(file, cmd)
|
||||
sys.call("mkdir -p " .. CACHE_PATH)
|
||||
if fs.access(file) then
|
||||
if file and file ~= "" and fs.access(file) then
|
||||
chmod_755(file)
|
||||
local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
|
||||
if fs.access(CACHE_PATH .. "/" .. md5) then
|
||||
return sys.exec("echo -n $(cat %s)" % { CACHE_PATH .. "/" .. md5 })
|
||||
else
|
||||
local version = sys.exec(string.format("echo -n $(%s %s)", file, cmd))
|
||||
if version and version ~= "" then
|
||||
sys.call("echo '%s' > %s" % { version, CACHE_PATH .. "/" .. md5})
|
||||
return version
|
||||
local stat = fs.stat(file)
|
||||
local cache_file
|
||||
if stat and stat.dev and stat.ino and stat.size and stat.mtime and stat.ctime then
|
||||
-- Use metadata to avoid hashing the entire binary on every lookup.
|
||||
cache_file = CACHE_PATH .. "/binver_" .. table.concat({stat.dev, stat.ino, stat.size, stat.mtime, stat.ctime}, "_")
|
||||
local cached = fs.readfile(cache_file)
|
||||
if cached and trim(cached) ~= "" then
|
||||
return trim(cached)
|
||||
end
|
||||
end
|
||||
local version = sys.exec(string.format("echo -n $(%s %s)", util.shellquote(file), cmd))
|
||||
if version and version ~= "" then
|
||||
if cache_file then
|
||||
fs.mkdirr(CACHE_PATH)
|
||||
fs.writefile(cache_file, version)
|
||||
end
|
||||
return version
|
||||
end
|
||||
end
|
||||
return ""
|
||||
end
|
||||
@@ -886,7 +933,7 @@ end
|
||||
|
||||
function is_file(path)
|
||||
if path and #path > 1 then
|
||||
if sys.exec('[ -f "%s" ] && echo -n 1' % path) == "1" then
|
||||
if fs.stat(path, "type") == "reg" then
|
||||
return true
|
||||
end
|
||||
end
|
||||
@@ -895,7 +942,7 @@ end
|
||||
|
||||
function is_dir(path)
|
||||
if path and #path > 1 then
|
||||
if sys.exec('[ -d "%s" ] && echo -n 1' % path) == "1" then
|
||||
if fs.stat(path, "type") == "dir" then
|
||||
return true
|
||||
end
|
||||
end
|
||||
@@ -1123,7 +1170,7 @@ local default_file_tree = {
|
||||
}
|
||||
|
||||
function get_api_json(url)
|
||||
local return_code, content = curl_logic(url, nil, curl_args)
|
||||
local return_code, content = curl_auto(url, nil, curl_args)
|
||||
if return_code ~= 0 or content == "" then return {} end
|
||||
return jsonc.parse(content) or {}
|
||||
end
|
||||
@@ -1216,7 +1263,7 @@ function to_check(arch, app_name)
|
||||
}
|
||||
end
|
||||
|
||||
function to_download(app_name, url, size)
|
||||
function to_download(app_name, url, size, task_id)
|
||||
local result = check_path(app_name)
|
||||
if result.code ~= 0 then
|
||||
return result
|
||||
@@ -1228,7 +1275,13 @@ function to_download(app_name, url, size)
|
||||
|
||||
sys.call("/bin/rm -f /tmp/".. app_name .."_download.*")
|
||||
|
||||
local tmp_file = trim(util.exec("mktemp -u -t ".. app_name .."_download.XXXXXX"))
|
||||
local tmp_file
|
||||
if type(task_id) == "string" and task_id:match("^[%w_-]+$") then
|
||||
tmp_file = "/tmp/" .. app_name .. "_download." .. task_id
|
||||
exec("/bin/rm", {"-f", tmp_file})
|
||||
else
|
||||
tmp_file = trim(util.exec("mktemp -u -t " .. app_name .. "_download.XXXXXX"))
|
||||
end
|
||||
|
||||
if size then
|
||||
local kb1 = get_free_space("/tmp")
|
||||
@@ -1240,7 +1293,7 @@ function to_download(app_name, url, size)
|
||||
local _curl_args = clone(curl_args)
|
||||
table.insert(_curl_args, "--speed-limit 51200 --speed-time 15 --max-time 300")
|
||||
|
||||
local return_code, result = curl_logic(url, tmp_file, _curl_args)
|
||||
local return_code, result = curl_auto(url, tmp_file, _curl_args)
|
||||
result = return_code == 0
|
||||
|
||||
if not result then
|
||||
@@ -1254,6 +1307,23 @@ function to_download(app_name, url, size)
|
||||
return {code = 0, file = tmp_file, zip = com[app_name].zipped }
|
||||
end
|
||||
|
||||
function to_download_progress(app_name, task_id, total_size)
|
||||
if not com[app_name] or type(task_id) ~= "string" or not task_id:match("^[%w_-]+$") then
|
||||
return {code = 1, error = i18n.translate("Invalid download task.")}
|
||||
end
|
||||
|
||||
total_size = tonumber(total_size) or 0
|
||||
local tmp_file = "/tmp/" .. app_name .. "_download." .. task_id
|
||||
local downloaded = tonumber(fs.stat(tmp_file, "size")) or 0
|
||||
local percent
|
||||
if total_size > 0 then
|
||||
-- Leave 100% for the download request's success callback.
|
||||
percent = math.min(99, math.floor(downloaded * 100 / total_size))
|
||||
end
|
||||
|
||||
return {code = 0, downloaded = downloaded, total = total_size, percent = percent}
|
||||
end
|
||||
|
||||
function to_extract(app_name, file, subfix)
|
||||
local result = check_path(app_name)
|
||||
if result.code ~= 0 then
|
||||
@@ -1446,7 +1516,7 @@ function cacheFileCompareToLogic(file, str)
|
||||
end
|
||||
|
||||
function is_js_luci()
|
||||
return sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0
|
||||
return fs.stat("/www/luci-static/resources/uci.js", "type") == "reg"
|
||||
end
|
||||
|
||||
function set_default_cbi()
|
||||
@@ -1519,6 +1589,16 @@ function set_default_cbi()
|
||||
return obj
|
||||
end
|
||||
end
|
||||
if true then
|
||||
--Table
|
||||
local Table = cbi.Table
|
||||
local default_init = Table.__init__
|
||||
function Table.__init__(self, form, ...)
|
||||
default_init(self, form, ...)
|
||||
-- The Table's map is an independent data source and needs to receive the API from its parent form.
|
||||
self.map.api = form.api
|
||||
end
|
||||
end
|
||||
if true then
|
||||
--TextValue
|
||||
local TextValue = cbi.TextValue
|
||||
|
||||
Reference in new issue
Block a user