Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-10-13 20:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix
Some checks are pending
release Linux / build (Release) (push) Waiting to run
Details
release macOS / build (Release) (push) Waiting to run
Details
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
Details
release Windows / build (Release) (push) Waiting to run
Details

Browse source 
https://github.com/2dust/v2rayN/issues/8061
This commit is contained in:
2dust 2025-10-04 19:54:15 +08:00
parent 185c5e4bfb
commit a452bbe140
5 changed files with 49 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
View file

@ -155,61 +155,60 @@ public class BaseFmt
protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item) protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
{ {
item.Flow = query["flow"] ?? ""; item.Flow = GetQueryValue(query, "flow");
item.StreamSecurity = query["security"] ?? ""; item.StreamSecurity = GetQueryValue(query, "security");
item.Sni = query["sni"] ?? ""; item.Sni = GetQueryValue(query, "sni");
item.Alpn = Utils.UrlDecode(query["alpn"] ?? ""); item.Alpn = GetQueryDecoded(query, "alpn");
item.Fingerprint = Utils.UrlDecode(query["fp"] ?? ""); item.Fingerprint = GetQueryDecoded(query, "fp");
item.PublicKey = Utils.UrlDecode(query["pbk"] ?? ""); item.PublicKey = GetQueryDecoded(query, "pbk");
item.ShortId = Utils.UrlDecode(query["sid"] ?? ""); item.ShortId = GetQueryDecoded(query, "sid");
item.SpiderX = Utils.UrlDecode(query["spx"] ?? ""); item.SpiderX = GetQueryDecoded(query, "spx");
item.Mldsa65Verify = Utils.UrlDecode(query["pqv"] ?? ""); item.Mldsa65Verify = GetQueryDecoded(query, "pqv");
item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : ""; item.AllowInsecure = new[] { "allowInsecure", "allow_insecure", "insecure" }.Any(k => (query[k] ?? "") == "1") ? "true" : "";
item.Network = query["type"] ?? nameof(ETransport.tcp); item.Network = GetQueryValue(query, "type", nameof(ETransport.tcp));
switch (item.Network) switch (item.Network)
{ {
case nameof(ETransport.tcp): case nameof(ETransport.tcp):
item.HeaderType = query["headerType"] ?? Global.None; item.HeaderType = GetQueryValue(query, "headerType", Global.None);
item.RequestHost = Utils.UrlDecode(query["host"] ?? ""); item.RequestHost = GetQueryDecoded(query, "host");
break; break;
case nameof(ETransport.kcp): case nameof(ETransport.kcp):
item.HeaderType = query["headerType"] ?? Global.None; item.HeaderType = GetQueryValue(query, "headerType", Global.None);
item.Path = Utils.UrlDecode(query["seed"] ?? ""); item.Path = GetQueryDecoded(query, "seed");
break; break;
case nameof(ETransport.ws): case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade): case nameof(ETransport.httpupgrade):
item.RequestHost = Utils.UrlDecode(query["host"] ?? ""); item.RequestHost = GetQueryDecoded(query, "host");
item.Path = Utils.UrlDecode(query["path"] ?? "/"); item.Path = GetQueryDecoded(query, "path", "/");
break; break;
case nameof(ETransport.xhttp): case nameof(ETransport.xhttp):
item.RequestHost = Utils.UrlDecode(query["host"] ?? ""); item.RequestHost = GetQueryDecoded(query, "host");
item.Path = Utils.UrlDecode(query["path"] ?? "/"); item.Path = GetQueryDecoded(query, "path", "/");
item.HeaderType = Utils.UrlDecode(query["mode"] ?? ""); item.HeaderType = GetQueryDecoded(query, "mode");
item.Extra = Utils.UrlDecode(query["extra"] ?? ""); item.Extra = GetQueryDecoded(query, "extra");
break; break;
case nameof(ETransport.http): case nameof(ETransport.http):
case nameof(ETransport.h2): case nameof(ETransport.h2):
item.Network = nameof(ETransport.h2); item.Network = nameof(ETransport.h2);
item.RequestHost = Utils.UrlDecode(query["host"] ?? ""); item.RequestHost = GetQueryDecoded(query, "host");
item.Path = Utils.UrlDecode(query["path"] ?? "/"); item.Path = GetQueryDecoded(query, "path", "/");
break; break;
case nameof(ETransport.quic): case nameof(ETransport.quic):
item.HeaderType = query["headerType"] ?? Global.None; item.HeaderType = GetQueryValue(query, "headerType", Global.None);
item.RequestHost = query["quicSecurity"] ?? Global.None; item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None);
item.Path = Utils.UrlDecode(query["key"] ?? ""); item.Path = GetQueryDecoded(query, "key");
break; break;
case nameof(ETransport.grpc): case nameof(ETransport.grpc):
item.RequestHost = Utils.UrlDecode(query["authority"] ?? ""); item.RequestHost = GetQueryDecoded(query, "authority");
item.Path = Utils.UrlDecode(query["serviceName"] ?? ""); item.Path = GetQueryDecoded(query, "serviceName");
item.HeaderType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode); item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode);
break; break;
default: default:
@ -239,4 +238,14 @@ public class BaseFmt
var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}"; var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}"; return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
} }
protected static string GetQueryValue(NameValueCollection query, string key, string defaultValue = "")
{
return query[key] ?? defaultValue;
}
protected static string GetQueryDecoded(NameValueCollection query, string key, string defaultValue = "")
{
return Utils.UrlDecode(GetQueryValue(query, key, defaultValue));
}
} }

