taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-03 02:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Breaking changes

Browse Source 
Fix broken /sub2clashr and /surge2clash interface.
Add template support for base configurations.
Add support for exporting HTTP/Socks 5 nodes to Quantumult configurations.
Add support for VMess HTTP nodes in Clash configurations.
Optimize codes.
This commit is contained in:
Tindy X committed 2020-04-02 23:18:26 +08:00
1 parent 58349a086d
commit eeae32f8eb
11 files changed
+27151 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/subexport.cpp
+56 -1
View File
@@ -855,6 +855,13 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
if(edge.size())
singleproxy["ws-headers"]["Edge"] = edge;
break;
case "http"_hash:
singleproxy["network"] = transproto;
singleproxy["http-opts"]["method"] = "GET";
singleproxy["http-opts"]["path"].push_back(path);
singleproxy["http-opts"]["headers"]["Host"].push_back(host);
if(edge.size())
singleproxy["http-opts"]["headers"]["Edge"].push_back(edge);
default:
continue;
}
@@ -1591,7 +1598,7 @@ void netchToQuan(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rules
{
rapidjson::Document json;
std::string type;
std::string remark, hostname, port, method, password;
std::string remark, hostname, port, method, username, password;
std::string plugin, pluginopts;
std::string protocol, protoparam, obfs, obfsparam;
std::string id, aid, transproto, faketype, host, edge, path, quicsecure, quicsecret;
@@ -1644,6 +1651,8 @@ void netchToQuan(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rules
proxyStr += "[Rr][Nn]Edge: " + edge;
proxyStr += "\"";
}
if(ext.skip_cert_verify)
proxyStr += ", certificate=0";
if(ext.nodelist)
proxyStr = "vmess://" + urlsafe_base64_encode(proxyStr);
@@ -1691,6 +1700,52 @@ void netchToQuan(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rules
}
}
break;
case SPEEDTEST_MESSAGE_FOUNDHTTP:
username = GetMember(json, "Username");
host = GetMember(json, "Host");
tlssecure = GetMember(json, "TLSSecure") == "true";
proxyStr = remark + " = http, upstream-proxy-address=" + hostname + ", upstream-proxy-port=" + port + ", group=" + x.group;
if(username.size() && password.size())
proxyStr += ", upstream-proxy-auth=true, upstream-proxy-username=" + username + ", upstream-proxy-password=" + password;
else
proxyStr += ", upstream-proxy-auth=false";
if(tlssecure)
{
proxyStr += ", over-tls=true";
if(host.size())
proxyStr += ", tls-host=" + host;
}
if(ext.skip_cert_verify)
proxyStr += ", certificate=0";
if(ext.nodelist)
proxyStr = "http://" + urlsafe_base64_encode(proxyStr);
break;
case SPEEDTEST_MESSAGE_FOUNDSOCKS:
username = GetMember(json, "Username");
host = GetMember(json, "Host");
tlssecure = GetMember(json, "TLSSecure") == "true";
proxyStr = remark + " = socks, upstream-proxy-address=" + hostname + ", upstream-proxy-port=" + port + ", group=" + x.group;
if(username.size() && password.size())
proxyStr += ", upstream-proxy-auth=true, upstream-proxy-username=" + username + ", upstream-proxy-password=" + password;
else
proxyStr += ", upstream-proxy-auth=false";
if(tlssecure)
{
proxyStr += ", over-tls=true";
if(host.size())
proxyStr += ", tls-host=" + host;
}
if(ext.skip_cert_verify)
proxyStr += ", certificate=0";
if(ext.nodelist)
proxyStr = "socks://" + urlsafe_base64_encode(proxyStr);
break;
default:
continue;
}