fix for principal user issue, pr feedback

archesproject · Sep 20, 2024 · c34691c · c34691c
1 parent da0467a
commit c34691c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/arches/app/permissions/arches_default_deny.py b/arches/app/permissions/arches_default_deny.py
@@ -112,12 +112,20 @@ def check_resource_instance_permissions(
     ) -> ResourceInstancePermissions:
 
         result = ResourceInstancePermissions()
+        resource = ResourceInstance.objects.get(resourceinstanceid=resourceid)
         if resourceid == settings.SYSTEM_SETTINGS_RESOURCE_ID:
+            result["resource"] = resource
             if not user.groups.filter(name="System Administrator").exists():
                 result["permitted"] = False
-                return result
+            else:
+                result["permitted"] = True
+            return result
+
+        if resource.principaluser_id == user.id:
+            result["permitted"] = True
+            result["resource"] = resource
+            return result
 
-        resource = ResourceInstance.objects.get(resourceinstanceid=resourceid)
         result["resource"] = resource
         result["permitted"] = False  # by default, deny
 

diff --git a/arches/app/permissions/arches_permission_base.py b/arches/app/permissions/arches_permission_base.py
@@ -582,7 +582,11 @@ def get_default_permissions(
 
     def get_all_default_permissions(self, model: Model = None):
         default_permissions_settings = settings.PERMISSION_DEFAULTS
-        if not default_permissions_settings or model is None:
+        if (
+            not default_permissions_settings
+            or model is None
+            or model.graph_id not in default_permissions_settings
+        ):
             return []
 
         return (