298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-19 01:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-ssr-plus: fix ssr subscribe (#2960)

Browse Source 
- fix protoparam parse error in ssr subscribe
- in function split, when sep='/\\?', slen(sep)=3, but matched string
   len is 2, fix by get end position of matched string
This commit is contained in:
gbcwbz 2020-02-06 21:47:20 +08:00 committed by GitHub
parent dacc7eb844
commit 1631d29f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
View File

@ -31,16 +31,16 @@ local function split(full, sep)
full = full:gsub("%z", "") -- 这里不是很清楚 有时候结尾带个\0 full = full:gsub("%z", "") -- 这里不是很清楚 有时候结尾带个\0
local off, result = 1, {} local off, result = 1, {}
while true do while true do
local nEnd = full:find(sep, off) local nStart, nEnd = full:find(sep, off)
if not nEnd then if not nStart then
local res = ssub(full, off, slen(full)) local res = ssub(full, off, slen(full))
if #res > 0 then -- 过滤掉 \0 if #res > 0 then -- 过滤掉 \0
tinsert(result, res) tinsert(result, res)
end end
break break
else else
tinsert(result, ssub(full, off, nEnd - 1)) tinsert(result, ssub(full, off, nStart - 1))
off = nEnd + slen(sep) off = nEnd + 1
end end
end end
return result return result
@ -107,7 +107,7 @@ local function processData(szType, content)
} }
result.hashkey = type(content) == 'string' and md5(content) or md5(jsonStringify(content)) result.hashkey = type(content) == 'string' and md5(content) or md5(jsonStringify(content))
if szType == 'ssr' then if szType == 'ssr' then
local dat = split(content, "/\\?") local dat = split(content, "/%?")
local hostInfo = split(dat[1], ':') local hostInfo = split(dat[1], ':')
result.server = hostInfo[1] result.server = hostInfo[1]
result.server_port = hostInfo[2] result.server_port = hostInfo[2]
@ -191,7 +191,7 @@ local function processData(szType, content)
result.type = "ss" result.type = "ss"
result.server = host[1] result.server = host[1]
if host[2]:find("/\\?") then if host[2]:find("/\\?") then
local query = split(host[2], "/\\?") local query = split(host[2], "/%?")
result.server_port = query[1] result.server_port = query[1]
-- local params = {} -- local params = {}
-- for _, v in pairs(split(query[2], '&')) do -- for _, v in pairs(split(query[2], '&')) do