Merge branch 'dev' into 'tweak/server-name'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -4,10 +4,14 @@
 TBD
 ### Bug fixes
 - Fix zip imports so the root dir selection is functional ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/764))
+- Fix bug where full access gives minimal access ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/768))
+- Ensure audit.log exists or create it on Crafty startup ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/771))
 ### Tweaks
 - Add info note to default creds file ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/760))
 - Remove navigation label from sidebar ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/766))
 - Do not allow slashes in server names ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/767))
+- Add a thread dump to support logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/769))
+- Remove text from status page and use symbols ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/770))
 ### Lang
 - Add remaining `he_IL`, `th_TH` translations for 4.4.0 Release ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/761))
 <br><br>

app/classes/shared/main_controller.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import pathlib
 from pathlib import Path
 from datetime import datetime
@@ -251,6 +252,19 @@ class Controller:
         # Copy crafty logs to archive dir
         full_log_name = os.path.join(crafty_path, "logs")
         FileHelpers.copy_dir(os.path.join(self.project_root, "logs"), full_log_name)
+        thread_dump = ""
+        for thread in threading.enumerate():
+            if sys.version_info >= (3, 8):
+                thread_dump += (
+                    f"Name: {thread.name}\tIdentifier:"
+                    f" {thread.ident}\tTID/PID: {thread.native_id}\n"
+                )
+            else:
+                print(f"Name: {thread.name}\tIdentifier: {thread.ident}")
+        with open(
+            os.path.join(temp_dir, "crafty_thread_dump.txt"), "a", encoding="utf-8"
+        ) as f:
+            f.write(thread_dump)
         self.support_scheduler.add_job(
             self.log_status,
             "interval",

app/classes/web/base_handler.py

@@ -6,6 +6,7 @@ import nh3
 import tornado.web
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
+from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.users import ApiKeys
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
@@ -195,6 +196,8 @@ class BaseHandler(tornado.web.RequestHandler):
             if api_key is not None:
                 superuser = superuser and api_key.full_access
                 server_permissions_api_mask = api_key.server_permissions
+                if api_key.full_access:
+                    server_permissions_api_mask = "1" * len(EnumPermissionsServer)
             exec_user_role = set()
             if superuser:
                 authorized_servers = self.controller.servers.get_all_defined_servers()

app/frontend/templates/public/status.html

@@ -64,7 +64,7 @@
               <span class="text-warning"><i class="fas fa-exclamation-triangle"></i></span>
             </td>
             <td id="server_motd_{{ server['stats']['server_id']['server_id'] }}">
-              <span class="text-warning">Crafty can't get infos from this Server </span>
+              <span class="text-warning"><i class="fa-solid fa-link-slash"></i> </span>
             </td>
             <td id="server_version_{{ server['stats']['server_id']['server_id'] }}">
               <span class="text-warning"><i class="fas fa-question"></i></i></span>
@@ -148,7 +148,7 @@
             <div class="row">
               <div class="col-12">
                 <div id="m_server_motd_{{ server['stats']['server_id']['server_id'] }}">
-                  <span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get infos from
+                  <span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get info from
                     this Server </span>
                 </div>
                 <div id="m_server_version_{{ server['stats']['server_id']['server_id'] }}"></div>
@@ -223,9 +223,9 @@
     }
     else {
       server_players.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i></span>`;
-      server_motd.innerHTML = `<span class="text-warning">Crafty can't get infos from this Server </span>`;
+      server_motd.innerHTML = `<span class="text-warning"><i class="fa-solid fa-link-slash"></i> </span>`;
       server_version.innerHTML = `<span class="text-warning"><i class="fas fa-question"></i></i></span>`;
-      m_server_motd.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get infos from this Server </span>`;
+      m_server_motd.innerHTML = `<span class="text-warning"><i class="fas fa-exclamation-triangle"></i> <i class="fa-solid fa-link-slash"></i> </span>`;
     }
 
     /* Update Online Status */

main.py

@@ -278,6 +278,15 @@ def setup_logging(debug=True):
             encoding="utf-8",
         ).close()
 
+    if not helper.check_file_exists(
+        os.path.join(APPLICATION_PATH, "logs", "audit.log")
+    ):
+        open(
+            os.path.join(APPLICATION_PATH, "logs", "audit.log"),
+            "a",
+            encoding="utf-8",
+        ).close()
+
     if os.path.exists(logging_config_file):
         # open our logging config file
         with open(logging_config_file, "rt", encoding="utf-8") as f: