From 3974b7e8c7ee34da4b543fb350ea93109df57901 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 4 Aug 2022 19:45:44 -0400 Subject: [PATCH 01/68] poorly attempt to add "add to home" feature --- .../static/assets/images/Crafty_4-0.png | Bin 0 -> 5013 bytes app/frontend/templates/base.html | 15 ++++++++++----- app/frontend/templates/crafty.webmanifest | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 app/frontend/static/assets/images/Crafty_4-0.png create mode 100644 app/frontend/templates/crafty.webmanifest diff --git a/app/frontend/static/assets/images/Crafty_4-0.png b/app/frontend/static/assets/images/Crafty_4-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d873eedc46f1f3c3d9be420e8a8e44ec015f6ced GIT binary patch literal 5013 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 D3&c&V literal 0 HcmV?d00001 diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 4133dfac..f13fc2f4 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -15,9 +15,14 @@ + href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> + + + + + @@ -72,7 +77,7 @@ {% include notify.html %} @@ -163,7 +168,7 @@ + src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"> @@ -191,7 +196,7 @@ $.extend($.fn.dataTable.defaults, { // {{ '\nlanguage:' }} {% raw translate('datatables', 'i18n', data['lang']) %} - }) + }) //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security function getCookie(name) { @@ -525,4 +530,4 @@ - + \ No newline at end of file diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest new file mode 100644 index 00000000..c2db095c --- /dev/null +++ b/app/frontend/templates/crafty.webmanifest @@ -0,0 +1,16 @@ +{ + "background_color": "purple", + "description": "Server management control.", + "display": "fullscreen", + "icons": [ + { + "src": "../static/assets/images/Crafty_4-0.png", + "sizes": "192x192", + "type": "icon/png" + } + ], + "scope": "/", + "name": "Crafty 4", + "short_name": "Crafty", + "start_url": "/panel/dashboard" +} \ No newline at end of file From 8adcfbaf452bea807f989d7849dfab470a2e0805 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 7 Aug 2022 13:23:45 -0400 Subject: [PATCH 02/68] Updates --- app/frontend/templates/base.html | 5 ++++ app/frontend/templates/crafty.webmanifest | 34 +++++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index f13fc2f4..cdb0b5e4 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -20,6 +20,11 @@ + + + + + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest index c2db095c..06d6cafe 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.webmanifest @@ -1,16 +1,32 @@ { - "background_color": "purple", - "description": "Server management control.", - "display": "fullscreen", + "$schema": "https://json.schemastore.org/web-manifest-combined.json", + "short_name": "Crafty", + "name": "Crafty Controller 4", "icons": [ { - "src": "../static/assets/images/Crafty_4-0.png", - "sizes": "192x192", - "type": "icon/png" + "src": "../static/images/Crafty_4-0.png", + "type": "image/png", + "sizes": "192x192" } ], + "start_url": "/public/login", + "background_color": "#3367D6", + "display": "fullscreen", "scope": "/", - "name": "Crafty 4", - "short_name": "Crafty", - "start_url": "/panel/dashboard" + "theme_color": "#3367D6", + "shortcuts": [ + { + "name": "Crafty Controller 4", + "short_name": "Crafty", + "description": "View weather information for today", + "url": "/panel/dashboard", + "icons": [ + { + "src": "../static/images/Crafty_4-0.png", + "sizes": "192x192" + } + ] + } + ], + "description": "Server Management Console/Wrapper" } \ No newline at end of file From 893d166c7224f73aa90a5a45eadd3872a6467fd0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 8 Aug 2022 13:04:36 -0400 Subject: [PATCH 03/68] More testing --- app/frontend/templates/base.html | 2 +- app/frontend/templates/{crafty.webmanifest => crafty.json} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/frontend/templates/{crafty.webmanifest => crafty.json} (85%) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index cdb0b5e4..a1abb058 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,7 +18,7 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> - + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.json similarity index 85% rename from app/frontend/templates/crafty.webmanifest rename to app/frontend/templates/crafty.json index 06d6cafe..ab83b913 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.json @@ -4,7 +4,7 @@ "name": "Crafty Controller 4", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "type": "image/png", "sizes": "192x192" } @@ -22,7 +22,7 @@ "url": "/panel/dashboard", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "sizes": "192x192" } ] From cd475e0cf59c9587dbda49a8c5844172d9d97249 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 13:04:51 -0500 Subject: [PATCH 04/68] Use API to send remote commands to server --- app/classes/web/ajax_handler.py | 63 +------------------ app/frontend/templates/panel/dashboard.html | 49 ++++----------- .../templates/panel/server_backup.html | 2 +- 3 files changed, 14 insertions(+), 100 deletions(-) diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py index cd1ccc04..3887a00b 100644 --- a/app/classes/web/ajax_handler.py +++ b/app/classes/web/ajax_handler.py @@ -281,73 +281,12 @@ class AjaxHandler(BaseHandler): exec_user["user_id"], server_id ) - if page == "send_command": - command = self.get_body_argument("command", default=None, strip=True) - server_id = self.get_argument("id", None) - - if server_id is None: - logger.warning("Server ID not found in send_command ajax call") - Console.warning("Server ID not found in send_command ajax call") - - srv_obj = self.controller.servers.get_server_instance_by_id(server_id) - - if command == srv_obj.settings["stop_command"]: - logger.info( - "Stop command detected as terminal input - intercepting." - + f"Starting Crafty's stop process for server with id: {server_id}" - ) - self.controller.management.send_command( - exec_user["user_id"], server_id, self.get_remote_ip(), "stop_server" - ) - command = None - elif command == "restart": - logger.info( - "Restart command detected as terminal input - intercepting." - + f"Starting Crafty's stop process for server with id: {server_id}" - ) - self.controller.management.send_command( - exec_user["user_id"], - server_id, - self.get_remote_ip(), - "restart_server", - ) - command = None - if command: - if srv_obj.check_running(): - srv_obj.send_command(command) - - self.controller.management.add_to_audit_log( - exec_user["user_id"], - f"Sent command to " - f"{self.controller.servers.get_server_friendly_name(server_id)} " - f"terminal: {command}", - server_id, - self.get_remote_ip(), - ) - - elif page == "send_order": + if page == "send_order": self.controller.users.update_server_order( exec_user["user_id"], bleach.clean(self.get_argument("order")) ) return - elif page == "backup_now": - server_id = self.get_argument("id", None) - if server_id is None: - logger.error("Server ID is none. Canceling backup!") - return - - server = self.controller.servers.get_server_instance_by_id(server_id) - self.controller.management.add_to_audit_log_raw( - self.controller.users.get_user_by_id(exec_user["user_id"])["username"], - exec_user["user_id"], - server_id, - f"Backup now executed for server {server_id} ", - source_ip=self.get_remote_ip(), - ) - - server.backup_server() - elif page == "select_photo": if exec_user["superuser"]: photo = urllib.parse.unquote(self.get_argument("photo", "")) diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index 981a4163..a1c25231 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -645,10 +645,13 @@ $.ajax({ type: "POST", headers: { 'X-XSRFToken': token }, - url: '/server/command?command=' + command + '&id=' + server_id, + url: `/api/v2/servers/${server_id}/action/${command}`, success: function (data) { console.log("got response:"); console.log(data); + if (command === "clone_server" && data.status === "ok") { + window.location.reload(); + } /*setTimeout(function () { if (command != 'start_server') { location.reload(); @@ -703,24 +706,6 @@ document.querySelector('.dynamicMsg').appendChild(parentEl); } - function send_kill(server_id) { - /* this getCookie function is in base.html */ - const token = getCookie("_xsrf"); - - $.ajax({ - type: "POST", - headers: { 'X-XSRFToken': token }, - url: '/ajax/kill?id=' + server_id, - success: function (data) { - console.log("got response:"); - console.log(data); - /*setTimeout(function () { - location.reload(); - }, 10000);*/ - } - }); - } - function update_one_server_status(server) { /* Mobile view update */ server_cpu = document.getElementById('server_cpu_' + server.id); @@ -899,17 +884,11 @@ }, callback: function (result) { if (result) { - send_kill(server_id); + send_command(server_id, "kill_server"); let dialog = bootbox.dialog({ title: '{% raw translate("dashboard", "killing", data["lang"]) %}', message: '

