From 4ea7d10482ee68a150339ae4f7c1f40c7a9cf52d Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 11 Dec 2017 15:45:23 -0700 Subject: [PATCH 1/5] Remove stupid updates permission. Fixes #1540. --- TShockAPI/Permissions.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs index bad4148f..d4fb9229 100644 --- a/TShockAPI/Permissions.cs +++ b/TShockAPI/Permissions.cs @@ -125,9 +125,6 @@ namespace TShockAPI [Description("User can reload the configurations file.")] public static readonly string cfgreload = "tshock.cfg.reload"; - [Description("User can download updates to plugins that are currently running.")] - public static readonly string updateplugins = "tshock.cfg.updateplugins"; - [Description("User can create reference files of Terraria IDs and the permission matrix in the server folder.")] public static readonly string createdumps = "tshock.cfg.createdumps"; From 611fb6b418d807e8539d19ac7068e7d24d93f11c Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 11 Dec 2017 15:45:42 -0700 Subject: [PATCH 2/5] Remove /restart command. Fixes #1454. --- TShockAPI/Commands.cs | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index b2f08d5f..4f2cba4c 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -366,10 +366,6 @@ namespace TShockAPI { HelpText = "Reloads the server configuration file." }); - add(new Command(Permissions.maintenance, Restart, "restart") - { - HelpText = "Restarts the server." - }); add(new Command(Permissions.cfgpassword, ServerPassword, "serverpassword") { HelpText = "Changes the server password." @@ -1902,25 +1898,6 @@ namespace TShockAPI TShock.Utils.StopServer(true, reason); } - private static void Restart(CommandArgs args) - { - if (TShock.NoRestart) - { - args.Player.SendErrorMessage("This command has been disabled."); - return; - } - - if (ServerApi.RunningMono) - { - TShock.Log.ConsoleInfo("Sorry, this command has not yet been implemented in Mono."); - } - else - { - string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!"); - TShock.Utils.RestartServer(true, reason); - } - } - private static void OffNoSave(CommandArgs args) { string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!"); From 9cf949cc600841b1f129d00d047598654334b1f2 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 11 Dec 2017 15:47:05 -0700 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ce77d8..5b1e69d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added the `/dump-reference-data` command, which when run, runs Utils.Dump() and outputs Terraria reference data to the server folder. (@hakusaro) * Fixed builds to not require a specific version of OTAPI and to not fail when in Release mode (@bartico6) * Update Assembly Company to Pryaxis (@Ryozuki) +* Removed `/restart` command. (@hakusaro) +* Removed `Permissions.updateplugins` permission. (@hakusaro) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) From 3bed40ec65cc1066ca37ba52cb295bea70631d16 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 11 Dec 2017 16:01:09 -0700 Subject: [PATCH 4/5] Remove Utils.RestartServer (thanks @QuiCM!) --- TShockAPI/Utils.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index e99aadd6..8314de92 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -580,24 +580,6 @@ namespace TShockAPI Netplay.disconnect = true; } - /// - /// Stops the server after kicking all players with a reason message, and optionally saving the world then attempts to - /// restart it. - /// - /// bool perform a world save before stop (default: true) - /// string reason (default: "Server shutting down!") - public void RestartServer(bool save = true, string reason = "Server shutting down!") - { - if (Main.ServerSideCharacter) - foreach (TSPlayer player in TShock.Players) - if (player != null && player.IsLoggedIn && !player.IgnoreActionsForClearingTrashCan) - TShock.CharacterDB.InsertPlayerData(player); - - StopServer(true, reason); - System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase); - Environment.Exit(0); - } - /// /// Reloads all configuration settings, groups, regions and raises the reload event. /// From 69eda3d38e4106bce65a320e7b136beb8706e670 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 11 Dec 2017 16:09:03 -0700 Subject: [PATCH 5/5] Remove server restart rest routes --- CHANGELOG.md | 1 + TShockAPI/Rest/RestManager.cs | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b1e69d1..fe9a120f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Update Assembly Company to Pryaxis (@Ryozuki) * Removed `/restart` command. (@hakusaro) * Removed `Permissions.updateplugins` permission. (@hakusaro) +* Removed REST `/v3/server/restart/` route and `/server/restart/` route. (@hakusaro) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 01341d46..636e0407 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -205,7 +205,6 @@ namespace TShockAPI Rest.RegisterRedirect("/server/broadcast", "/v2/server/broadcast"); Rest.RegisterRedirect("/server/reload", "/v2/server/reload"); Rest.RegisterRedirect("/server/off", "/v2/server/off"); - Rest.RegisterRedirect("/server/restart", "/v3/server/restart"); Rest.RegisterRedirect("/server/rawcmd", "/v3/server/rawcmd"); //user commands @@ -247,7 +246,6 @@ namespace TShockAPI Rest.Register(new SecureRestCommand("/v2/server/broadcast", ServerBroadcast)); Rest.Register(new SecureRestCommand("/v3/server/reload", ServerReload, RestPermissions.restcfg)); Rest.Register(new SecureRestCommand("/v2/server/off", ServerOff, RestPermissions.restmaintenance)); - Rest.Register(new SecureRestCommand("/v3/server/restart", ServerRestart, RestPermissions.restmaintenance)); Rest.Register(new SecureRestCommand("/v3/server/rawcmd", ServerCommandV3, RestPermissions.restrawcommand)); Rest.Register(new SecureRestCommand("/tokentest", ServerTokenTest)); @@ -335,25 +333,6 @@ namespace TShockAPI return RestResponse("The server is shutting down"); } - [Description("Attempt to restart the server.")] - [Route("/v3/server/restart")] - [Permission(RestPermissions.restmaintenance)] - [Noun("confirm", true, "Confirm that you actually want to restart the server", typeof(bool))] - [Noun("message", false, "The shutdown message.", typeof(String))] - [Noun("nosave", false, "Shutdown without saving.", typeof(bool))] - [Token] - private object ServerRestart(RestRequestArgs args) - { - if (!GetBool(args.Parameters["confirm"], false)) - return RestInvalidParam("confirm"); - - // Inform players the server is shutting down - var reason = string.IsNullOrWhiteSpace(args.Parameters["message"]) ? "Server is restarting" : args.Parameters["message"]; - TShock.Utils.RestartServer(!GetBool(args.Parameters["nosave"], false), reason); - - return RestResponse("The server is shutting down and will attempt to restart"); - } - [Description("Reload config files for the server.")] [Route("/v3/server/reload")] [Permission(RestPermissions.restcfg)]