elody 0.0.204__py3-none-any.whl → 0.0.206__py3-none-any.whl

elody/csv.py

@@ -274,6 +274,13 @@ class CSVMultiObject(CSVParser):
                 for key, value in row.items():
                     if not value:
                         continue
+                    if not key or isinstance(value, list):
+                        if len(value) == 1 and value[0] == "":
+                            continue
+                        if "invalid_value" not in self.get_errors():
+                            self.set_error("invalid_value", list())
+                        message = f'{get_error_code(ErrorCode.INVALID_VALUE, get_write())} | value:{value} | line_number:{row_number} - The value "{value}" is invalid, most likely caused by exceeding allowed columns.'
+                        self.get_errors()["invalid_value"].append(message)
                     original_value = value
                     if key != identifying_column:
                         value = value.lower()

elody/error_codes.py

@@ -75,6 +75,7 @@ class ErrorCode(Enum):
     INVALID_ACCEPT_HEADER = ("5015", [])
     INVALID_VALUE = ("5016", ["value", "options", "line_number"])
     ITEM_WITH_VALUE_FOR_KEY_NOT_FOUND = ("5017", ["key", "value", "line_number"])
+    ITEM_WITH_VALUE_FOR_KEY_NOT_UNIQUE = ("5018", ["key", "value", "line_number"])
 
     # Filter error codes
     NO_MATCHER_FOR_FILTER_REQUEST = ("6001", [])

elody/policies/authorization/filter_generic_objects_policy_v2.py

