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

make vmess link parsing more robust

Browse Source
This commit is contained in:
tleydxdy 2020-05-05 02:35:29 -04:00
parent 5c66b29879
commit ec17b27afa
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/connection/Serialization_vmess.cpp
View File

@ -111,28 +111,10 @@ namespace Qv2ray::core::connection
*errMessage = QObject::tr("seems like a v1 vmess, we don't support it"); *errMessage = QObject::tr("seems like a v1 vmess, we don't support it");
return default; return default;
} }
bool flag = true;
// C is a quick hack...
#define C(k) (flag = (vmessConf.contains(k) ? (errMessage->clear(), true) : (*errMessage += (k " does not exist"), false)))
// id, aid, port and add are mandatory fields of a vmess://
// link.
flag = flag && C("id") && (C("aid") || C("alterId")) && C("port") && C("add");
// Stream Settings
auto net = vmessConf["net"].toString();
if (net == "http" || net == "ws")
flag = flag && C("host") && C("path");
else if (net == "domainsocket")
flag = flag && C("path");
else if (net == "quic")
flag = flag && C("host") && C("type") && C("path");
#undef C
// return flag ? 0 : 1;
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
CONFIGROOT root; CONFIGROOT root;
QString ps, add, id, /*net,*/ type, host, path, tls; QString ps, add, id, net, type, host, path, tls;
int port, aid; int port, aid;
// //
// __vmess_checker__func(key, values) // __vmess_checker__func(key, values)
@ -194,9 +176,10 @@ namespace Qv2ray::core::connection
<< "domainsocket" // << "domainsocket" //
<< "quic"); // << "quic"); //
// //
__vmess_checker__func(path, << ""); // __vmess_checker__func(tls, << "none" //
__vmess_checker__func(host, << ""); // << "tls"); //
__vmess_checker__func(tls, << ""); // path = vmessConf.contains("path") ? vmessConf["path"].toVariant().toString() : (net == "quic" ? "" : "/");
host = vmessConf.contains("host") ? vmessConf["host"].toVariant().toString() : (net == "quic" ? "none" : "/");
} }
// Repect connection type rather than obfs type // // Repect connection type rather than obfs type //
if (QStringList{ "srtp", "utp", "wechat-video" }.contains(type)) // if (QStringList{ "srtp", "utp", "wechat-video" }.contains(type)) //
@ -250,7 +233,8 @@ namespace Qv2ray::core::connection
} }
else if (net == "ws") else if (net == "ws")
{ {
streaming.wsSettings.headers["Host"] = host; if (!host.isEmpty())
streaming.wsSettings.headers["Host"] = host;
streaming.wsSettings.path = path; streaming.wsSettings.path = path;
} }
else if (net == "kcp") else if (net == "kcp")