github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: updated ss:// SIP002

Browse Source
This commit is contained in:
Qv2ray-dev 2020-06-19 21:31:20 +08:00
parent d04cb5b1de
commit 92fb2f99e5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5625 5626

20
src/core/connection/serialization/ss.cpp
View File

@ -81,17 +81,18 @@ namespace Qv2ray::core::connection
auto x = QUrl::fromUserInput(uri); auto x = QUrl::fromUserInput(uri);
server.address = x.host(); server.address = x.host();
server.port = x.port(); server.port = x.port();
QString userInfo = SafeBase64Decode(x.userName()); const auto userInfo = SafeBase64Decode(x.userName());
auto userInfoSp = userInfo.indexOf(':'); const auto userInfoSp = userInfo.indexOf(':');
// //
DEBUG(MODULE_CONNECTION, "Userinfo splitter position: " + QSTRN(userInfoSp)) DEBUG(MODULE_CONNECTION, "Userinfo splitter position: " + QSTRN(userInfoSp))
if (userInfoSp < 0) if (userInfoSp < 0)
{ {
*errMessage = QObject::tr("Can't find the colon separator between method and password"); *errMessage = QObject::tr("Can't find the colon separator between method and password");
return CONFIGROOT{};
} }
QString method = userInfo.mid(0, userInfoSp); const auto method = userInfo.mid(0, userInfoSp);
server.method = method; server.method = method;
server.password = userInfo.mid(userInfoSp + 1); server.password = userInfo.mid(userInfoSp + 1);
} }
@ -99,8 +100,7 @@ namespace Qv2ray::core::connection
d_name = QUrl::fromPercentEncoding(d_name.toUtf8()); d_name = QUrl::fromPercentEncoding(d_name.toUtf8());
CONFIGROOT root; CONFIGROOT root;
OUTBOUNDS outbounds; OUTBOUNDS outbounds;
outbounds.append( outbounds.append(GenerateOutboundEntry("shadowsocks", GenerateShadowSocksOUT({ server }), {}));
GenerateOutboundEntry("shadowsocks", GenerateShadowSocksOUT(QList<ShadowSocksServerObject>{ server }), QJsonObject()));
JADD(outbounds) JADD(outbounds)
*alias = alias->isEmpty() ? d_name : *alias + "_" + d_name; *alias = alias->isEmpty() ? d_name : *alias + "_" + d_name;
LOG(MODULE_CONNECTION, "Deduced alias: " + *alias) LOG(MODULE_CONNECTION, "Deduced alias: " + *alias)
@ -114,16 +114,16 @@ namespace Qv2ray::core::connection
if (isSip002) if (isSip002)
{ {
LOG(MODULE_CONNECTION, "Converting an ss-server config to Sip002 ss:// format") LOG(MODULE_CONNECTION, "Converting an ss-server config to Sip002 ss:// format")
QString plainUserInfo = server.method + ":" + server.password; const auto plainUserInfo = server.method + ":" + server.password;
QString userinfo(plainUserInfo.toUtf8().toBase64(QByteArray::Base64Option::Base64UrlEncoding).data()); const auto userinfo = plainUserInfo.toUtf8().toBase64(QByteArray::Base64Option::Base64UrlEncoding);
return "ss://" + userinfo + "@" + server.address + ":" + QSTRN(server.port) + "#" + myAlias; return "ss://" + userinfo + "@" + server.address + ":" + QSTRN(server.port) + "/#" + myAlias;
} }
else else
{ {
LOG(MODULE_CONNECTION, "Converting an ss-server config to old ss:// string format") LOG(MODULE_CONNECTION, "Converting an ss-server config to old ss:// string format")
QString ssUri = server.method + ":" + server.password + "@" + server.address + ":" + QSTRN(server.port); QString ssUri = server.method + ":" + server.password + "@" + server.address + ":" + QSTRN(server.port);
return "ss://" + ssUri.toUtf8().toBase64(QByteArray::Base64Option::OmitTrailingEquals) + "#" + myAlias; return "ss://" + ssUri.toUtf8().toBase64(QByteArray::Base64Option::OmitTrailingEquals) + "/#" + myAlias;
} }
} }
} // namespace Serialization::ss } // namespace serialization::ss
} // namespace Qv2ray::core::connection } // namespace Qv2ray::core::connection