Merge branch 'dev' into lang/additional-lang-for-4.4.0

CHANGELOG.md

@@ -1,7 +1,18 @@
 # Changelog
-## --- [4.4.0] - 2024/05/10
+## --- [4.4.1] - 2024/TBD
+### New features
+TBD
+### Bug fixes
+TBD
+### Tweaks
+TBD
+### Lang
+TBD
+<br><br>
+
+## --- [4.4.0] - 2024/05/11
 ### Refactor
-- Refactor API keys "super user" to "full access" ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/731))
+- Refactor API keys "super user" to "full access" ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/731) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/759))
 - Refactor SBuilder to use Big Bucket Svc ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/755))
 ### Bug fixes
 - Reset query arguments on login if `?next` is not available ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/750))

README.md

@@ -1,5 +1,5 @@
 [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com)
-# Crafty Controller 4.4.0
+# Crafty Controller 4.4.1
 > Python based Control Panel for your Minecraft Server
 
 ## What is Crafty Controller?

app/classes/web/routes/api/crafty/announcements/index.py

@@ -26,6 +26,7 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
             _,
             _,
             _user,
+            _,
         ) = auth_data
 
         data = self.helper.get_announcements()
@@ -72,6 +73,7 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
             _,
             _,
             _user,
+            _,
         ) = auth_data
         try:
             data = json.loads(self.request.body)

app/classes/web/routes/api/crafty/clogs/index.py

@@ -14,6 +14,7 @@ class ApiCraftyLogIndexHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         if not superuser:

app/classes/web/routes/api/crafty/config/index.py

@@ -68,6 +68,7 @@ class ApiCraftyConfigIndexHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         # GET /api/v2/roles?ids=true
@@ -94,13 +95,7 @@ class ApiCraftyConfigIndexHandler(BaseApiHandler):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
-        (
+        (_, _, _, superuser, user, _) = auth_data
-            _,
-            _,
-            _,
-            superuser,
-            user,
-        ) = auth_data
 
         if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
@@ -150,6 +145,7 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         # GET /api/v2/roles?ids=true
@@ -182,6 +178,7 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
         if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})

app/classes/web/routes/api/crafty/config/server_dir.py

@@ -24,6 +24,7 @@ class ApiCraftyConfigServerDirHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         # GET /api/v2/roles?ids=true
@@ -56,6 +57,7 @@ class ApiCraftyConfigServerDirHandler(BaseApiHandler):
             _,
             _,
             _,
+            _,
         ) = auth_data
 
         if not auth_data:

app/classes/web/routes/api/crafty/exe_cache.py

@@ -12,6 +12,7 @@ class ApiCraftyJarCacheIndexHandler(BaseApiHandler):
             _,
             _,
             _,
+            _,
         ) = auth_data
 
         if not auth_data[4]["superuser"]:

app/classes/web/routes/api/roles/index.py

@@ -75,6 +75,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         # GET /api/v2/roles?ids=true
@@ -107,6 +108,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
 
         if not superuser:

app/classes/web/routes/api/roles/role/index.py

@@ -74,6 +74,7 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         if not superuser:
@@ -97,6 +98,7 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
 
         if not superuser:
@@ -126,10 +128,19 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
 
-        if not superuser:
+        role = self.controller.roles.get_role(role_id)
-            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        if not superuser and user["user_id"] != role["manager"]:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "NOT_AUTHORIZED",
+                    "error_data": "Not Authorized",
+                },
+            )
 
         try:
             data = orjson.loads(self.request.body)

app/classes/web/routes/api/roles/role/servers.py

@@ -13,6 +13,7 @@ class ApiRolesRoleServersHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         # GET /api/v2/roles/role/servers?ids=true

app/classes/web/routes/api/roles/role/users.py

@@ -12,6 +12,7 @@ class ApiRolesRoleUsersHandler(BaseApiHandler):
             _,
             superuser,
             _,
+            _,
         ) = auth_data
 
         if not superuser:

app/classes/web/routes/api/servers/index.py

@@ -685,6 +685,7 @@ class ApiServersIndexHandler(BaseApiHandler):
             _,
             _superuser,
             user,
+            _,
         ) = auth_data
 
         if EnumPermissionsCrafty.SERVER_CREATION not in exec_user_crafty_permissions:

app/classes/web/routes/api/users/index.py

@@ -21,6 +21,7 @@ class ApiUsersIndexHandler(BaseApiHandler):
             _,
             _,
             user,
