pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-29 00:25:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adding checks for subscription url

Browse Source
This commit is contained in:
2dust
2024-10-24 17:09:07 +08:00
parent 3fafc6de93
commit 34f5c0f910
11 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Handler/ConfigHandler.cs
+8 -8
View File
@@ -1335,17 +1335,17 @@ namespace ServiceLib.Handler
Url = url
};
try
var uri = Utils.TryUri(url);
if (uri == null) return -1;
//Do not allow http protocol
if (url.StartsWith(Global.HttpProtocol) && !Utils.IsPrivateNetwork(uri.IdnHost))
{
var uri = new Uri(url);
var queryVars = Utils.ParseQueryString(uri.Query);
subItem.Remarks = queryVars["remarks"] ?? "import_sub";
}
catch (UriFormatException)
{
return 0;
return -1;
}
var queryVars = Utils.ParseQueryString(uri.Query);
subItem.Remarks = queryVars["remarks"] ?? "import_sub";
return await AddSubItem(config, subItem);
}
v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
+2 -1
View File
@@ -10,7 +10,8 @@
ConfigType = EConfigType.Hysteria2
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;
v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs
+3 -9
View File
@@ -81,15 +81,9 @@ namespace ServiceLib.Handler.Fmt
private static ProfileItem? ResolveSip002(string result)
{
Uri parsedUrl;
try
{
parsedUrl = new Uri(result);
}
catch (UriFormatException)
{
return null;
}
var parsedUrl = Utils.TryUri(result);
if (parsedUrl == null) return null;
ProfileItem item = new()
{
Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs
+3 -9
View File
@@ -93,15 +93,9 @@
private static ProfileItem? ResolveSocksNew(string result)
{
Uri parsedUrl;
try
{
parsedUrl = new Uri(result);
}
catch (UriFormatException)
{
return null;
}
var parsedUrl = Utils.TryUri(result);
if (parsedUrl == null) return null;
ProfileItem item = new()
{
Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs
+3 -2
View File
@@ -10,8 +10,9 @@
{
ConfigType = EConfigType.Trojan
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;
v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs
+2 -1
View File
@@ -11,7 +11,8 @@
ConfigType = EConfigType.TUIC
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;
v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs
+2 -1
View File
@@ -12,7 +12,8 @@
Security = Global.None
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;
v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs
+2 -1
View File
@@ -105,7 +105,8 @@
Security = "auto"
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;
v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs
+2 -1
View File
@@ -11,7 +11,8 @@
ConfigType = EConfigType.WireGuard
};
Uri url = new(str);
var url = Utils.TryUri(str);
if (url == null) return null;
item.Address = url.IdnHost;
item.Port = url.Port;