github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Properly parse shadowsocks URL 

1. Parse the URL containing "colon" or "at sign" in the password.
2. Check the empty fields in the URL.
pull/866/head
Mozi 2020-06-08 15:33:22 +08:00
parent a799420d0f
commit 4f39f7a932
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
View File

@ -1266,22 +1266,44 @@ namespace v2rayN.Handler
result = Utils.Base64Decode(result); result = Utils.Base64Decode(result);
} }
string[] arr1 = result.Split('@'); //密码中可能包含“@”，所以从后往前搜索
if (arr1.Length != 2) int indexAddressAndPort = result.LastIndexOf("@");
if (indexAddressAndPort < 0)
{ {
return null; return null;
} }
string[] arr21 = arr1[0].Split(':'); string addressAndPort = result.Substring(indexAddressAndPort + 1);
//string[] arr22 = arr1[1].Split(':'); string securityAndId = result.Substring(0, indexAddressAndPort);
int indexPort = arr1[1].LastIndexOf(":");
if (arr21.Length != 2 || indexPort < 0) //IPv6地址中包含“:”，所以从后往前搜索
int indexPort = addressAndPort.LastIndexOf(":");
if (indexPort < 0)
{ {
return null; return null;
} }
vmessItem.address = arr1[1].Substring(0, indexPort);
vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1))); //加密方式中不包含“:”，所以从前往后搜索
vmessItem.security = arr21[0]; int indexId = securityAndId.IndexOf(":");
vmessItem.id = arr21[1]; if (indexId < 0)
{
return null;
}
string address = addressAndPort.Substring(0, indexPort);
string port = addressAndPort.Substring(indexPort + 1);
string security = securityAndId.Substring(0, indexId);
string id = securityAndId.Substring(indexId + 1);
//所有字段均不能为空
if (address.Length == 0 || port.Length == 0 || security.Length == 0 || id.Length == 0)
{
return null;
}
vmessItem.address = address;
vmessItem.port = Utils.ToInt(port);
vmessItem.security = security;
vmessItem.id = id;
} }
else if (result.StartsWith(Global.socksProtocol)) else if (result.StartsWith(Global.socksProtocol))
{ {