mirror of
https://github.com/MetaCubeX/subconverter.git
synced 2025-11-04 18:19:42 +08:00
Fix support for parsing some Shadowsocks/R subscriptions
This commit is contained in:
parent
d1bf8a13f2
commit
b94dce44ed
@ -349,8 +349,8 @@ void explodeSS(std::string ss, bool libev, std::string custom_port, int local_po
|
|||||||
}
|
}
|
||||||
if(strFind(ss, "@"))
|
if(strFind(ss, "@"))
|
||||||
{
|
{
|
||||||
ss = regReplace(ss, "(.*?)@(.*):(.*)", "$1,$2,$3");
|
ss = regReplace(ss, "(.*?)@(.*):(.*)", "$1|$2|$3");
|
||||||
args = split(ss, ",");
|
args = split(ss, "|");
|
||||||
secret = split(urlsafe_base64_decode(args[0]), ":");
|
secret = split(urlsafe_base64_decode(args[0]), ":");
|
||||||
method = secret[0];
|
method = secret[0];
|
||||||
password = secret[1];
|
password = secret[1];
|
||||||
@ -359,8 +359,8 @@ void explodeSS(std::string ss, bool libev, std::string custom_port, int local_po
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ss = regReplace(urlsafe_base64_decode(ss), "(.*?):(.*?)@(.*):(.*)", "$1,$2,$3,$4");
|
ss = regReplace(urlsafe_base64_decode(ss), "(.*?):(.*?)@(.*):(.*)", "$1|$2|$3|$4");
|
||||||
args = split(ss, ",");
|
args = split(ss, "|");
|
||||||
method = args[0];
|
method = args[0];
|
||||||
password = args[1];
|
password = args[1];
|
||||||
server = args[2];
|
server = args[2];
|
||||||
@ -536,8 +536,8 @@ void explodeSSR(std::string ssr, bool ss_libev, bool ssr_libev, std::string cust
|
|||||||
protoparam = regReplace(urlsafe_base64_decode(getUrlArg(strobfs, "protoparam")), "\\s", "");
|
protoparam = regReplace(urlsafe_base64_decode(getUrlArg(strobfs, "protoparam")), "\\s", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
ssr = regReplace(ssr, "(.*):(.*?):(.*?):(.*?):(.*?):(.*)", "$1,$2,$3,$4,$5,$6");
|
ssr = regReplace(ssr, "(.*):(.*?):(.*?):(.*?):(.*?):(.*)", "$1|$2|$3|$4|$5|$6");
|
||||||
strcfg = split(ssr, ",");
|
strcfg = split(ssr, "|");
|
||||||
|
|
||||||
if(strcfg.size() != 6)
|
if(strcfg.size() != 6)
|
||||||
return;
|
return;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user