6
v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
View file

@ -21,10 +21,10 @@ public class Hysteria2Fmt : BaseFmt
var query = Utils.ParseQueryString(url.Query); var query = Utils.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item); ResolveStdTransport(query, ref item);
item.Path = Utils.UrlDecode(query["obfs-password"] ?? ""); item.Path = GetQueryDecoded(query, "obfs-password");
item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false"; item.AllowInsecure = GetQueryValue(query, "insecure") == "1" ? "true" : "false";
item.Ports = Utils.UrlDecode(query["mport"] ?? ""); item.Ports = GetQueryDecoded(query, "mport");
return item; return item;
} }

2
v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs
View file

@ -30,7 +30,7 @@ public class TuicFmt : BaseFmt
var query = Utils.ParseQueryString(url.Query); var query = Utils.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item); ResolveStdTransport(query, ref item);
item.HeaderType = query["congestion_control"] ?? ""; item.HeaderType = GetQueryValue(query, "congestion_control");
return item; return item;
} }

4
v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs
View file

@ -24,8 +24,8 @@ public class VLESSFmt : BaseFmt
item.Id = Utils.UrlDecode(url.UserInfo); item.Id = Utils.UrlDecode(url.UserInfo);
var query = Utils.ParseQueryString(url.Query); var query = Utils.ParseQueryString(url.Query);
item.Security = query["encryption"] ?? Global.None; item.Security = GetQueryValue(query, "encryption", Global.None);
item.StreamSecurity = query["security"] ?? ""; item.StreamSecurity = GetQueryValue(query, "security");
_ = ResolveStdTransport(query, ref item); _ = ResolveStdTransport(query, ref item);
return item; return item;

8
v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs
View file

@ -24,10 +24,10 @@ public class WireguardFmt : BaseFmt
var query = Utils.ParseQueryString(url.Query); var query = Utils.ParseQueryString(url.Query);
item.PublicKey = Utils.UrlDecode(query["publickey"] ?? ""); item.PublicKey = GetQueryDecoded(query, "publickey");
item.Path = Utils.UrlDecode(query["reserved"] ?? ""); item.Path = GetQueryDecoded(query, "reserved");
item.RequestHost = Utils.UrlDecode(query["address"] ?? ""); item.RequestHost = GetQueryDecoded(query, "address");
item.ShortId = Utils.UrlDecode(query["mtu"] ?? ""); item.ShortId = GetQueryDecoded(query, "mtu");
return item; return item;
} }