From afef5de021fa6b461daa044fbdb1a455dc5bcae2 Mon Sep 17 00:00:00 2001
From: lwb1978 <86697442+lwb1978@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:53:40 +0800
Subject: [PATCH] luci: optimize ss link subscribe

---
 .../passwall2/node_list/link_share_man.htm    | 13 ++++++++
 .../root/usr/share/passwall2/subscribe.lua    | 33 ++++++++++++-------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
index 1de0e55..3a29fba 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
@@ -861,6 +861,19 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 				}
 			}
 
+			// 判断密码是否经过url编码
+			const isURLEncodedPassword = function(pwd) {
+				if (!/%[0-9A-Fa-f]{2}/.test(pwd)) return false;
+				try {
+					const decoded = decodeURIComponent(pwd.replace(/\+/g, "%20"));
+					const reencoded = encodeURIComponent(decoded);
+					return reencoded === pwd;
+				} catch (e) {
+					return false;
+				}
+			}
+			password = isURLEncodedPassword(password) ? decodeURIComponent(password) : password;
+
 			if (queryParam.plugin) {
 				var pluginParams = decodeURIComponent(queryParam.plugin).split(";");
 				plugin = pluginParams.shift();
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index 82ce80e..f69c22e 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/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
@@ -670,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