elody 0.0.215__tar.gz → 0.0.216__tar.gz

{elody-0.0.215 → elody-0.0.216}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.215
+Version: 0.0.216
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE

{elody-0.0.215 → elody-0.0.216}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elody"
-version = "0.0.215"
+version = "0.0.216"
 description = "elody SDK for Python"
 readme = "README.md"
 authors = [{ name = "Inuits", email = "developers@inuits.eu" }]

{elody-0.0.215 → elody-0.0.216}/src/elody/policies/authentication/base_user_tenant_validation_policy.py

@@ -35,6 +35,10 @@ class BaseUserTenantValidationPolicy(ABC):
 
         return self.user
 
+    @abstractmethod
+    def promote_role(self, user_context: UserContext):
+        pass
+
     @abstractmethod
     def build_user_context_for_anonymous_user(
         self, request, user_context: UserContext
@@ -86,30 +90,37 @@ class BaseUserTenantValidationPolicy(ABC):
         """
 
         roles = []
-        for metadata in self.user.get("metadata", []):
-            if (
-                metadata["key"]
-                == user_context.bag["user_metadata_key_for_global_roles"]
+        try:
+            for metadata in self.user.get("metadata", []):
+                if (
+                    metadata["key"]
+                    == user_context.bag["user_metadata_key_for_global_roles"]
+                ):
+                    roles.extend(metadata["value"])
+
+            if user_context.x_tenant.id:
+                tenant_ids = user_context.x_tenant.id.split(",")
+                for tenant_id in tenant_ids:
+                    try:
+                        user_tenant_relation = self.__get_user_tenant_relation(
+                            tenant_id, user_context.bag["user_tenant_relation_type"]
+                        )
+                    except Forbidden as error:
+                        user_tenant_relation = {}
+                        if len(roles) == 0:
+                            raise Forbidden(error.description)
+                    roles.extend(user_tenant_relation.get("roles", []))
+
+            if len(roles) == 0 and not regex.match(
+                "(/[^/]+/v[0-9]+)?/tenants$", request.path
             ):
-                roles.extend(metadata["value"])
-
-        if user_context.x_tenant.id:
-            tenant_ids = user_context.x_tenant.id.split(",")
-            for tenant_id in tenant_ids:
-                try:
-                    user_tenant_relation = self.__get_user_tenant_relation(
-                        tenant_id, user_context.bag["user_tenant_relation_type"]
-                    )
-                except Forbidden as error:
-                    user_tenant_relation = {}
-                    if len(roles) == 0:
-                        raise Forbidden(error.description)
-                roles.extend(user_tenant_relation.get("roles", []))
-
-        if len(roles) == 0 and not regex.match(
-            "(/[^/]+/v[0-9]+)?/tenants$", request.path
-        ):
-            raise Forbidden("User has no global roles, switch to a specific tenant.")
+                raise Forbidden(
+                    "User has no global roles, switch to a specific tenant."
+                )
+        except Forbidden as exception:
+            if not (promoted_role := self.promote_role(user_context)):
+                raise exception
+            roles.append(promoted_role)
 
         return list(set(roles))
 

{elody-0.0.215 → elody-0.0.216}/src/elody/policies/permission_handler.py

@@ -222,7 +222,7 @@ def __is_allowed_to_crud_item_keys(
                 if key_to_check and key_to_check == restricted_key:
                     user_context.bag["restricted_keys"].append(restricted_key)
             else:
-                if flat_request_body.get(restricted_key):
+                if flat_request_body.get(restricted_key) is not None:
                     user_context.bag["restricted_keys"].append(restricted_key)
 
     user_context.bag["requested_item"] = item

{elody-0.0.215 → elody-0.0.216}/src/elody.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.215
+Version: 0.0.216
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE