themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added URI-unescaping for inputs into REST requests

Browse source
This commit is contained in:
Chris 2020-12-23 01:46:42 +10:30
parent 1b4dc5361c
commit 51f179f84a
4 changed files with 105 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/Rest/RestManager.cs
View file

@ -1261,7 +1261,7 @@ namespace TShockAPI
return bool.TryParse(val, out ret) ? ret : def;
}
private object PlayerFind(IParameterCollection parameters)
private object PlayerFind(EscapedParameterCollection parameters)
{
string name = parameters["player"];
if (string.IsNullOrWhiteSpace(name))
@ -1279,7 +1279,7 @@ namespace TShockAPI
}
}
private object UserFind(IParameterCollection parameters)
private object UserFind(EscapedParameterCollection parameters)
{
string name = parameters["user"];
if (string.IsNullOrWhiteSpace(name))
@ -1314,7 +1314,7 @@ namespace TShockAPI
return account;
}
private object GroupFind(IParameterCollection parameters)
private object GroupFind(EscapedParameterCollection parameters)
{
var name = parameters["group"];
if (string.IsNullOrWhiteSpace(name))
@ -1327,7 +1327,7 @@ namespace TShockAPI
return group;
}
private Dictionary<string, object> PlayerFilter(TSPlayer tsPlayer, IParameterCollection parameters, bool viewips = false)
private Dictionary<string, object> PlayerFilter(TSPlayer tsPlayer, EscapedParameterCollection parameters, bool viewips = false)
{
var player = new Dictionary<string, object>
{
@ -1343,7 +1343,7 @@ namespace TShockAPI
{
player.Add("ip", tsPlayer.IP);
}
foreach (IParameter filter in parameters)
foreach (EscapedParameter filter in parameters)
{
if (player.ContainsKey(filter.Name) && !player[filter.Name].Equals(filter.Value))
return null;
@ -1351,7 +1351,7 @@ namespace TShockAPI
return player;
}
private object PlayerSetMute(IParameterCollection parameters, bool mute)
private object PlayerSetMute(EscapedParameterCollection parameters, bool mute)
{
var ret = PlayerFind(parameters);
if (ret is RestObject)