@@ -14,6 +14,7 @@ from inuits_policy_based_auth.contexts.policy_context import (  # pyright: ignor
 from inuits_policy_based_auth.contexts.user_context import (  # pyright: ignore
     UserContext,
 )
+from werkzeug.exceptions import BadRequest
 
 
 class FilterGenericObjectsPolicyV2(BaseAuthorizationPolicy):
@@ -27,11 +28,8 @@ class FilterGenericObjectsPolicyV2(BaseAuthorizationPolicy):
         if not isinstance(user_context.access_restrictions.filters, list):
             user_context.access_restrictions.filters = []
         type_filter, filters = self.__split_type_filter(
-            user_context, deepcopy(g.get("content") or request.json or [])
+            deepcopy(g.get("content") or request.json or [])
         )
-        if not type_filter:
-            policy_context.access_verdict = True
-            return policy_context
 
         policy_context.access_verdict = False
         for role in user_context.x_tenant.roles:
@@ -59,13 +57,15 @@ class FilterGenericObjectsPolicyV2(BaseAuthorizationPolicy):
 
         return policy_context
 
-    def __split_type_filter(self, user_context: UserContext, request_body: list):
+    def __split_type_filter(self, request_body: list):
         type_filter = None
         for filter in request_body:
             if filter["type"] == "type":
                 type_filter = filter
+                break
             elif filter["type"] == "selection" and filter["key"] == "type":
                 type_filter = filter
+                break
             elif item_types := filter.get("item_types"):
                 type_filter = {
                     "type": "selection",
@@ -73,22 +73,12 @@ class FilterGenericObjectsPolicyV2(BaseAuthorizationPolicy):
                     "value": item_types,
                     "match_exact": True,
                 }
+                break
 
         if not type_filter:
-            if tenant_relation_type := user_context.bag.get("tenant_relation_type"):
-                user_context.access_restrictions.filters.append(  # pyright: ignore
-                    {
-                        "type": "selection",
-                        "key": tenant_relation_type,
-                        "value": [
-                            user_context.bag.get(
-                                "tenant_defining_entity_id", user_context.x_tenant.id
-                            )
-                        ],
-                        "match_exact": True,
-                    }
-                )
-            return None, request_body
+            raise BadRequest(
+                "Filter with type 'type', or a filter with type 'selection' and 'key' equal to 'type' is required"
+            )
 
         try:
             request_body.remove(type_filter)

elody/policies/authorization/generic_object_request_policy_v2.py

@@ -18,6 +18,7 @@ from inuits_policy_based_auth.contexts.policy_context import (  # pyright: ignor
 from inuits_policy_based_auth.contexts.user_context import (  # pyright: ignore
     UserContext,
 )
+from werkzeug.exceptions import BadRequest
 
 
 class GenericObjectRequestPolicyV2(BaseAuthorizationPolicy):
@@ -113,28 +114,13 @@ class GetRequestRules:
                     )
             filters.insert(0, {"type": "type", "value": type_query_parameter})
         else:
-            filters.append(
-                {
-                    "type": "selection",
-                    "key": "type",
-                    "value": allowed_item_types,
-                    "match_exact": True,
-                }
-            )
-            if tenant_relation_type := user_context.bag.get("tenant_relation_type"):
-                filters.append(
-                    {
-                        "type": "selection",
-                        "key": tenant_relation_type,
-                        "value": [
-                            "tenant:super",
-                            user_context.bag.get(
-                                "tenant_defining_entity_id", user_context.x_tenant.id
-                            ),
-                        ],
-                        "match_exact": True,
-                    }
-                )
+            """
+            Allowing no type_query_parameter will expose following security risks:
+                - object_restrictions not being applied
+                - inability to determine collection to execute filters
+            => if no type_query_parameter is a business requirement, override this policy for that specific client and consider the security risks
+            """
+            raise BadRequest("Query parameter 'type' is required")
 
         user_context.access_restrictions.filters = filters
         user_context.access_restrictions.post_request_hook = (

elody/policies/permission_handler.py

@@ -59,7 +59,7 @@ def handle_single_item_request(
     key_to_check=None,
 ):
     try:
-        item_in_storage_format, flat_item, object_lists, restrictions_schema = (
+        item, flat_item, object_lists, restrictions_schema = (
             __prepare_item_for_permission_check(item, permissions, crud)
         )
 
@@ -73,7 +73,7 @@ def handle_single_item_request(
 
         return __is_allowed_to_crud_item_keys(
             user_context,
-            item_in_storage_format,
+            item,
             flat_item,
             restrictions_schema,
             crud,
@@ -84,7 +84,7 @@ def handle_single_item_request(
     except Exception as exception:
         log.debug(
             f"{exception.__class__.__name__}: {str(exception)}",
-            item.get("storage_format", item),
+            item,
         )
         if crud != "read":
             log.debug(f"Request body: {request_body}", {})
@@ -97,7 +97,7 @@ def mask_protected_content_post_request_hook(user_context: UserContext, permissi
         for item in response["results"]:
             try:
                 (
-                    item_in_storage_format,
+                    item,
                     flat_item,
                     object_lists,
                     restrictions_schema,
@@ -107,7 +107,7 @@ def mask_protected_content_post_request_hook(user_context: UserContext, permissi
 
                 __is_allowed_to_crud_item_keys(
                     user_context,
-                    item_in_storage_format,
+                    item,
                     flat_item,
                     restrictions_schema,
                     "read",
@@ -117,7 +117,7 @@ def mask_protected_content_post_request_hook(user_context: UserContext, permissi
             except Exception as exception:
                 log.debug(
                     f"{exception.__class__.__name__}: {str(exception)}",
-                    item.get("storage_format", item),
+                    item,
                 )
                 raise exception
 
@@ -128,7 +128,6 @@ def mask_protected_content_post_request_hook(user_context: UserContext, permissi
 
 
 def __prepare_item_for_permission_check(item, permissions, crud):
-    item = deepcopy(item.get("storage_format", item))
     if item.get("type", "") not in permissions[crud].keys():
         return item, None, None, None
 
@@ -175,7 +174,7 @@ def __is_allowed_to_crud_item(
 
 def __is_allowed_to_crud_item_keys(
     user_context: UserContext,
-    item_in_storage_format,
+    item,
     flat_item,
     restrictions_schema,
     crud,
@@ -207,19 +206,17 @@ def __is_allowed_to_crud_item_keys(
                 for info in keys_info:
                     if info["object_list"]:
                         element = __get_element_from_object_list_of_item(
-                            item_in_storage_format,
+                            item,
                             info["key"],
                             info["object_key"],
                             object_lists,
                         )
                         if element:
-                            item_in_storage_format[info["key"]].remove(element)
+                            item[info["key"]].remove(element)
                         break
                 else:
                     try:
-                        del item_in_storage_format[keys_info[0]["key"]][
-                            keys_info[1]["key"]
-                        ]
+                        del item[keys_info[0]["key"]][keys_info[1]["key"]]
                     except KeyError:
                         pass
                 if key_to_check and key_to_check == restricted_key:
@@ -228,7 +225,7 @@ def __is_allowed_to_crud_item_keys(
                 if flat_request_body.get(restricted_key):
                     user_context.bag["restricted_keys"].append(restricted_key)
 
-    user_context.bag["requested_item"] = item_in_storage_format
+    user_context.bag["requested_item"] = item
     return len(user_context.bag["restricted_keys"]) == 0
 
 

{elody-0.0.204.dist-info → elody-0.0.206.dist-info}/METADATA

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

{elody-0.0.204.dist-info → elody-0.0.206.dist-info}/RECORD

@@ -1,8 +1,8 @@
 __init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 elody/client.py,sha256=15SBfnLHJXXY5Vf5BnkWdjtvkH21E_AsWTzm2-zcbf0,8799
-elody/csv.py,sha256=4J1KZhcisxvh0mryMPcza-sIPS7nbDkRyRO8guSFVGw,16172
-elody/error_codes.py,sha256=Derbr10Lb3HZcePjargz_XsYnw2SC0edD5KHZeKlp1s,4227
+elody/csv.py,sha256=f8HphE-KC2OqKFzV0HiifWBgMHb3g0EA_Y82o_6JEiE,16761
+elody/error_codes.py,sha256=d3wNPZU0HFMyl8xN95ciNd6QD94al1tX18h6HiqiAHo,4310
 elody/exceptions.py,sha256=5KSw2sPCZz3lDIJX4LiR2iL9n4m4KIil04D1d3X5rd0,968
 elody/job.py,sha256=3_heLwfNrWYcjIMKPG-vWsQayAAI7tyLFUUC_b1rT7w,4264
 elody/loader.py,sha256=yNakab07ja478gZaIC277n8Wf8SJ7_P3q-Z39BDdWQc,5419
@@ -17,30 +17,30 @@ elody/object_configurations/elody_configuration.py,sha256=cqduTVmdaDk3pIeHcW_Sfs
 elody/object_configurations/job_configuration.py,sha256=HMDxaRUyfqhIy0q3yQDDMH9uW5iCd7VCmqknQofXNt0,2039
 elody/policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/helpers.py,sha256=LTV_Hmg8AN64e6t4glpKhZMsRNYCLN8FC-KQ0-7EmR8,2035
-elody/policies/permission_handler.py,sha256=dWNGzcfGoJrJjMS80-7egXzHFNaLr0UBrzXB6jwyktg,10559
+elody/policies/permission_handler.py,sha256=ovQ1id67GtiEZYl3_2f_QPDn7XkCMGae6xgnpMWNHs8,10233
 elody/policies/authentication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/authentication/base_user_tenant_validation_policy.py,sha256=yyGiYy-MM63itQYwUc99FPeXt6TBW5B95FeLMfjMEok,5368
 elody/policies/authentication/multi_tenant_policy.py,sha256=g4ZYUQMmCjgLg09wj0-0lGKsJsRt7h4ppI25o1VdZHw,4039
 elody/policies/authorization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/authorization/filter_generic_objects_policy.py,sha256=mF32moh8hRetBgG8vQW-rz4xjoRQD2yOxdI740SFSUo,6522
-elody/policies/authorization/filter_generic_objects_policy_v2.py,sha256=LWeLQO_arUgIahvvcSkzkHC8jiIk6_TMSbkjCXBQdqk,6936
+elody/policies/authorization/filter_generic_objects_policy_v2.py,sha256=2IkESYMfne1bX1I8Yvn3yoNmlfn_Jm6zVlVBknoW1_c,6412
 elody/policies/authorization/generic_object_detail_policy.py,sha256=y6g1i3vdKMKY4xS4H2m0e1DRztrivMEomx6NkDqA0Pk,3672
 elody/policies/authorization/generic_object_mediafiles_policy.py,sha256=1-DMsV-FDkcrQCE4KL-SGlVHjTZSMPwYq1bWln2nXE4,2887
 elody/policies/authorization/generic_object_metadata_policy.py,sha256=xwtOVYmiCKgf75CydfWnV7DLI9X1yVfXPQ4-Ux0Htqk,2787
 elody/policies/authorization/generic_object_relations_policy.py,sha256=hRLeA5gXB44ufiVVaxWtAuwnXBRY1U4bLWgIadzKtmw,3712
 elody/policies/authorization/generic_object_request_policy.py,sha256=kuLczjnK5omMF2Gw5ViY_Z9MNPx_w6bNwexiMzvLiUU,4867
-elody/policies/authorization/generic_object_request_policy_v2.py,sha256=bD7X9zFt0AysbyVljOcvbdmbJNRQsMZRGfqs3jjHuxY,5434
+elody/policies/authorization/generic_object_request_policy_v2.py,sha256=gWv8c4XJeRNhzsGO2pYA25q8cRdsi-4xQbJ9Ja_9_QI,5094
 elody/policies/authorization/mediafile_derivatives_policy.py,sha256=OwNpbS8i7-LzcQDPddMWTrXk_Y4wqZxrB12Lw1dhkr0,2671
 elody/policies/authorization/mediafile_download_policy.py,sha256=XMsKavBucmTh4W1kWOzpFWxJ_ZXgHVK1RS7JB4HjtQo,1979
 elody/policies/authorization/multi_tenant_policy.py,sha256=SA9H7SBjzuh8mY3gYN7pDG8TV7hdI3GEUtNeiZeNL3M,3164
 elody/policies/authorization/tenant_request_policy.py,sha256=dEgblwRAqwWVcE-O7Jn8hVL3OnwDlQhDEOcPlcElBrk,1185
-elody-0.0.204.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+elody-0.0.206.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 tests/__init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/data.py,sha256=Q3oxduf-E3m-Z5G_p3fcs8jVy6g10I7zXKL1m94UVMI,2906
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_csv.py,sha256=NQaOhehfQ4GuXku0Y1SA8DYjJeqqidbF50zEHAi8RZA,15923
 tests/unit/test_utils.py,sha256=g63szcEZyHhCOtrW4BnNbcgVca3oYPIOLjBdIzNwwN0,8784
-elody-0.0.204.dist-info/METADATA,sha256=qfe2j7dXAcarRS5vaiQOiVJy3-x2qnXuzrcDizmnSZQ,23358
-elody-0.0.204.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-elody-0.0.204.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
-elody-0.0.204.dist-info/RECORD,,
+elody-0.0.206.dist-info/METADATA,sha256=6PT9-B_W0ZT1iCmmohkbnhaYIkswEsvNvTrMIMP1Nzw,23358
+elody-0.0.206.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+elody-0.0.206.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
+elody-0.0.206.dist-info/RECORD,,