mirror of
https://github.com/2dust/v2rayN.git
synced 2026-11-07 04:55:00 +03:00
Refactor Transport (#9004)
* Refactor transport * Rename tcp to raw * Fix * Fix Fix raw http ui Fill xhttp default mode Fix share uri Remove RawHost Fix singbox tcp http path Fix vmess share uri * Tidy Resx * Fix * Rename TransportExtra to TransportExtraItem --------- Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>
This commit is contained in:
DHR60
GitHub
@@ -5,6 +5,7 @@ namespace ServiceLib.Handler.Fmt;
|
||||
public class BaseFmt
|
||||
{
|
||||
private static readonly string[] _allowInsecureArray = new[] { "insecure", "allowInsecure", "allow_insecure" };
|
||||
private static string UrlEncodeSafe(string? value) => Utils.UrlEncode(value ?? string.Empty);
|
||||
|
||||
protected static string GetIpv6(string address)
|
||||
{
|
||||
@@ -21,6 +22,8 @@ public class BaseFmt
|
||||
|
||||
protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
|
||||
{
|
||||
var transport = item.GetTransportExtra();
|
||||
|
||||
if (item.StreamSecurity.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("security", item.StreamSecurity);
|
||||
@@ -87,54 +90,65 @@ public class BaseFmt
|
||||
dicQuery.Add("fm", Utils.UrlEncode(finalmask));
|
||||
}
|
||||
|
||||
dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));
|
||||
|
||||
switch (item.Network)
|
||||
var network = item.GetNetwork();
|
||||
if (!Global.Networks.Contains(network))
|
||||
{
|
||||
case nameof(ETransport.tcp):
|
||||
dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
|
||||
if (item.RequestHost.IsNotEmpty())
|
||||
network = nameof(ETransport.raw);
|
||||
}
|
||||
|
||||
//dicQuery.Add("type", network);
|
||||
dicQuery.Add("type", network == nameof(ETransport.raw) ? Global.RawNetworkAlias : network);
|
||||
|
||||
switch (network)
|
||||
{
|
||||
case nameof(ETransport.raw):
|
||||
dicQuery.Add("headerType", transport.RawHeaderType.IsNotEmpty() ? transport.RawHeaderType : Global.None);
|
||||
if (transport.Host.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
|
||||
dicQuery.Add("host", UrlEncodeSafe(transport.Host));
|
||||
}
|
||||
if (transport.Path.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("path", UrlEncodeSafe(transport.Path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.kcp):
|
||||
dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
|
||||
if (item.Path.IsNotEmpty())
|
||||
dicQuery.Add("headerType", transport.KcpHeaderType.IsNotEmpty() ? transport.KcpHeaderType : Global.None);
|
||||
if (transport.KcpSeed.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("seed", Utils.UrlEncode(item.Path));
|
||||
dicQuery.Add("seed", UrlEncodeSafe(transport.KcpSeed));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.ws):
|
||||
case nameof(ETransport.httpupgrade):
|
||||
if (item.RequestHost.IsNotEmpty())
|
||||
if (transport.Host.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
|
||||
dicQuery.Add("host", UrlEncodeSafe(transport.Host));
|
||||
}
|
||||
if (item.Path.IsNotEmpty())
|
||||
if (transport.Path.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("path", Utils.UrlEncode(item.Path));
|
||||
dicQuery.Add("path", UrlEncodeSafe(transport.Path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.xhttp):
|
||||
if (item.RequestHost.IsNotEmpty())
|
||||
if (transport.Host.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
|
||||
dicQuery.Add("host", UrlEncodeSafe(transport.Host));
|
||||
}
|
||||
if (item.Path.IsNotEmpty())
|
||||
if (transport.Path.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("path", Utils.UrlEncode(item.Path));
|
||||
dicQuery.Add("path", UrlEncodeSafe(transport.Path));
|
||||
}
|
||||
if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType))
|
||||
if (transport.XhttpMode.IsNotEmpty() && Global.XhttpMode.Contains(transport.XhttpMode))
|
||||
{
|
||||
dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
|
||||
dicQuery.Add("mode", UrlEncodeSafe(transport.XhttpMode));
|
||||
}
|
||||
if (item.Extra.IsNotEmpty())
|
||||
if (transport.XhttpExtra.IsNotEmpty())
|
||||
{
|
||||
var node = JsonUtils.ParseJson(item.Extra);
|
||||
var node = JsonUtils.ParseJson(transport.XhttpExtra);
|
||||
var extra = node != null
|
||||
? JsonUtils.Serialize(node, new JsonSerializerOptions
|
||||
{
|
||||
@@ -142,38 +156,19 @@ public class BaseFmt
|
||||
DefaultIgnoreCondition = JsonIgnoreCondition.Never,
|
||||
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
|
||||
})
|
||||
: item.Extra;
|
||||
dicQuery.Add("extra", Utils.UrlEncode(extra));
|
||||
: transport.XhttpExtra;
|
||||
dicQuery.Add("extra", UrlEncodeSafe(extra));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.http):
|
||||
case nameof(ETransport.h2):
|
||||
dicQuery["type"] = nameof(ETransport.http);
|
||||
if (item.RequestHost.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
|
||||
}
|
||||
if (item.Path.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("path", Utils.UrlEncode(item.Path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.quic):
|
||||
dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
|
||||
dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost));
|
||||
dicQuery.Add("key", Utils.UrlEncode(item.Path));
|
||||
break;
|
||||
|
||||
case nameof(ETransport.grpc):
|
||||
if (item.Path.IsNotEmpty())
|
||||
if (transport.GrpcServiceName.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
|
||||
dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
|
||||
if (item.HeaderType is Global.GrpcGunMode or Global.GrpcMultiMode)
|
||||
dicQuery.Add("authority", UrlEncodeSafe(transport.GrpcAuthority));
|
||||
dicQuery.Add("serviceName", UrlEncodeSafe(transport.GrpcServiceName));
|
||||
if (transport.GrpcMode is Global.GrpcGunMode or Global.GrpcMultiMode)
|
||||
{
|
||||
dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
|
||||
dicQuery.Add("mode", UrlEncodeSafe(transport.GrpcMode));
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -216,6 +211,8 @@ public class BaseFmt
|
||||
|
||||
protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem item)
|
||||
{
|
||||
var transport = item.GetTransportExtra();
|
||||
|
||||
item.StreamSecurity = GetQueryValue(query, "security");
|
||||
item.Sni = GetQueryValue(query, "sni");
|
||||
item.Alpn = GetQueryDecoded(query, "alpn");
|
||||
@@ -258,36 +255,54 @@ public class BaseFmt
|
||||
item.AllowInsecure = string.Empty;
|
||||
}
|
||||
|
||||
item.Network = GetQueryValue(query, "type", nameof(ETransport.tcp));
|
||||
var net = GetQueryValue(query, "type", nameof(ETransport.raw));
|
||||
if (net == Global.RawNetworkAlias)
|
||||
{
|
||||
net = nameof(ETransport.raw);
|
||||
}
|
||||
if (!Global.Networks.Contains(net))
|
||||
{
|
||||
net = nameof(ETransport.raw);
|
||||
}
|
||||
|
||||
item.Network = net;
|
||||
switch (item.Network)
|
||||
{
|
||||
case nameof(ETransport.tcp):
|
||||
item.HeaderType = GetQueryValue(query, "headerType", Global.None);
|
||||
item.RequestHost = GetQueryDecoded(query, "host");
|
||||
case nameof(ETransport.raw):
|
||||
transport = transport with
|
||||
{
|
||||
RawHeaderType = GetQueryValue(query, "headerType", Global.None),
|
||||
Host = GetQueryDecoded(query, "host"),
|
||||
Path = GetQueryDecoded(query, "path"),
|
||||
};
|
||||
break;
|
||||
|
||||
case nameof(ETransport.kcp):
|
||||
item.HeaderType = GetQueryValue(query, "headerType", Global.None);
|
||||
item.Path = GetQueryDecoded(query, "seed");
|
||||
var kcpSeed = GetQueryDecoded(query, "seed");
|
||||
transport = transport with
|
||||
{
|
||||
KcpHeaderType = GetQueryValue(query, "headerType", Global.None),
|
||||
KcpSeed = kcpSeed,
|
||||
};
|
||||
break;
|
||||
|
||||
case nameof(ETransport.ws):
|
||||
case nameof(ETransport.httpupgrade):
|
||||
item.RequestHost = GetQueryDecoded(query, "host");
|
||||
item.Path = GetQueryDecoded(query, "path", "/");
|
||||
transport = transport with
|
||||
{
|
||||
Host = GetQueryDecoded(query, "host"),
|
||||
Path = GetQueryDecoded(query, "path", "/"),
|
||||
};
|
||||
break;
|
||||
|
||||
case nameof(ETransport.xhttp):
|
||||
item.RequestHost = GetQueryDecoded(query, "host");
|
||||
item.Path = GetQueryDecoded(query, "path", "/");
|
||||
item.HeaderType = GetQueryDecoded(query, "mode");
|
||||
var extraDecoded = GetQueryDecoded(query, "extra");
|
||||
if (extraDecoded.IsNotEmpty())
|
||||
var xhttpExtra = GetQueryDecoded(query, "extra");
|
||||
if (xhttpExtra.IsNotEmpty())
|
||||
{
|
||||
var node = JsonUtils.ParseJson(extraDecoded);
|
||||
var node = JsonUtils.ParseJson(xhttpExtra);
|
||||
if (node != null)
|
||||
{
|
||||
extraDecoded = JsonUtils.Serialize(node, new JsonSerializerOptions
|
||||
xhttpExtra = JsonUtils.Serialize(node, new JsonSerializerOptions
|
||||
{
|
||||
WriteIndented = true,
|
||||
DefaultIgnoreCondition = JsonIgnoreCondition.Never,
|
||||
@@ -295,31 +310,32 @@ public class BaseFmt
|
||||
});
|
||||
}
|
||||
}
|
||||
item.Extra = extraDecoded;
|
||||
break;
|
||||
|
||||
case nameof(ETransport.http):
|
||||
case nameof(ETransport.h2):
|
||||
item.Network = nameof(ETransport.h2);
|
||||
item.RequestHost = GetQueryDecoded(query, "host");
|
||||
item.Path = GetQueryDecoded(query, "path", "/");
|
||||
break;
|
||||
|
||||
case nameof(ETransport.quic):
|
||||
item.HeaderType = GetQueryValue(query, "headerType", Global.None);
|
||||
item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None);
|
||||
item.Path = GetQueryDecoded(query, "key");
|
||||
transport = transport with
|
||||
{
|
||||
Host = GetQueryDecoded(query, "host"),
|
||||
Path = GetQueryDecoded(query, "path", "/"),
|
||||
XhttpMode = GetQueryDecoded(query, "mode"),
|
||||
XhttpExtra = xhttpExtra,
|
||||
};
|
||||
break;
|
||||
|
||||
case nameof(ETransport.grpc):
|
||||
item.RequestHost = GetQueryDecoded(query, "authority");
|
||||
item.Path = GetQueryDecoded(query, "serviceName");
|
||||
item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode);
|
||||
transport = transport with
|
||||
{
|
||||
GrpcAuthority = GetQueryDecoded(query, "authority"),
|
||||
GrpcServiceName = GetQueryDecoded(query, "serviceName"),
|
||||
GrpcMode = GetQueryDecoded(query, "mode", Global.GrpcGunMode),
|
||||
};
|
||||
break;
|
||||
|
||||
default:
|
||||
item.Network = nameof(ETransport.raw);
|
||||
break;
|
||||
}
|
||||
|
||||
item.SetTransportExtra(transport);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -42,31 +42,28 @@ public class ShadowsocksFmt : BaseFmt
|
||||
//url = Utile.Base64Encode(url);
|
||||
//new Sip002
|
||||
var pw = Utils.Base64Encode($"{item.GetProtocolExtra().SsMethod}:{item.Password}", true);
|
||||
var transport = item.GetTransportExtra();
|
||||
|
||||
// plugin
|
||||
var plugin = string.Empty;
|
||||
var pluginArgs = string.Empty;
|
||||
|
||||
if (item.Network == nameof(ETransport.tcp) && item.HeaderType == Global.TcpHeaderHttp)
|
||||
if (item.Network == nameof(ETransport.raw) && transport.RawHeaderType == Global.RawHeaderHttp)
|
||||
{
|
||||
plugin = "obfs-local";
|
||||
pluginArgs = $"obfs=http;obfs-host={item.RequestHost};";
|
||||
pluginArgs = $"obfs=http;obfs-host={transport.Host};";
|
||||
}
|
||||
else
|
||||
{
|
||||
if (item.Network == nameof(ETransport.ws))
|
||||
{
|
||||
pluginArgs += "mode=websocket;";
|
||||
pluginArgs += $"host={item.RequestHost};";
|
||||
pluginArgs += $"host={transport.Host};";
|
||||
// https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172
|
||||
// Equal signs and commas [and backslashes] must be escaped with a backslash.
|
||||
var path = item.Path.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
|
||||
var path = (transport.Path ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
|
||||
pluginArgs += $"path={path};";
|
||||
}
|
||||
else if (item.Network == nameof(ETransport.quic))
|
||||
{
|
||||
pluginArgs += "mode=quic;";
|
||||
}
|
||||
if (item.StreamSecurity == Global.StreamSecurity)
|
||||
{
|
||||
pluginArgs += "tls;";
|
||||
@@ -213,8 +210,11 @@ public class ShadowsocksFmt : BaseFmt
|
||||
{
|
||||
obfsHost = obfsHost.Replace("obfs-host=", "");
|
||||
item.Network = Global.DefaultNetwork;
|
||||
item.HeaderType = Global.TcpHeaderHttp;
|
||||
item.RequestHost = obfsHost;
|
||||
item.SetTransportExtra(item.GetTransportExtra() with
|
||||
{
|
||||
RawHeaderType = Global.RawHeaderHttp,
|
||||
Host = obfsHost,
|
||||
});
|
||||
}
|
||||
}
|
||||
// Parse v2ray-plugin
|
||||
@@ -231,21 +231,20 @@ public class ShadowsocksFmt : BaseFmt
|
||||
if (modeValue == "websocket")
|
||||
{
|
||||
item.Network = nameof(ETransport.ws);
|
||||
var t = item.GetTransportExtra();
|
||||
if (!host.IsNullOrEmpty())
|
||||
{
|
||||
item.RequestHost = host.Replace("host=", "");
|
||||
item.Sni = item.RequestHost;
|
||||
var wsHost = host.Replace("host=", "");
|
||||
t = t with { Host = wsHost };
|
||||
item.Sni = wsHost;
|
||||
}
|
||||
if (!path.IsNullOrEmpty())
|
||||
{
|
||||
var pathValue = path.Replace("path=", "");
|
||||
pathValue = pathValue.Replace("\\=", "=").Replace("\\,", ",").Replace("\\\\", "\\");
|
||||
item.Path = pathValue;
|
||||
t = t with { Path = pathValue };
|
||||
}
|
||||
}
|
||||
else if (modeValue == "quic")
|
||||
{
|
||||
item.Network = nameof(ETransport.quic);
|
||||
item.SetTransportExtra(t);
|
||||
}
|
||||
|
||||
if (hasTls)
|
||||
|
||||
@@ -26,6 +26,7 @@ public class VmessFmt : BaseFmt
|
||||
|
||||
var vmessQRCode = new VmessQRCode
|
||||
{
|
||||
// vmess link keeps shared transport keys; map from new transport model on export.
|
||||
v = 2,
|
||||
ps = item.Remarks.TrimEx(),
|
||||
add = item.Address,
|
||||
@@ -33,10 +34,34 @@ public class VmessFmt : BaseFmt
|
||||
id = item.Password,
|
||||
aid = int.TryParse(item.GetProtocolExtra()?.AlterId, out var result) ? result : 0,
|
||||
scy = item.GetProtocolExtra().VmessSecurity ?? "",
|
||||
net = item.Network,
|
||||
type = item.HeaderType,
|
||||
host = item.RequestHost,
|
||||
path = item.Path,
|
||||
net = item.GetNetwork() == nameof(ETransport.raw) ? Global.RawNetworkAlias : item.Network,
|
||||
type = item.GetNetwork() switch
|
||||
{
|
||||
nameof(ETransport.raw) => item.GetTransportExtra().RawHeaderType,
|
||||
nameof(ETransport.kcp) => item.GetTransportExtra().KcpHeaderType,
|
||||
nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpMode,
|
||||
nameof(ETransport.grpc) => item.GetTransportExtra().GrpcMode,
|
||||
_ => Global.None,
|
||||
},
|
||||
host = item.GetNetwork() switch
|
||||
{
|
||||
nameof(ETransport.raw) => item.GetTransportExtra().Host,
|
||||
nameof(ETransport.ws) => item.GetTransportExtra().Host,
|
||||
nameof(ETransport.httpupgrade) => item.GetTransportExtra().Host,
|
||||
nameof(ETransport.xhttp) => item.GetTransportExtra().Host,
|
||||
nameof(ETransport.grpc) => item.GetTransportExtra().GrpcAuthority,
|
||||
_ => null,
|
||||
},
|
||||
path = item.GetNetwork() switch
|
||||
{
|
||||
nameof(ETransport.raw) => item.GetTransportExtra().Path,
|
||||
nameof(ETransport.kcp) => item.GetTransportExtra().KcpSeed,
|
||||
nameof(ETransport.ws) => item.GetTransportExtra().Path,
|
||||
nameof(ETransport.httpupgrade) => item.GetTransportExtra().Path,
|
||||
nameof(ETransport.xhttp) => item.GetTransportExtra().Path,
|
||||
nameof(ETransport.grpc) => item.GetTransportExtra().GrpcServiceName,
|
||||
_ => null,
|
||||
},
|
||||
tls = item.StreamSecurity,
|
||||
sni = item.Sni,
|
||||
alpn = item.Alpn,
|
||||
@@ -70,7 +95,10 @@ public class VmessFmt : BaseFmt
|
||||
}
|
||||
|
||||
item.Network = Global.DefaultNetwork;
|
||||
item.HeaderType = Global.None;
|
||||
var transport = new TransportExtraItem
|
||||
{
|
||||
RawHeaderType = Global.None,
|
||||
};
|
||||
|
||||
//item.ConfigVersion = vmessQRCode.v;
|
||||
item.Remarks = Utils.ToString(vmessQRCode.ps);
|
||||
@@ -84,15 +112,30 @@ public class VmessFmt : BaseFmt
|
||||
});
|
||||
if (vmessQRCode.net.IsNotEmpty())
|
||||
{
|
||||
item.Network = vmessQRCode.net;
|
||||
item.Network = vmessQRCode.net == Global.RawNetworkAlias ? nameof(ETransport.raw) : vmessQRCode.net;
|
||||
}
|
||||
if (vmessQRCode.type.IsNotEmpty())
|
||||
{
|
||||
item.HeaderType = vmessQRCode.type;
|
||||
transport = item.GetNetwork() switch
|
||||
{
|
||||
nameof(ETransport.raw) => transport with { RawHeaderType = vmessQRCode.type },
|
||||
nameof(ETransport.kcp) => transport with { KcpHeaderType = vmessQRCode.type },
|
||||
nameof(ETransport.xhttp) => transport with { XhttpMode = vmessQRCode.type },
|
||||
nameof(ETransport.grpc) => transport with { GrpcMode = vmessQRCode.type },
|
||||
_ => transport,
|
||||
};
|
||||
}
|
||||
|
||||
item.RequestHost = Utils.ToString(vmessQRCode.host);
|
||||
item.Path = Utils.ToString(vmessQRCode.path);
|
||||
transport = item.GetNetwork() switch
|
||||
{
|
||||
nameof(ETransport.raw) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) },
|
||||
nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) },
|
||||
nameof(ETransport.ws) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) },
|
||||
nameof(ETransport.httpupgrade) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) },
|
||||
nameof(ETransport.xhttp) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) },
|
||||
nameof(ETransport.grpc) => transport with { GrpcAuthority = Utils.ToString(vmessQRCode.host), GrpcServiceName = Utils.ToString(vmessQRCode.path) },
|
||||
_ => transport,
|
||||
};
|
||||
item.SetTransportExtra(transport);
|
||||
item.StreamSecurity = Utils.ToString(vmessQRCode.tls);
|
||||
item.Sni = Utils.ToString(vmessQRCode.sni);
|
||||
item.Alpn = Utils.ToString(vmessQRCode.alpn);
|
||||
@@ -122,7 +165,7 @@ public class VmessFmt : BaseFmt
|
||||
|
||||
item.SetProtocolExtra(new ProtocolExtraItem
|
||||
{
|
||||
VmessSecurity = "auto",
|
||||
VmessSecurity = Global.DefaultSecurity,
|
||||
});
|
||||
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
|
||||
Reference in New Issue
Block a user