Loading...

' }); - - dialog.init(function () { - setTimeout(function () { - location.reload(); - }, 15000); - }); } } }); @@ -998,7 +977,13 @@ }, callback: function (result) { if (result) { - cloneServer(server_id); + send_command(server_id, 'clone_server'); + bootbox.dialog({ + backdrop: true, + title: '{% raw translate("dashboard", "sendingCommand", data["lang"]) %}', + message: '
  {% raw translate("dashboard", "bePatientClone", data["lang"]) %}
', + closeButton: false, + }); } } @@ -1006,16 +991,6 @@ }); }); - - function cloneServer(server_id) { - send_command(server_id, 'clone_server'); - bootbox.dialog({ - backdrop: true, - title: '{% raw translate("dashboard", "sendingCommand", data["lang"]) %}', - message: '
  {% raw translate("dashboard", "bePatientClone", data["lang"]) %}
', - closeButton: false, - }); - } diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html index ab9b4f2e..1cb8f087 100644 --- a/app/frontend/templates/panel/server_backup.html +++ b/app/frontend/templates/panel/server_backup.html @@ -326,7 +326,7 @@ $.ajax({ type: "POST", headers: { 'X-XSRFToken': token }, - url: '/ajax/backup_now?id=' + server_id, + url: `/api/v2/servers/${server_id}/action/backup_server`, success: function (data) { return; }, From c0bca38319d54503859803b8af956ce3fa8c27c5 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 13:27:06 -0500 Subject: [PATCH 05/68] Cleanup ajax a bit more --- app/classes/web/ajax_handler.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py index 3887a00b..fd8ffe4b 100644 --- a/app/classes/web/ajax_handler.py +++ b/app/classes/web/ajax_handler.py @@ -321,23 +321,6 @@ class AjaxHandler(BaseHandler): self.controller.cached_login = "login_1.jpg" return - elif page == "kill": - if not permissions["Commands"] in user_perms: - if not superuser: - self.redirect("/panel/error?error=Unauthorized access to Commands") - return - server_id = self.get_argument("id", None) - svr = self.controller.servers.get_server_instance_by_id(server_id) - try: - svr.kill() - time.sleep(5) - svr.cleanup_server_object() - svr.record_server_stats() - except Exception as e: - logger.error( - f"Could not find PID for requested termsig. Full error: {e}" - ) - return elif page == "eula": server_id = self.get_argument("id", None) svr = self.controller.servers.get_server_instance_by_id(server_id) From 1b6c7dd4787e1e4f88f91a35167b56d3aed65313 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 13:30:21 -0500 Subject: [PATCH 06/68] Edit panel config for API --- app/frontend/templates/panel/server_config.html | 8 ++++---- app/frontend/templates/panel/server_term.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index ed5186f9..500322ec 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -359,7 +359,7 @@ $.ajax({ type: "DELETE", headers: { 'X-XSRFToken': token }, - url: '/ajax/delete_server?id=' + serverId, + url: `/api/v2/servers/${serverId}`, data: { }, success: function (data) { @@ -373,7 +373,7 @@ $.ajax({ type: "DELETE", headers: { 'X-XSRFToken': token }, - url: '/ajax/delete_server_files?id=' + serverId, + url: `/api/v2/servers/${serverId}?files=true`, data: { }, success: function (data) { @@ -393,7 +393,7 @@ $.ajax({ type: "POST", headers: { 'X-XSRFToken': token }, - url: '/server/command?command=' + command + '&id=' + serverId, + url: `/api/v2/servers/${serverId}/action/${command}`, success: function (data) { console.log("got response:"); console.log(data); @@ -522,7 +522,7 @@ $.ajax({ type: "DELETE", headers: { 'X-XSRFToken': token }, - url: '/ajax/delete_unloaded_server?id=' + serverId, + url: `/api/v2/servers/${serverId}`, data: { }, success: function (data) { diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html index 54ac127a..965d14ab 100644 --- a/app/frontend/templates/panel/server_term.html +++ b/app/frontend/templates/panel/server_term.html @@ -179,7 +179,7 @@ $.ajax({ type: "POST", headers: { 'X-XSRFToken': token }, - url: '/server/command?command=' + command + '&id=' + serverId, + url: `/api/v2/servers/${serverId}/action/${command}`, success: function (data) { console.log("got response:"); console.log(data); From c51d94023442cd389104b104318ca5f792e39996 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 14:38:14 -0500 Subject: [PATCH 07/68] Allow unloaded servers to be deleted API --- app/classes/web/routes/api/servers/server/index.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/classes/web/routes/api/servers/server/index.py b/app/classes/web/routes/api/servers/server/index.py index 3d5e3e2f..1d68b2e8 100644 --- a/app/classes/web/routes/api/servers/server/index.py +++ b/app/classes/web/routes/api/servers/server/index.py @@ -134,7 +134,15 @@ class ApiServersServerIndexHandler(BaseApiHandler): ) self.tasks_manager.remove_all_server_tasks(server_id) - self.controller.remove_server(server_id, remove_files) + failed = False + for item in self.controller.servers.failed_servers[:]: + if item["server_id"] == int(server_id): + self.controller.servers.failed_servers.remove(item) + + if failed: + self.controller.remove_unloaded_server(server_id) + else: + self.controller.remove_server(server_id, remove_files) self.controller.management.add_to_audit_log( auth_data[4]["user_id"], From ec1076fbce753f39e97e72310ff92914d284ae2a Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 14:40:02 -0500 Subject: [PATCH 08/68] Cleanup ajax handler --- app/classes/web/ajax_handler.py | 78 --------------------------------- 1 file changed, 78 deletions(-) diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py index fd8ffe4b..750badd3 100644 --- a/app/classes/web/ajax_handler.py +++ b/app/classes/web/ajax_handler.py @@ -590,84 +590,6 @@ class AjaxHandler(BaseHandler): ): os.remove(file_path) - elif page == "delete_server": - if not permissions["Config"] in user_perms: - if not superuser: - self.redirect("/panel/error?error=Unauthorized access to Config") - return - server_id = self.get_argument("id", None) - logger.info( - f"Removing server from panel for server: " - f"{self.controller.servers.get_server_friendly_name(server_id)}" - ) - - server_data = self.controller.servers.get_server_data(server_id) - server_name = server_data["server_name"] - - self.controller.management.add_to_audit_log( - exec_user["user_id"], - f"Deleted server {server_id} named {server_name}", - server_id, - self.get_remote_ip(), - ) - - self.tasks_manager.remove_all_server_tasks(server_id) - self.controller.remove_server(server_id, False) - - elif page == "delete_server_files": - if not permissions["Config"] in user_perms: - if not superuser: - self.redirect("/panel/error?error=Unauthorized access to Config") - return - server_id = self.get_argument("id", None) - logger.info( - f"Removing server and all associated files for server: " - f"{self.controller.servers.get_server_friendly_name(server_id)}" - ) - - server_data = self.controller.servers.get_server_data(server_id) - server_name = server_data["server_name"] - - self.controller.management.add_to_audit_log( - exec_user["user_id"], - f"Deleted server {server_id} named {server_name}", - server_id, - self.get_remote_ip(), - ) - - for server in self.controller.servers.failed_servers: - if server["server_id"] == int(server_id): - return - self.tasks_manager.remove_all_server_tasks(server_id) - self.controller.remove_server(server_id, True) - - elif page == "delete_unloaded_server": - if not permissions["Config"] in user_perms: - if not superuser: - self.redirect("/panel/error?error=Unauthorized access to Config") - return - server_id = self.get_argument("id", None) - logger.info( - f"Removing server and all associated files for server: " - f"{self.controller.servers.get_server_friendly_name(server_id)}" - ) - - server_data = self.controller.servers.get_server_data_by_id(server_id) - server_name = server_data["server_name"] - - self.controller.management.add_to_audit_log( - exec_user["user_id"], - f"Deleted server {server_id} named {server_name}", - server_id, - self.get_remote_ip(), - ) - - self.tasks_manager.remove_all_server_tasks(server_id) - for item in self.controller.servers.failed_servers[:]: - if item["server_id"] == int(server_id): - self.controller.servers.failed_servers.remove(item) - self.controller.remove_unloaded_server(server_id) - def check_server_id(self, server_id, page_name): if server_id is None: logger.warning( From c0381da880a3da0963d1f5b4266bdd2c39853223 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 14:59:30 -0500 Subject: [PATCH 09/68] Fix bug with unloaded server delete --- app/classes/web/routes/api/servers/server/index.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/classes/web/routes/api/servers/server/index.py b/app/classes/web/routes/api/servers/server/index.py index 1d68b2e8..a3623beb 100644 --- a/app/classes/web/routes/api/servers/server/index.py +++ b/app/classes/web/routes/api/servers/server/index.py @@ -138,6 +138,7 @@ class ApiServersServerIndexHandler(BaseApiHandler): for item in self.controller.servers.failed_servers[:]: if item["server_id"] == int(server_id): self.controller.servers.failed_servers.remove(item) + failed = True if failed: self.controller.remove_unloaded_server(server_id) From d473a6ccf408feba499ff8fc0482e8ec98f29c17 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Wed, 1 Mar 2023 15:25:28 -0500 Subject: [PATCH 10/68] Add server order to api call --- app/classes/controllers/users_controller.py | 1 + app/frontend/templates/panel/dashboard.html | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py index b9c019e8..667e01b4 100644 --- a/app/classes/controllers/users_controller.py +++ b/app/classes/controllers/users_controller.py @@ -89,6 +89,7 @@ class UsersController: }, }, "hints": {"type": "boolean"}, + "server_order": {"type": "string"}, } # ********************************************************************************** diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index a1c25231..f781cf7a 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -1042,12 +1042,12 @@ const token = getCookie("_xsrf") $.ajax({ - type: "POST", + type: "PATCH", headers: { 'X-XSRFToken': token }, - url: '/ajax/send_order?order=' + id_string, - data: { - order: id_string, - }, + url: `/api/v2/users/@me`, + data: JSON.stringify({ + server_order: id_string, + }), success: function (data) { console.log("got response:"); console.log(data); From 81e4e7e450208111214c25ab77b1f7c3ca54052b Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 2 Mar 2023 13:24:07 -0500 Subject: [PATCH 11/68] Fix command sends to server --- .../panel/server_admin_controls.html | 34 +++++++++++-------- app/frontend/templates/panel/server_term.html | 4 +-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app/frontend/templates/panel/server_admin_controls.html b/app/frontend/templates/panel/server_admin_controls.html index 02e28356..ff7ef83d 100644 --- a/app/frontend/templates/panel/server_admin_controls.html +++ b/app/frontend/templates/panel/server_admin_controls.html @@ -14,7 +14,8 @@

