Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 70 additions & 1 deletion src/generator/config/subexport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ void proxyToQuanX(std::vector<Proxy> &nodes, INIReader &ini, std::vector<Ruleset

processRemark(x.Remark, remarks_list);

std::string &hostname = x.Hostname, &method = x.EncryptMethod, &id = x.UserId, &transproto = x.TransferProtocol, &host = x.Host, &path = x.Path, &password = x.Password, &plugin = x.Plugin, &pluginopts = x.PluginOption, &protocol = x.Protocol, &protoparam = x.ProtocolParam, &obfs = x.OBFS, &obfsparam = x.OBFSParam, &username = x.Username;
std::string &hostname = x.Hostname, &method = x.EncryptMethod, &id = x.UserId, &transproto = x.TransferProtocol, &host = x.Host, &path = x.Path, &password = x.Password, &plugin = x.Plugin, &pluginopts = x.PluginOption, &protocol = x.Protocol, &protoparam = x.ProtocolParam, &obfs = x.OBFS, &obfsparam = x.OBFSParam, &username = x.Username, &uuid = x.UUID, &sni = x.SNI, &publickey = x.PublicKey, &shortid = x.ShortID, &flow = x.Flow;
std::string port = std::to_string(x.Port);
bool &tlssecure = x.TLSSecure;

Expand Down Expand Up @@ -1756,6 +1756,75 @@ void proxyToQuanX(std::vector<Proxy> &nodes, INIReader &ini, std::vector<Ruleset
proxyStr += ", over-tls=false";
}
}
break;
case ProxyType::VLESS:
method = "none";
proxyStr = "vless = " + hostname + ":" + port + ", method=" + method + ", password=" + uuid;
if(tlssecure && !tls13.is_undef())
proxyStr += ", tls13=" + std::string(tls13 ? "true" : "false");
if(transproto == "ws")
{
if(tlssecure)
proxyStr += ", obfs=wss";
else
proxyStr += ", obfs=ws";

if(tlssecure && !publickey.empty() && sni.empty())
writeLog(0, "Quantumult X vless reality: public key present but SNI missing; skipping reality output.", LOG_LEVEL_WARNING);
if(tlssecure && !shortid.empty() && publickey.empty())
writeLog(0, "Quantumult X vless reality: shortid present but public key missing; skipping reality output.", LOG_LEVEL_WARNING);

if(tlssecure && !publickey.empty() && !sni.empty())
proxyStr += ", obfs-host=" + sni;
else if(!host.empty())
proxyStr += ", obfs-host=" + host;

if(!path.empty())
proxyStr += ", obfs-uri=" + path;

if(tlssecure && !publickey.empty() && !sni.empty())
{
proxyStr += ", reality-base64-pubkey=" + publickey;
if(!shortid.empty())
proxyStr += ", reality-hex-shortid=" + shortid;
}
}
else if(transproto == "http")
{
proxyStr += ", obfs=http";
if(!host.empty())
proxyStr += ", obfs-host=" + host;
if(!path.empty())
proxyStr += ", obfs-uri=" + path;
}
else if(transproto == "tcp")
{
if(tlssecure){
proxyStr += ", obfs=over-tls";

if(!publickey.empty() && sni.empty())
writeLog(0, "Quantumult X vless reality: public key present but SNI missing; skipping reality output.", LOG_LEVEL_WARNING);
if(!shortid.empty() && publickey.empty())
writeLog(0, "Quantumult X vless reality: shortid present but public key missing; skipping reality output.", LOG_LEVEL_WARNING);

if(!publickey.empty() && !sni.empty()){
proxyStr += ", obfs-host=" + sni;
proxyStr += ", reality-base64-pubkey=" + publickey;
if(!shortid.empty())
proxyStr += ", reality-hex-shortid=" + shortid;
if(!flow.empty())
proxyStr += ", vless-flow=" + flow;
}

}
}
else if(tlssecure)
{
proxyStr += ", obfs=over-tls";
if(!sni.empty())
proxyStr += ", obfs-host=" + sni;
}

break;
default:
continue;
Expand Down
9 changes: 6 additions & 3 deletions src/parser/subparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1406,8 +1406,10 @@ void explodeClash(Node yamlnode, std::vector<Proxy> &nodes)
singleproxy["path"] >>= path;
break;
}
vlessConstruct(node, group, ps, server, port, uuid, sni, alpn, type, net, mode, host, path, fingerprint, flow, xtls, public_key, short_id, client_fingerprint, udp, tfo, scv, underlying_proxy);
tls = safe_as<std::string>(singleproxy["tls"]) == "true" ? "tls" : "";

vlessConstruct(node, group, ps, server, port, uuid, sni, alpn, type, net, mode, host, path, fingerprint, flow, xtls, public_key, short_id, client_fingerprint, udp, tfo, scv, underlying_proxy);
node.TLSSecure = tls == "tls";
// Assign new parameters to node for VLESS
node.IpVersion = ip_version;
node.EchEnable = ech_enable;
Expand Down Expand Up @@ -2124,7 +2126,7 @@ void explodeAnyTLS(std::string anytls, Proxy &node) {
}

void explodeStdVLESS(std::string vless, Proxy &node) {
std::string add, port, uuid, sni, alpn, net, type, mode, host, path, fingerprint, remarks, addition, flow, xtls, public_key, short_id;
std::string add, port, uuid, sni, alpn, net, type, mode, host, path, fingerprint, remarks, addition, flow, xtls, public_key, short_id, security, tls;
tribool tfo, scv;
std::string decoded, userinfo, hostinfo;
string_array user_parts;
Expand Down Expand Up @@ -2185,6 +2187,7 @@ void explodeStdVLESS(std::string vless, Proxy &node) {
flow = getUrlArg(addition, "flow");
xtls = getUrlArg(addition, "xtls");
public_key = getUrlArg(addition, "pbk");
security = getUrlArg(addition, "security");
short_id = getUrlArg(addition, "sid");
tfo = tribool(getUrlArg(addition, "tfo"));
std::string insecure_val = getUrlArg(addition, "insecure");
Expand Down Expand Up @@ -2224,7 +2227,7 @@ void explodeStdVLESS(std::string vless, Proxy &node) {

if (remarks.empty())
remarks = add + ":" + port;

node.TLSSecure = security == "tls" || security == "reality";
vlessConstruct(node, VLESS_DEFAULT_GROUP, remarks, add, port, uuid, sni, alpn, type, net, mode, host, path, fingerprint, flow, xtls, public_key, short_id, "", tribool(), tfo, scv, "");
}

Expand Down