From 88cd991b7e4cf51c9976d5d7fd1f9b6fcd9e5767 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 22 Dec 2022 20:59:45 -0500 Subject: [PATCH 1/2] Fix bug where server_path variable was still used I'm dumb and I fixed a bug I created. --- app/classes/web/panel_handler.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 020dee12..582517db 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -1521,10 +1521,6 @@ class PanelHandler(BaseHandler): server_obj = self.controller.servers.get_server_obj(server_id) shutdown_timeout = self.get_argument("shutdown_timeout", 60) if superuser: - server_path = self.get_argument("server_path", None) - if Helpers.is_os_windows(): - server_path.replace(" ", "^ ") - server_path = Helpers.wtol_path(server_path) log_path = self.get_argument("log_path", "") if log_path: if Helpers.is_os_windows(): @@ -1613,7 +1609,7 @@ class PanelHandler(BaseHandler): server_obj.shutdown_timeout = shutdown_timeout if superuser: if Helpers.validate_traversal( - self.helper.get_servers_root_dir(), server_path + self.helper.get_servers_root_dir(), server_obj.path ): server_obj.log_path = log_path if Helpers.validate_traversal( From 695675aa388f7c0a8bc76da7e238f4e744a85d94 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 2 Jan 2023 21:21:25 +0000 Subject: [PATCH 2/2] Update changelog !516 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb023634..2a36de19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ TBD - Fix stats error on mac M1 chips ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/512)) - Fix window path escape on java override ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/513)) - Fix Forge import stalling on 1.17 Forge servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/515)) +- Fix issue with server config for SU Accounts ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/516)) ### Tweaks - Make server directories non-configurable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/511)) - Add popover to server port to detail it's purpose ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/514))