- {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ data['server_stats']['server_id']['server_name'] }} + {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ + data['server_stats']['server_id']['server_name'] }}
UUID: {{ data['server_stats']['server_id']['server_uuid'] }}

@@ -76,10 +77,14 @@

  • {{ player }}

    - - - - + + + +
    • {% end %} @@ -136,21 +141,22 @@ }); - function send_command_to_server(command) { + async function send_command_to_server(command) { console.log(command) var token = getCookie("_xsrf") console.log('sending command: ' + command) - $.ajax({ - type: "POST", - headers: { 'X-XSRFToken': token }, - url: '/ajax/send_command?id=' + serverId, - data: { command }, - success: function (data) { - console.log("got response:"); - console.log(data); + let res = await fetch(`/api/v2/servers/${serverId}/stdin`, { + method: 'POST', + headers: { + 'X-XSRFToken': token }, + body: command, }); + + let responseData = await res.text(); + console.log("got response:"); + console.log(responseData); } diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html index 965d14ab..9dc1d7a5 100644 --- a/app/frontend/templates/panel/server_term.html +++ b/app/frontend/templates/panel/server_term.html @@ -311,12 +311,12 @@ formdata.append('command', serverCommand) console.log('sending command: ' + serverCommand) - let res = await fetch("/ajax/send_command?id=" + serverId, { + let res = await fetch(`/api/v2/servers/${serverId}/stdin`, { method: 'POST', headers: { 'X-XSRFToken': token }, - body: formdata, + body: serverCommand, }); let responseData = await res.text(); From a373943ae64a3474e0555e0ec3654a7107bde1a1 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 2 Mar 2023 13:24:49 -0500 Subject: [PATCH 12/68] Cleanup ajax handler send audit log entry on stdin call --- app/classes/web/ajax_handler.py | 8 +------- app/classes/web/routes/api/servers/server/stdin.py | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py index 750badd3..317267b2 100644 --- a/app/classes/web/ajax_handler.py +++ b/app/classes/web/ajax_handler.py @@ -281,13 +281,7 @@ class AjaxHandler(BaseHandler): exec_user["user_id"], server_id ) - if page == "send_order": - self.controller.users.update_server_order( - exec_user["user_id"], bleach.clean(self.get_argument("order")) - ) - return - - elif page == "select_photo": + if page == "select_photo": if exec_user["superuser"]: photo = urllib.parse.unquote(self.get_argument("photo", "")) opacity = self.get_argument("opacity", 100) diff --git a/app/classes/web/routes/api/servers/server/stdin.py b/app/classes/web/routes/api/servers/server/stdin.py index b6bd0c3c..117fe188 100644 --- a/app/classes/web/routes/api/servers/server/stdin.py +++ b/app/classes/web/routes/api/servers/server/stdin.py @@ -35,7 +35,13 @@ class ApiServersServerStdinHandler(BaseApiHandler): "Please report this to the devs" ) return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"}) - + decoded = self.request.body.decode("utf-8") + self.controller.management.add_to_audit_log( + auth_data[4]["user_id"], + f"Sent command ({decoded}) to terminal", + server_id=0, + source_ip=self.get_remote_ip(), + ) if svr.send_command(self.request.body.decode("utf-8")): return self.finish_json( 200, From 317ed3e66704ce78d541570083c60b114a33ba31 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 3 Mar 2023 17:16:20 -0500 Subject: [PATCH 13/68] only allow basic users rights to edit some fields --- .../web/routes/api/servers/server/index.py | 66 ++++++++++++++++++- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/app/classes/web/routes/api/servers/server/index.py b/app/classes/web/routes/api/servers/server/index.py index a3623beb..35fe7980 100644 --- a/app/classes/web/routes/api/servers/server/index.py +++ b/app/classes/web/routes/api/servers/server/index.py @@ -1,5 +1,6 @@ import logging import json +import shlex from jsonschema import validate from jsonschema.exceptions import ValidationError from playhouse.shortcuts import model_to_dict @@ -13,11 +14,11 @@ server_patch_schema = { "type": "object", "properties": { "server_name": {"type": "string", "minLength": 1}, - "path": {"type": "string", "minLength": 1}, "backup_path": {"type": "string"}, "executable": {"type": "string"}, "log_path": {"type": "string", "minLength": 1}, "execution_command": {"type": "string", "minLength": 1}, + "java_selection": {"type": "string"}, "auto_start": {"type": "boolean"}, "auto_start_delay": {"type": "integer"}, "crash_detection": {"type": "boolean"}, @@ -25,8 +26,27 @@ server_patch_schema = { "executable_update_url": {"type": "string", "minLength": 1}, "server_ip": {"type": "string", "minLength": 1}, "server_port": {"type": "integer"}, + "shutdown_timeout": {"type": "integer"}, "logs_delete_after": {"type": "integer"}, - "type": {"type": "string", "minLength": 1}, + "ignored_exits": {"type": "string"}, + "show_status": {"type": "boolean"}, + }, + "additionalProperties": False, + "minProperties": 1, +} +basic_server_patch_schema = { + "type": "object", + "properties": { + "server_name": {"type": "string", "minLength": 1}, + "executable": {"type": "string"}, + "java_selection": {"type": "string"}, + "auto_start": {"type": "boolean"}, + "auto_start_delay": {"type": "integer"}, + "crash_detection": {"type": "boolean"}, + "stop_command": {"type": "string"}, + "shutdown_timeout": {"type": "integer"}, + "logs_delete_after": {"type": "integer"}, + "ignored_exits": {"type": "string"}, }, "additionalProperties": False, "minProperties": 1, @@ -63,8 +83,12 @@ class ApiServersServerIndexHandler(BaseApiHandler): ) try: - validate(data, server_patch_schema) + if auth_data[4]["superuser"]: + validate(data, server_patch_schema) + else: + validate(data, basic_server_patch_schema) except ValidationError as e: + print(e) return self.finish_json( 400, { @@ -88,9 +112,45 @@ class ApiServersServerIndexHandler(BaseApiHandler): return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"}) server_obj = self.controller.servers.get_server_obj(server_id) + java_flag = False for key in data: # If we don't validate the input there could be security issues + if key == "java_selection" and data[key] != "none": + java_flag = True + try: + if self.helper.is_os_windows(): + execution_list = shlex.split( + server_obj.execution_command, posix=False + ) + else: + execution_list = shlex.split( + server_obj.execution_command, posix=True + ) + except ValueError: + return self.finish_json( + 200, {"status": "error", "error": "INVALID EXECUTION COMMAND"} + ) + if ( + not any( + data[key] in path for path in self.helper.find_java_installs() + ) + and data[key] != "java" + ): + return + if data[key] != "java": + if self.helper.is_os_windows(): + execution_list[0] = '"' + data[key] + '/bin/java"' + else: + execution_list[0] = '"' + data[key] + '"' + else: + execution_list[0] = "java" + execution_command = "" + for item in execution_list: + execution_command += item + " " + setattr(server_obj, "execution_command", execution_command) if key != "path": + if key == "execution_command" and java_flag: + continue setattr(server_obj, key, data[key]) self.controller.servers.update_server(server_obj) From 40bbc2e79006b879c32e82d80fa862b7c340b031 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 3 Mar 2023 17:16:44 -0500 Subject: [PATCH 14/68] Remove print statement --- app/classes/web/routes/api/servers/server/index.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/classes/web/routes/api/servers/server/index.py b/app/classes/web/routes/api/servers/server/index.py index 35fe7980..aa0c26fd 100644 --- a/app/classes/web/routes/api/servers/server/index.py +++ b/app/classes/web/routes/api/servers/server/index.py @@ -88,7 +88,6 @@ class ApiServersServerIndexHandler(BaseApiHandler): else: validate(data, basic_server_patch_schema) except ValidationError as e: - print(e) return self.finish_json( 400, { From 342f2376bc431850fffaaa7de7decdaa0e8352db Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 3 Mar 2023 17:16:53 -0500 Subject: [PATCH 15/68] Send server config form through API --- .../templates/panel/server_config.html | 82 +++++++++++++++++-- 1 file changed, 77 insertions(+), 5 deletions(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index 500322ec..e15f88af 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -43,10 +43,7 @@
    -
    - {% raw xsrf_form_html() %} - - +
    @@ -127,7 +124,7 @@ -
    @@ -234,8 +231,99 @@ return r ? r[1] : undefined; } + function replacer(key, value) { + if (key != "start_time" && key != "cron_string" && key != "interval_type") { + if (typeof value == "boolean") { + return value + } else { + return (isNaN(value) ? value : +value); + } + } else { + if (value === "" && key == "start_time"){ + return "00:00"; + }else{ + return value; + } + } + } + + const serverId = new URLSearchParams(document.location.search).get('id'); + const schId = new URLSearchParams(document.location.search).get('sch_id'); $(document).ready(function () { console.log("ready!"); + $("#new_schedule_form").on("submit", async function (e) { + e.preventDefault(); + var token = getCookie("_xsrf") + let schForm = document.getElementById("new_schedule_form"); + + let formData = new FormData(schForm); + formData.delete("difficulty"); + //Create an object from the form data entries + let formDataObject = Object.fromEntries(formData.entries()); + //We need to make sure these are sent regardless of whether or not they're checked + formDataObject.enabled = $("#enabled").prop('checked'); + formDataObject.one_time = $("#one_time").prop('checked'); + if ($("#difficulty").val() == "reaction"){ + formDataObject.interval_type = "reaction"; + } + if (formDataObject.cron_string != ""){ + formDataObject.interval_type = ''; + } + console.log(formDataObject); + // Format the plain form data as JSON + let formDataJsonString = JSON.stringify(formDataObject, replacer); + + console.log(formDataJsonString); + + let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, { + method: 'POST', + headers: { + 'X-XSRFToken': token + }, + body: formDataJsonString, + }); + let responseData = await res; + if (responseData.statusText === "OK") { + window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`; + } + }); + + $("#schedule_form").on("submit", async function (e) { + e.preventDefault(); + var token = getCookie("_xsrf") + let schForm = document.getElementById("schedule_form"); + + let formData = new FormData(schForm); + formData.delete("difficulty"); + //Create an object from the form data entries + let formDataObject = Object.fromEntries(formData.entries()); + //We need to make sure these are sent regardless of whether or not they're checked + formDataObject.enabled = $("#enabled").prop('checked'); + formDataObject.one_time = $("#one_time").prop('checked'); + if ($("#difficulty").val() == "reaction"){ + formDataObject.interval_type = "reaction"; + } + if (formDataObject.cron_string != ""){ + formDataObject.interval_type = ''; + } + console.log(formDataObject); + // Format the plain form data as JSON + let formDataJsonString = JSON.stringify(formDataObject, replacer); + + console.log(formDataJsonString); + + let res = await fetch(`/api/v2/servers/${serverId}/tasks/${schId}`, { + method: 'PATCH', + headers: { + 'X-XSRFToken': token + }, + body: formDataJsonString, + }); + let responseData = await res; + if (responseData.statusText === "OK") { + window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`; + } + }); }); @@ -265,6 +353,7 @@ document.getElementById("parent").required = true; document.getElementById("interval").required = false; document.getElementById("time").required = false; + $("#cron").val(""); } else { document.getElementById("ifAdvanced").style.display = "none"; @@ -274,6 +363,7 @@ document.getElementById("parent").required = false; document.getElementById("interval").required = true; document.getElementById("time").required = true; + $("#cron").val(""); } } function ifDays() { @@ -286,20 +376,6 @@ } } - async function del_task(sch_id, id) { - var token = getCookie("_xsrf") - - let res = await fetch(`/api/v2/servers/${id}/tasks/${sch_id}`, { - method: 'DELETE', - headers: { - 'token': token, - }, - }); - let responseData = await res; - if (responseData.statusText === "OK") { - window.location.reload(); - } - } function startup() { try { document.getElementById("{{ data['schedule']['interval_type'] }}").setAttribute('selected', true); diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index 5d776bbd..9f92fc6e 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -90,7 +90,7 @@

    {{schedule.command}}

    - {% if schedule.interval != '' %} + {% if schedule.interval_type != '' and schedule.interval_type != 'reaction' %}

    {{ translate('serverSchedules', 'every', data['lang']) }}

    {{schedule.interval}} {{schedule.interval_type}}

    {% elif schedule.interval_type == 'reaction' %} From 1804d35156b171c6f80d9507894836c1469010c2 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Sat, 4 Mar 2023 22:45:31 -0500 Subject: [PATCH 25/68] Add error checking on cron validation --- .../routes/api/servers/server/tasks/index.py | 17 +++++++++++ .../api/servers/server/tasks/task/index.py | 15 ++++++++++ .../templates/panel/server_config.html | 12 ++++++-- .../templates/panel/server_schedule_edit.html | 30 ++++++++++++++----- app/translations/en_EN.json | 5 ++-- 5 files changed, 66 insertions(+), 13 deletions(-) diff --git a/app/classes/web/routes/api/servers/server/tasks/index.py b/app/classes/web/routes/api/servers/server/tasks/index.py index 10f09ea7..cf35ad9f 100644 --- a/app/classes/web/routes/api/servers/server/tasks/index.py +++ b/app/classes/web/routes/api/servers/server/tasks/index.py @@ -3,6 +3,7 @@ import json import logging +from croniter import croniter from jsonschema import ValidationError, validate from app.classes.models.server_permissions import EnumPermissionsServer from app.classes.web.base_api_handler import BaseApiHandler @@ -89,6 +90,22 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler): data["server_id"] = server_id if not data.get("start_time"): data["start_time"] = "00:00" + + # validate cron string + if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): + return self.finish_json( + 405, + { + "status": "error", + "error": self.helper.translation.translate( + "error", + "cronFormat", + self.controller.users.get_user_lang_by_id( + auth_data[4]["user_id"] + ), + ), + }, + ) task_id = self.tasks_manager.schedule_job(data) self.controller.management.add_to_audit_log( diff --git a/app/classes/web/routes/api/servers/server/tasks/task/index.py b/app/classes/web/routes/api/servers/server/tasks/task/index.py index a9a1f5d9..1db5ccf1 100644 --- a/app/classes/web/routes/api/servers/server/tasks/task/index.py +++ b/app/classes/web/routes/api/servers/server/tasks/task/index.py @@ -3,6 +3,7 @@ import json import logging +from croniter import croniter from jsonschema import ValidationError, validate from app.classes.models.server_permissions import EnumPermissionsServer @@ -135,6 +136,20 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler): data["parent"] = None data["server_id"] = server_id + if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): + return self.finish_json( + 405, + { + "status": "error", + "error": self.helper.translation.translate( + "error", + "cronFormat", + self.controller.users.get_user_lang_by_id( + auth_data[4]["user_id"] + ), + ), + }, + ) self.tasks_manager.update_job(task_id, data) self.controller.management.add_to_audit_log( diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index e15f88af..cc8d9a0c 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -622,10 +622,16 @@ }, body: formDataJsonString, }); - let responseData = await res; - if (responseData.statusText === "OK") { + let responseData = await res.json(); + if (responseData.status === "ok") { window.location.reload(); - } + } else { + + bootbox.alert({ + title: responseData.status, + message: responseData.error + }); + } }); }); diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index 9e535d67..9bd8d8da 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -278,14 +278,21 @@ let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, { method: 'POST', headers: { - 'X-XSRFToken': token + 'X-XSRFToken': token, + "Content-Type": "application/json", }, body: formDataJsonString, }); - let responseData = await res; - if (responseData.statusText === "OK") { + let responseData = await res.json(); + if (responseData.status === "ok") { window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`; - } + } else { + + bootbox.alert({ + title: responseData.status, + message: responseData.error + }); + } }); $("#schedule_form").on("submit", async function (e) { @@ -315,14 +322,21 @@ let res = await fetch(`/api/v2/servers/${serverId}/tasks/${schId}`, { method: 'PATCH', headers: { - 'X-XSRFToken': token + 'X-XSRFToken': token, + "Content-Type": "application/json", }, body: formDataJsonString, }); - let responseData = await res; - if (responseData.statusText === "OK") { + let responseData = await res.json(); + if (responseData.status === "ok") { window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`; - } + } else { + + bootbox.alert({ + title: responseData.status, + message: responseData.error + }); + } }); }); diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index de5da99a..907ecedf 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -186,7 +186,8 @@ "terribleFailure": "What a Terrible Failure!", "superError": "You must be a super user to complete this action.", "fileError": "File type must be an image.", - "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration" + "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration", + "cronFormat": "Invalid Cron format detected" }, "footer": { "allRightsReserved": "All rights reserved", @@ -614,4 +615,4 @@ "manager": "Manager", "selectManager": "Select Manager for User" } -} +} \ No newline at end of file From d06de3ef76ef8929e03f6bddbf9790e864fc566f Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Sat, 4 Mar 2023 22:45:45 -0500 Subject: [PATCH 26/68] Remove un-needed imports --- app/classes/web/panel_handler.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 9adec950..1a00e79c 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -6,7 +6,6 @@ import typing as t import json import logging import threading -import shlex import urllib.parse import bleach import requests @@ -17,7 +16,6 @@ from tornado import iostream # TZLocal is set as a hidden import on win pipeline from tzlocal import get_localzone from tzlocal.utils import ZoneInfoNotFoundError -from croniter import croniter from app.classes.models.servers import Servers from app.classes.models.server_permissions import EnumPermissionsServer From f09e93a19ffc3cb43bfd7e25c544812b8f2bb6da Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 4 Aug 2022 19:45:44 -0400 Subject: [PATCH 27/68] poorly attempt to add "add to home" feature --- .../static/assets/images/Crafty_4-0.png | Bin 0 -> 5013 bytes app/frontend/templates/base.html | 5 +++++ app/frontend/templates/crafty.webmanifest | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 app/frontend/static/assets/images/Crafty_4-0.png create mode 100644 app/frontend/templates/crafty.webmanifest diff --git a/app/frontend/static/assets/images/Crafty_4-0.png b/app/frontend/static/assets/images/Crafty_4-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d873eedc46f1f3c3d9be420e8a8e44ec015f6ced GIT binary patch literal 5013 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 D3&c&V literal 0 HcmV?d00001 diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 13da580c..d3d913bd 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,6 +18,11 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> + + + + + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest new file mode 100644 index 00000000..c2db095c --- /dev/null +++ b/app/frontend/templates/crafty.webmanifest @@ -0,0 +1,16 @@ +{ + "background_color": "purple", + "description": "Server management control.", + "display": "fullscreen", + "icons": [ + { + "src": "../static/assets/images/Crafty_4-0.png", + "sizes": "192x192", + "type": "icon/png" + } + ], + "scope": "/", + "name": "Crafty 4", + "short_name": "Crafty", + "start_url": "/panel/dashboard" +} \ No newline at end of file From e5a16d0498bf2f44e91b4b51ad26db0a72bf4f96 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 7 Aug 2022 13:23:45 -0400 Subject: [PATCH 28/68] Updates --- app/frontend/templates/base.html | 5 ++++ app/frontend/templates/crafty.webmanifest | 34 +++++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index d3d913bd..37c6aead 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -20,6 +20,11 @@ + + + + + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest index c2db095c..06d6cafe 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.webmanifest @@ -1,16 +1,32 @@ { - "background_color": "purple", - "description": "Server management control.", - "display": "fullscreen", + "$schema": "https://json.schemastore.org/web-manifest-combined.json", + "short_name": "Crafty", + "name": "Crafty Controller 4", "icons": [ { - "src": "../static/assets/images/Crafty_4-0.png", - "sizes": "192x192", - "type": "icon/png" + "src": "../static/images/Crafty_4-0.png", + "type": "image/png", + "sizes": "192x192" } ], + "start_url": "/public/login", + "background_color": "#3367D6", + "display": "fullscreen", "scope": "/", - "name": "Crafty 4", - "short_name": "Crafty", - "start_url": "/panel/dashboard" + "theme_color": "#3367D6", + "shortcuts": [ + { + "name": "Crafty Controller 4", + "short_name": "Crafty", + "description": "View weather information for today", + "url": "/panel/dashboard", + "icons": [ + { + "src": "../static/images/Crafty_4-0.png", + "sizes": "192x192" + } + ] + } + ], + "description": "Server Management Console/Wrapper" } \ No newline at end of file From 3c5ebdf6ba396299121294d191e99d725e6e013f Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 8 Aug 2022 13:04:36 -0400 Subject: [PATCH 29/68] More testing --- app/frontend/templates/base.html | 2 +- app/frontend/templates/{crafty.webmanifest => crafty.json} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/frontend/templates/{crafty.webmanifest => crafty.json} (85%) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 37c6aead..2630fd4d 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,7 +18,7 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> - + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.json similarity index 85% rename from app/frontend/templates/crafty.webmanifest rename to app/frontend/templates/crafty.json index 06d6cafe..ab83b913 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.json @@ -4,7 +4,7 @@ "name": "Crafty Controller 4", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "type": "image/png", "sizes": "192x192" } @@ -22,7 +22,7 @@ "url": "/panel/dashboard", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "sizes": "192x192" } ] From 8844d8c989fab78786ec790628a7878c7237aa1b Mon Sep 17 00:00:00 2001 From: bobsfriend12 Date: Sun, 5 Mar 2023 21:00:09 -0600 Subject: [PATCH 30/68] update manifest and add service worker --- app/classes/web/static_handler.py | 3 ++ app/frontend/static/assets/crafty.webmanifest | 37 +++++++++++++++ .../static/assets/js/service-worker.js | 47 +++++++++++++++++++ app/frontend/templates/base.html | 10 +++- app/frontend/templates/blank_base.html | 1 + app/frontend/templates/crafty.json | 32 ------------- app/frontend/templates/public/login.html | 9 ++++ app/frontend/templates/public_base.html | 1 + 8 files changed, 107 insertions(+), 33 deletions(-) create mode 100644 app/frontend/static/assets/crafty.webmanifest create mode 100644 app/frontend/static/assets/js/service-worker.js delete mode 100644 app/frontend/templates/crafty.json diff --git a/app/classes/web/static_handler.py b/app/classes/web/static_handler.py index 731b48f4..4f75b036 100644 --- a/app/classes/web/static_handler.py +++ b/app/classes/web/static_handler.py @@ -11,6 +11,9 @@ except ModuleNotFoundError as e: class CustomStaticHandler(tornado.web.StaticFileHandler): def validate_absolute_path(self, root: str, absolute_path: str) -> Optional[str]: + # This is for the mobile app service worker + if self.request.path.find("service-worker.js") != -1: + self.set_header("Service-Worker-Allowed", "/") try: return super().validate_absolute_path(root, absolute_path) except tornado.web.HTTPError as error: diff --git a/app/frontend/static/assets/crafty.webmanifest b/app/frontend/static/assets/crafty.webmanifest new file mode 100644 index 00000000..0a4edbd3 --- /dev/null +++ b/app/frontend/static/assets/crafty.webmanifest @@ -0,0 +1,37 @@ +{ + "background_color": "#222436", + "description": "Crafty Controller is a free and open-source Minecraft launcher and manager that allows users to start and administer Minecraft servers from a user-friendly interface.", + "dir": "ltr", + "display": "standalone", + "name": "Crafty Controller", + "orientation": "any", + "scope": "/", + "short_name": "Crafty", + "start_url": "/", + "theme_color": "#964df7", + "categories": ["utilities"], + "screenshots": [], + "icons": [ + { + "src": "/static/assets/images/Crafty_4-0.png", + "type": "image/png", + "sizes": "144x144" + } + ], + "shortcuts": [ + { + "name": "Crafty Controller 4", + "short_name": "Crafty", + "description": "Minecraft server manager", + "url": "/panel/dashboard", + "icons": [ + { + "src": "/static/assets/images/Crafty_4-0.png", + "sizes": "144x144" + } + ] + } + ], + "lang": "en", + "prefer_related_applications": false +} diff --git a/app/frontend/static/assets/js/service-worker.js b/app/frontend/static/assets/js/service-worker.js new file mode 100644 index 00000000..09e240f4 --- /dev/null +++ b/app/frontend/static/assets/js/service-worker.js @@ -0,0 +1,47 @@ +// This is the "Offline page" service worker + +importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js'); + +const CACHE = "pwabuilder-page"; + +// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html"; +const offlineFallbackPage = "ToDo-replace-this-name.html"; + +self.addEventListener("message", (event) => { + if (event.data && event.data.type === "SKIP_WAITING") { + self.skipWaiting(); + } +}); + +self.addEventListener('install', async (event) => { + event.waitUntil( + caches.open(CACHE) + .then((cache) => cache.add(offlineFallbackPage)) + ); +}); + +if (workbox.navigationPreload.isSupported()) { + workbox.navigationPreload.enable(); +} + +self.addEventListener('fetch', (event) => { + if (event.request.mode === 'navigate') { + event.respondWith((async () => { + try { + const preloadResp = await event.preloadResponse; + + if (preloadResp) { + return preloadResp; + } + + const networkResp = await fetch(event.request); + return networkResp; + } catch (error) { + + const cache = await caches.open(CACHE); + const cachedResp = await cache.match(offlineFallbackPage); + return cachedResp; + } + })()); + } +}); \ No newline at end of file diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 2630fd4d..14c8d05c 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,7 +18,7 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> - + @@ -536,6 +536,14 @@ }); }); + $(document).ready(() => { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.register('/static/assets/js/service-worker.js', {scope: '/'}) + .then(function (registration) { + console.log('Service Worker Registered'); + }); + } + }); {% block js %} diff --git a/app/frontend/templates/blank_base.html b/app/frontend/templates/blank_base.html index 50f4e815..5612f64d 100644 --- a/app/frontend/templates/blank_base.html +++ b/app/frontend/templates/blank_base.html @@ -14,6 +14,7 @@ + diff --git a/app/frontend/templates/crafty.json b/app/frontend/templates/crafty.json deleted file mode 100644 index ab83b913..00000000 --- a/app/frontend/templates/crafty.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/web-manifest-combined.json", - "short_name": "Crafty", - "name": "Crafty Controller 4", - "icons": [ - { - "src": "../static/assets/images/Crafty_4-0.png", - "type": "image/png", - "sizes": "192x192" - } - ], - "start_url": "/public/login", - "background_color": "#3367D6", - "display": "fullscreen", - "scope": "/", - "theme_color": "#3367D6", - "shortcuts": [ - { - "name": "Crafty Controller 4", - "short_name": "Crafty", - "description": "View weather information for today", - "url": "/panel/dashboard", - "icons": [ - { - "src": "../static/assets/images/Crafty_4-0.png", - "sizes": "192x192" - } - ] - } - ], - "description": "Server Management Console/Wrapper" -} \ No newline at end of file diff --git a/app/frontend/templates/public/login.html b/app/frontend/templates/public/login.html index 9a8fc7ce..b8600bd3 100644 --- a/app/frontend/templates/public/login.html +++ b/app/frontend/templates/public/login.html @@ -12,6 +12,7 @@ + @@ -140,7 +141,15 @@ let login_opacity_div = document.getElementById('login_opacity'); let opacity = login_opacity_div.getAttribute('data-value'); document.getElementById('login-form-background').style.background = 'rgb(34, 36, 55, ' + (opacity / 100) + ')'; + //Register Service worker for mobile app + if ('serviceWorker' in navigator) { + navigator.serviceWorker.register('/static/assets/js/service-worker.js', {scope: '/'}) + .then(function (registration) { + console.log('Service Worker Registered'); + }); + } }); + diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html index 0f40b4ad..9dde1f16 100644 --- a/app/frontend/templates/public_base.html +++ b/app/frontend/templates/public_base.html @@ -14,6 +14,7 @@ + From 18f7d82d044f03295c71ba93a9d5558c9a45d3af Mon Sep 17 00:00:00 2001 From: bobsfriend12 Date: Sun, 5 Mar 2023 21:14:57 -0600 Subject: [PATCH 31/68] change theme color --- app/frontend/static/assets/crafty.webmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/static/assets/crafty.webmanifest b/app/frontend/static/assets/crafty.webmanifest index 0a4edbd3..7abf2c6e 100644 --- a/app/frontend/static/assets/crafty.webmanifest +++ b/app/frontend/static/assets/crafty.webmanifest @@ -8,7 +8,7 @@ "scope": "/", "short_name": "Crafty", "start_url": "/", - "theme_color": "#964df7", + "theme_color": "#222436", "categories": ["utilities"], "screenshots": [], "icons": [ From 014805fc31f91e43eefb9b5d931f6d33f8206f8f Mon Sep 17 00:00:00 2001 From: bobsfriend12 Date: Mon, 6 Mar 2023 23:38:04 +0000 Subject: [PATCH 32/68] add offline page,change sw location --- app/classes/web/public_handler.py | 6 +- .../static/assets/js/service-worker.js | 47 ----------- app/frontend/templates/base.html | 2 +- app/frontend/templates/public/login.html | 2 +- app/frontend/templates/public/offline.html | 77 +++++++++++++++++++ app/frontend/templates/public/status.html | 2 +- app/translations/en_EN.json | 4 + 7 files changed, 89 insertions(+), 51 deletions(-) delete mode 100644 app/frontend/static/assets/js/service-worker.js create mode 100644 app/frontend/templates/public/offline.html diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py index dad74881..6c5c8c37 100644 --- a/app/classes/web/public_handler.py +++ b/app/classes/web/public_handler.py @@ -47,15 +47,19 @@ class PublicHandler(BaseHandler): # sensible defaults template = "public/404.html" + if page == "login": template = "public/login.html" - elif page == 404: + elif page == "404": template = "public/404.html" elif page == "error": template = "public/error.html" + elif page == "offline": + template = "public/offline.html" + elif page == "logout": self.clear_cookie("token") # self.clear_cookie("user") diff --git a/app/frontend/static/assets/js/service-worker.js b/app/frontend/static/assets/js/service-worker.js deleted file mode 100644 index 09e240f4..00000000 --- a/app/frontend/static/assets/js/service-worker.js +++ /dev/null @@ -1,47 +0,0 @@ -// This is the "Offline page" service worker - -importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js'); - -const CACHE = "pwabuilder-page"; - -// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html"; -const offlineFallbackPage = "ToDo-replace-this-name.html"; - -self.addEventListener("message", (event) => { - if (event.data && event.data.type === "SKIP_WAITING") { - self.skipWaiting(); - } -}); - -self.addEventListener('install', async (event) => { - event.waitUntil( - caches.open(CACHE) - .then((cache) => cache.add(offlineFallbackPage)) - ); -}); - -if (workbox.navigationPreload.isSupported()) { - workbox.navigationPreload.enable(); -} - -self.addEventListener('fetch', (event) => { - if (event.request.mode === 'navigate') { - event.respondWith((async () => { - try { - const preloadResp = await event.preloadResponse; - - if (preloadResp) { - return preloadResp; - } - - const networkResp = await fetch(event.request); - return networkResp; - } catch (error) { - - const cache = await caches.open(CACHE); - const cachedResp = await cache.match(offlineFallbackPage); - return cachedResp; - } - })()); - } -}); \ No newline at end of file diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index a753317a..0eb7d934 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -539,7 +539,7 @@ }); $(document).ready(() => { if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('/static/assets/js/service-worker.js', {scope: '/'}) + navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'}) .then(function (registration) { console.log('Service Worker Registered'); }); diff --git a/app/frontend/templates/public/login.html b/app/frontend/templates/public/login.html index b8600bd3..25346ffa 100644 --- a/app/frontend/templates/public/login.html +++ b/app/frontend/templates/public/login.html @@ -143,7 +143,7 @@ document.getElementById('login-form-background').style.background = 'rgb(34, 36, 55, ' + (opacity / 100) + ')'; //Register Service worker for mobile app if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('/static/assets/js/service-worker.js', {scope: '/'}) + navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'}) .then(function (registration) { console.log('Service Worker Registered'); }); diff --git a/app/frontend/templates/public/offline.html b/app/frontend/templates/public/offline.html new file mode 100644 index 00000000..91e3e78b --- /dev/null +++ b/app/frontend/templates/public/offline.html @@ -0,0 +1,77 @@ + + + + + + + + Crafty Controller + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    + +
    +
    +

    +
    + +
    +
    + + +
    + +
    +
    +
    + +
    + +
    + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html index e5b100e2..30ffcd8c 100644 --- a/app/frontend/templates/public/status.html +++ b/app/frontend/templates/public/status.html @@ -89,7 +89,7 @@
    -