ns, us, ms, s, m, h, which correspond to nanoseconds, microseconds, milliseconds, seconds, minutes, and hours, respectively.")
+pi.placeholder = "1m"
+pi.description = translate("The interval between initiating probes.") .. "s, m, h, which correspond to seconds, minutes, and hours, respectively.") .. "s, m, h, which correspond to seconds, minutes, and hours, respectively.") .. "s, m, h, which correspond to seconds, minutes, and hours, respectively.") .. "ns, us, ms, s, m, h, which correspond to nanoseconds, microseconds, milliseconds, seconds, minutes, and hours, respectively."
-msgstr "发起探测的间隔。时间格式为数字+单位，比如"10s", "2h45m"，支持的时间单位有 ns，us，ms，s，m，h，分别对应纳秒、微秒、毫秒、秒、分、时。"
+msgid "The interval between initiating probes."
+msgstr "发起探测的间隔。"
+
+msgid "The time format is numbers + units, such as '10s', '2h45m', and the supported time units are s, m, h, which correspond to seconds, minutes, and hours, respectively."
+msgstr "时间格式为数字+单位，比如"10s", "2h45m"，支持的时间单位有 s，m，h，分别对应秒、分、时。"
+
+msgid "When the unit is not filled in, it defaults to seconds."
+msgstr "未填写单位时，默认为秒。"
msgid "Preferred Node Count"
msgstr "优选节点数量"
@@ -1615,8 +1624,8 @@ msgstr "仅 IPv4"
msgid "IPv6 Only"
msgstr "仅 IPv6"
-msgid "Log Maint"
-msgstr "日志维护"
+msgid "Maintain"
+msgstr "维护"
msgid "Backup and Restore"
msgstr "备份还原"
@@ -1651,6 +1660,15 @@ msgstr "恢复默认配置"
msgid "Do Reset"
msgstr "执行重置"
+msgid "Please select a file first."
+msgstr "请先选择一个文件。"
+
+msgid "Invalid file type. Please upload a .tar.gz file."
+msgstr "文件类型无效，请上传一个 .tar.gz 文件。"
+
+msgid "File size exceeds 10MB limit."
+msgstr "文件大小超过 10MB 限制。"
+
msgid "Do you want to restore the client to default settings?"
msgstr "是否要恢复客户端默认配置？"
@@ -1669,9 +1687,6 @@ msgstr "要测试的节点列表，/dev/null 2>&1
unset V2RAY_LOCATION_ASSET
diff --git a/openwrt-passwall2/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/openwrt-passwall2/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index d3f241a150..f69c22e2b4 100755
--- a/openwrt-passwall2/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/openwrt-passwall2/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -400,18 +400,16 @@ do
end
end
--- urlencode
--- local function get_urlencode(c) return sformat("%%%02X", sbyte(c)) end
+local function UrlEncode(szText)
+ return szText:gsub("([^%w%-_%.%~])", function(c)
+ return string.format("%%%02X", string.byte(c))
+ end)
+end
--- local function urlEncode(szText)
--- local str = szText:gsub("([^0-9a-zA-Z ])", get_urlencode)
--- str = str:gsub(" ", "+")
--- return str
--- end
-
-local function get_urldecode(h) return schar(tonumber(h, 16)) end
local function UrlDecode(szText)
- return (szText and szText:gsub("+", " "):gsub("%%(%x%x)", get_urldecode)) or nil
+ return szText and szText:gsub("+", " "):gsub("%%(%x%x)", function(h)
+ return string.char(tonumber(h, 16))
+ end) or nil
end
-- trim
@@ -611,10 +609,9 @@ local function processData(szType, content, add_mode, add_from)
--ss://2022-blake3-aes-256-gcm:YctPZ6U7xPPcU%2Bgp3u%2B0tx%2FtRizJN9K8y%2BuKlW2qjlI%3D@192.168.100.1:8888/?plugin=v2ray-plugin%3Bserver#Example3
--ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTp0ZXN0@xxxxxx.com:443?type=ws&path=%2Ftestpath&host=xxxxxx.com&security=tls&fp=&alpn=h3%2Ch2%2Chttp%2F1.1&sni=xxxxxx.com#test-1%40ss
- local idx_sp = 0
+ local idx_sp = content:find("#") or 0
local alias = ""
- if content:find("#") then
- idx_sp = content:find("#")
+ if idx_sp > 0 then
alias = content:sub(idx_sp + 1, -1)
end
result.remarks = UrlDecode(alias)
@@ -625,7 +622,7 @@ local function processData(szType, content, add_mode, add_from)
local query = split(info, "%?")
for _, v in pairs(split(query[2], '&')) do
local t = split(v, '=')
- params[t[1]] = UrlDecode(t[2])
+ if #t >= 2 then params[t[1]] = UrlDecode(t[2]) end
end
if params.plugin then
local plugin_info = params.plugin
@@ -671,9 +668,22 @@ local function processData(szType, content, add_mode, add_from)
else
userinfo = base64Decode(hostInfo[1])
end
-
local method = userinfo:sub(1, userinfo:find(":") - 1)
local password = userinfo:sub(userinfo:find(":") + 1, #userinfo)
+
+ -- 判断密码是否经过url编码
+ local function isURLEncodedPassword(pwd)
+ if not pwd:find("%%[0-9A-Fa-f][0-9A-Fa-f]") then
+ return false
+ end
+ local ok, decoded = pcall(UrlDecode, pwd)
+ return ok and UrlEncode(decoded) == pwd
+ end
+
+ local decoded = UrlDecode(password)
+ if isURLEncodedPassword(password) and decoded then
+ password = decoded
+ end
result.method = method
result.password = password
@@ -835,6 +845,48 @@ local function processData(szType, content, add_mode, add_from)
result.error_msg = "请更换Xray或Sing-Box来支持SS更多的传输方式."
end
end
+
+ if params["shadow-tls"] then
+ if result.type ~= "sing-box" and result.type ~= "SS-Rust" then
+ result.error_msg = ss_type_default .. " 不支持 shadow-tls 插件."
+ else
+ -- 解析SS Shadow-TLS 插件参数
+ local function parseShadowTLSParams(b64str, out)
+ local ok, data = pcall(jsonParse, base64Decode(b64str))
+ if not ok or type(data) ~= "table" then return "" end
+ if type(out) == "table" then
+ for k, v in pairs(data) do out[k] = v end
+ end
+ local t = {}
+ if data.version then t[#t+1] = "v" .. data.version .. "=1" end
+ if data.password then t[#t+1] = "passwd=" .. data.password end
+ for k, v in pairs(data) do
+ if k ~= "version" and k ~= "password" then
+ t[#t+1] = k .. "=" .. tostring(v)
+ end
+ end
+ return table.concat(t, ";")
+ end
+
+ if result.type == "SS-Rust" then
+ result.plugin = "shadow-tls"
+ result.plugin_opts = parseShadowTLSParams(params["shadow-tls"])
+ elseif result.type == "sing-box" then
+ local shadowtlsOpt = {}
+ parseShadowTLSParams(params["shadow-tls"], shadowtlsOpt)
+ if next(shadowtlsOpt) then
+ result.shadowtls = "1"
+ result.shadowtls_version = shadowtlsOpt.version or "1"
+ result.shadowtls_password = shadowtlsOpt.password
+ result.shadowtls_serverName = shadowtlsOpt.host
+ if shadowtlsOpt.fingerprint then
+ result.shadowtls_utls = "1"
+ result.shadowtls_fingerprint = shadowtlsOpt.fingerprint or "chrome"
+ end
+ end
+ end
+ end
+ end
end
elseif szType == "trojan" then
if trojan_type_default == "sing-box" and has_singbox then
@@ -1275,14 +1327,14 @@ local function processData(szType, content, add_mode, add_from)
if hysteria2_type_default == "sing-box" and has_singbox then
result.type = 'sing-box'
result.protocol = "hysteria2"
- if params["obfs-password"] then
+ if params["obfs-password"] or params["obfs_password"] then
result.hysteria2_obfs_type = "salamander"
- result.hysteria2_obfs_password = params["obfs-password"]
+ result.hysteria2_obfs_password = params["obfs-password"] or params["obfs_password"]
end
elseif has_hysteria2 then
result.type = "Hysteria2"
- if params["obfs-password"] then
- result.hysteria2_obfs = params["obfs-password"]
+ if params["obfs-password"] or params["obfs_password"] then
+ result.hysteria2_obfs = params["obfs-password"] or params["obfs_password"]
end
end
elseif szType == 'tuic' then
diff --git a/small/luci-app-bypass/Makefile b/small/luci-app-bypass/Makefile
index 4dad863fc7..98ba96401d 100644
--- a/small/luci-app-bypass/Makefile
+++ b/small/luci-app-bypass/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-bypass
PKG_VERSION:=1.2
-PKG_RELEASE:=20
+PKG_RELEASE:=21
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server \
diff --git a/small/luci-app-bypass/root/etc/uci-defaults/luci-bypass b/small/luci-app-bypass/root/etc/uci-defaults/luci-bypass
index 2303198ed6..df5db43c33 100644
--- a/small/luci-app-bypass/root/etc/uci-defaults/luci-bypass
+++ b/small/luci-app-bypass/root/etc/uci-defaults/luci-bypass
@@ -1,4 +1,3 @@
-uci batch <