From 34136cf3d5a4522e19e3c4210c15c8ad1bb1b7ec Mon Sep 17 00:00:00 2001 From: Graham Cantin Date: Mon, 5 Sep 2011 04:11:10 -0700 Subject: [PATCH 1/2] Added ban info and destroy to RestManager.cs --- TShockAPI/RestManager.cs | 99 ++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 25 deletions(-) diff --git a/TShockAPI/RestManager.cs b/TShockAPI/RestManager.cs index bb482b07..003068ba 100644 --- a/TShockAPI/RestManager.cs +++ b/TShockAPI/RestManager.cs @@ -24,11 +24,52 @@ namespace TShockAPI { Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) {RequiesToken = true}); Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) {RequiesToken = true}); + Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiesToken = true }); + Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiesToken = true }); + + Rest.Register(new RestCommand("/lists/players", UserList) {RequiesToken = true}); //RegisterExamples(); - } + } #region RestMethods + + object TokenTest(RestVerbs verbs, IParameterCollection parameters) + { + return new Dictionary { { "status", "200" }, { "response", "Token is valid and was passed through correctly." } }; + } + + object Status(RestVerbs verbs, IParameterCollection parameters) + { + var returnBlock = new Dictionary(); + if (TShock.Config.EnableTokenEndpointAuthentication) + { + returnBlock.Add("status", "403"); + returnBlock.Add("error", "Server settings require a token for this API call."); + return returnBlock; + } + string CurrentPlayers = ""; + int PlayerCount = 0; + for (int i = 0; i < Main.player.Length; i++) + { + if (Main.player[i].active) + { + CurrentPlayers += Main.player[i].name + ", "; + PlayerCount++; + } + } + returnBlock.Add("status", "200"); + returnBlock.Add("name", TShock.Config.ServerNickname); + returnBlock.Add("port", Convert.ToString(TShock.Config.ServerPort)); + returnBlock.Add("playercount", Convert.ToString(PlayerCount)); + returnBlock.Add("players", CurrentPlayers); + + return returnBlock; + } + + #endregion + + #region RestUserMethods object UserList(RestVerbs verbs, IParameterCollection parameters) { @@ -121,37 +162,45 @@ namespace TShockAPI { return returnBlock; } - object TokenTest(RestVerbs verbs, IParameterCollection parameters) - { - return new Dictionary - {{"status", "200"}, {"response", "Token is valid and was passed through correctly."}}; - } + #endregion - object Status(RestVerbs verbs, IParameterCollection parameters) + #region RestBanMethods + + object BanDestroy(RestVerbs verbs, IParameterCollection parameters) { - var returnBlock = new Dictionary(); - if (TShock.Config.EnableTokenEndpointAuthentication) + var ban = TShock.Bans.GetBanByName(verbs["user"]); + if (ban == null) { - returnBlock.Add("status", "403"); - returnBlock.Add("error", "Server settings require a token for this API call."); + return new Dictionary { { "status", "400" }, { "error", "The specified ban doesn't exist." } }; + } + var returnBlock = new Dictionary(); + try + { + TShock.Bans.RemoveBan(ban.IP); + } + catch (Exception) + { + returnBlock.Add("status", "400"); + returnBlock.Add("error", "The specified ban was unable to be removed."); return returnBlock; } - string CurrentPlayers = ""; - int PlayerCount = 0; - for (int i = 0; i < Main.player.Length; i++ ) - { - if (Main.player[i].active) - { - CurrentPlayers += Main.player[i].name + ", "; - PlayerCount++; - } - } returnBlock.Add("status", "200"); - returnBlock.Add("name", TShock.Config.ServerNickname); - returnBlock.Add("port", Convert.ToString(TShock.Config.ServerPort)); - returnBlock.Add("playercount", Convert.ToString(PlayerCount)); - returnBlock.Add("players", CurrentPlayers); + returnBlock.Add("response", "Ban deleted successfully."); + return returnBlock; + } + object BanInfo(RestVerbs verbs, IParameterCollection parameters) + { + var ban = TShock.Bans.GetBanByName(verbs["user"]); + if (ban == null) + { + return new Dictionary { { "status", "400" }, { "error", "The specified ban doesn't exist." } }; + } + + var returnBlock = new Dictionary(); + returnBlock.Add("status", "200"); + returnBlock.Add("reason", ban.Reason); + returnBlock.Add("ip", ban.IP); return returnBlock; } From afff00b5027e9332b5447017ebe2a7227b64b3f3 Mon Sep 17 00:00:00 2001 From: Graham Cantin Date: Mon, 5 Sep 2011 05:15:08 -0700 Subject: [PATCH 2/2] REST: ban creation, lookup by name or ip for ban info/delete REST: There are no methods in banmanager to update bans, Update skipped. --- TShockAPI/RestManager.cs | 73 ++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/TShockAPI/RestManager.cs b/TShockAPI/RestManager.cs index 003068ba..33448e80 100644 --- a/TShockAPI/RestManager.cs +++ b/TShockAPI/RestManager.cs @@ -24,6 +24,7 @@ namespace TShockAPI { Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) {RequiesToken = true}); Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) {RequiesToken = true}); + Rest.Register(new RestCommand("/bans/create", BanCreate) { RequiesToken = true }); Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiesToken = true }); Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiesToken = true }); @@ -129,7 +130,7 @@ namespace TShockAPI { var user = TShock.Users.GetUserByName(verbs["user"]); if (user == null) { - return new Dictionary { { "status", "400" }, { "error", "The specified user account does't exist." } }; + return new Dictionary { { "status", "400" }, { "error", "The specified user account does not exist." } }; } var returnBlock = new Dictionary(); try @@ -152,7 +153,7 @@ namespace TShockAPI { if (user == null) { return new Dictionary - {{"status", "400"}, {"error", "The specified user account does't exist."}}; + {{"status", "400"}, {"error", "The specified user account does not exist."}}; } var returnBlock = new Dictionary(); @@ -166,14 +167,49 @@ namespace TShockAPI { #region RestBanMethods + object BanCreate(RestVerbs verbs, IParameterCollection parameters) + { + var returnBlock = new Dictionary(); + try + { + TShock.Bans.AddBan(parameters["ip"], parameters["name"], parameters["reason"]); + } + catch (Exception) + { + returnBlock.Add("status", "400"); + returnBlock.Add("error", "The specified ban was unable to be created."); + return returnBlock; + } + returnBlock.Add("status", "200"); + returnBlock.Add("response", "Ban created successfully."); + return returnBlock; + } + object BanDestroy(RestVerbs verbs, IParameterCollection parameters) { - var ban = TShock.Bans.GetBanByName(verbs["user"]); + var returnBlock = new Dictionary(); + + var type = parameters["type"]; + if (type == null) + { + returnBlock.Add("Error", "Invalid Type"); + return returnBlock; + } + + var ban = new DB.Ban(); + if (type == "ip") ban = TShock.Bans.GetBanByIp(verbs["user"]); + else if (type == "name") ban = TShock.Bans.GetBanByName(verbs["user"]); + else + { + returnBlock.Add("Error", "Invalid Type"); + return returnBlock; + } + if (ban == null) { - return new Dictionary { { "status", "400" }, { "error", "The specified ban doesn't exist." } }; + return new Dictionary { { "status", "400" }, { "error", "The specified ban does not exist." } }; } - var returnBlock = new Dictionary(); + try { TShock.Bans.RemoveBan(ban.IP); @@ -191,16 +227,33 @@ namespace TShockAPI { object BanInfo(RestVerbs verbs, IParameterCollection parameters) { - var ban = TShock.Bans.GetBanByName(verbs["user"]); - if (ban == null) + var returnBlock = new Dictionary(); + + var type = parameters["type"]; + if (type == null) { - return new Dictionary { { "status", "400" }, { "error", "The specified ban doesn't exist." } }; + returnBlock.Add("Error", "Invalid Type"); + return returnBlock; + } + + var ban = new DB.Ban(); + if (type == "ip") ban = TShock.Bans.GetBanByIp(verbs["user"]); + else if (type == "name") ban = TShock.Bans.GetBanByName(verbs["user"]); + else + { + returnBlock.Add("Error", "Invalid Type"); + return returnBlock; + } + + if (ban == null) + { + return new Dictionary { { "status", "400" }, { "error", "The specified ban does not exist." } }; } - var returnBlock = new Dictionary(); returnBlock.Add("status", "200"); - returnBlock.Add("reason", ban.Reason); + returnBlock.Add("name", ban.Name); returnBlock.Add("ip", ban.IP); + returnBlock.Add("reason", ban.Reason); return returnBlock; }