+            _,
         ) = auth_data
 
         # GET /api/v2/users?ids=true
@@ -70,6 +71,7 @@ class ApiUsersIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
 
         if EnumPermissionsCrafty.USER_CONFIG not in exec_user_crafty_permissions:
@@ -149,11 +151,12 @@ class ApiUsersIndexHandler(BaseApiHandler):
                 400, {"status": "error", "error": "INVALID_SUPERUSER_CREATE"}
             )
 
-        if len(roles) != 0 and not superuser:
+        for role in roles:
-            # HACK: This should check if the user has the roles or something
+            role = self.controller.roles.get_role(role)
-            return self.finish_json(
+            if int(role["manager"]) != int(auth_data[4]["user_id"]) and not superuser:
-                400, {"status": "error", "error": "INVALID_ROLES_CREATE"}
+                return self.finish_json(
-            )
+                    400, {"status": "error", "error": "INVALID_ROLES_CREATE"}
+                )
 
         # TODO: do this in the most efficient way
         user_id = self.controller.users.add_user(

app/classes/web/routes/api/users/user/api.py

@@ -113,6 +113,7 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             _,
             _superuser,
             user,
+            _,
         ) = auth_data
 
         try:
@@ -188,6 +189,7 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             _,
             _,
             _user,
+            _,
         ) = auth_data
         if key_id:
             key = self.controller.users.get_user_api_key(key_id)

app/classes/web/routes/api/users/user/index.py

@@ -24,6 +24,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
             _,
             _,
             user,
+            _,
         ) = auth_data
 
         if user_id in ["@me", user["user_id"]]:
@@ -72,6 +73,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
             _,
             _,
             user,
+            _,
         ) = auth_data
 
         if (user_id in ["@me", user["user_id"]]) and self.helper.get_setting(
@@ -121,6 +123,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
             _,
             superuser,
             user,
+            _,
         ) = auth_data
 
         try:

app/classes/web/routes/api/users/user/permissions.py

@@ -27,6 +27,7 @@ class ApiUsersUserPermissionsHandler(BaseApiHandler):
             _,
             _,
             user,
+            _,
         ) = auth_data
 
         if user_id in ["@me", user["user_id"]]:

app/classes/web/routes/api/users/user/public.py

@@ -17,6 +17,7 @@ class ApiUsersUserPublicHandler(BaseApiHandler):
             _,
             _,
             user,
+            _,
         ) = auth_data
 
         if user_id == "@me":

app/config/version.json

@@ -1,5 +1,5 @@
 {
   "major": 4,
   "minor": 4,
-  "sub": 0
+  "sub": 1
 }

app/translations/es_ES.json

@@ -184,6 +184,8 @@
     "error": {
         "agree": "Aceptar",
         "bedrockError": "Descargas de Bedrock no disponibles. por favor, compruebe",
+        "bigBucket1": "La verificación de estado de Big Bucket ha fallado. Por favor, verifica",
+        "bigBucket2": "para obtener la información más actualizada.",
         "cancel": "Cancelar",
         "contact": "Contacta el soporte de Crafty Control desde Discord",
         "craftyStatus": "Página de estados de Crafty",
@@ -206,6 +208,7 @@
         "portReminder": "Detectamos que es la primera vez que se inicia {}. Asegúrese de configurar el puerto {} a través de su router/firewall para hacer el servidor accesible por Internet.",
         "privMsg": "y el ",
         "return": "Volver al panel de control",
+        "selfHost": "Si estás autoalojando este repositorio, revisa tu dirección o consulta nuestra guía de solución de problemas.",
         "serverJars1": "API de Servidor JAR no disponible. por favor, compruebe",
         "serverJars2": "para la información más actualizada.",
         "start-error": "Servidor {} fallo al iniciar con código de error: {}",
@@ -603,6 +606,7 @@
     },
     "startup": {
         "almost": "Terminando. Espera un momento...",
+        "cache": "Actualizando el archivo de caché de Big Bucket",
         "internals": "Configurando e inicializando los componentes internos de Crafty",
         "internet": "Verificando conexion a internet",
         "server": "Inicializando ",

sonar-project.properties

@@ -3,7 +3,7 @@ sonar.organization=crafty-controller
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=Crafty 4
-sonar.projectVersion=4.4.0
+sonar.projectVersion=4.4.1
 sonar.python.version=3.9, 3.10, 3.11
 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/**