official test

Author: d-w-moore

irods/access.py

@@ -107,7 +107,7 @@ def __hash__(self):
             (self.access_name, iRODSPath(self.path), self.user_name, self.user_zone)
         )
 
-    def copy(self, decanonicalize=False):
+    def copy(self, decanonicalize=False, ref_zone=''):
         other = copy.deepcopy(self)
         if decanonicalize:
             replacement_string = {
@@ -121,6 +121,9 @@ def copy(self, decanonicalize=False):
                 if replacement_string is not None
                 else self.access_name
             )
+            if '' != ref_zone == other.user_zone:
+                other.user_zone = ''
+                
         return other
 
     def __repr__(self):

irods/manager/access_manager.py

@@ -50,17 +50,13 @@ def users_by_ids(session, ids=()):
 class AccessManager(Manager):
 
     def _ACL_operation(self, op_input: iRODSAccess):
-        access = op_input.access_name
-        entity = op_input.user_name
-        zone = op_input.user_zone
-        try:
-            if self.sess.users.get(entity, zone).type == "rodsgroup":
-                zone = ""
-        except ex.UserDoesNotExist:
-           return {}
         return {
-            **{"acl": access, "entity_name": entity},
-            **({} if not zone else {"zone":zone})
+            "acl": op_input.access_name,
+            "entity_name": op_input.user_name,
+            **(
+                {} if not (z := op_input.user_zone)
+                else {"zone": z}
+            )
         }
 
     def _call_atomic_acl_api(self, logical_path : str, *operations, admin=False):

irods/test/access_test.py

@@ -542,6 +542,43 @@ def test_iRODSAccess_cannot_be_constructed_using_unsupported_type__issue_558(sel
             self.sess,
         )
 
+    def test_atomic_acls_505(self):
+        #import pdb;pdb.set_trace()
+        ses = self.sess
+        zone = user1 = user2 = group = None
+        try:
+            zone = ses.zones.create("twilight","remote")
+            user1 = ses.users.create("test_user_505", "rodsuser")
+            user2 = ses.users.create("rod_serling_505#twilight", "rodsuser")
+            group = ses.groups.create("test_group_505")
+            ses.acls._call_atomic_acl_api(
+                self.coll_path,
+                a1:=iRODSAccess("write", "",  user1.name,  user1.zone),  
+                a2:=iRODSAccess("read", "", user2.name, user2.zone), 
+                a3:=iRODSAccess("read", "", group.name),
+            )
+
+            accesses = ses.acls.get(self.coll)
+
+            # For purposes of equality tests, assign the path name of interest into each ACL.
+            for p in (a1, a2, a3):
+                p.path = self.coll_path
+
+            # Assert that the ACLs we added are among those listed for the object in the catalog.
+            normalize = lambda access: access.copy(decanonicalize=True, ref_zone=ses.zone) 
+            self.assertLess(
+                set(normalize(_) for _ in (a1,a2,a3)),
+                set(normalize(_) for _ in accesses)
+            )
+        finally:
+            if user1:
+                user1.remove()
+            if user2:
+                user2.remove()
+            if group:
+                group.remove()
+            if zone:
+                zone.remove()
 
 if __name__ == "__main__":
     # let the tests find the parent irods lib