[#763] allow remote users to be fully deleted, including home collections

irods/manager/user_manager.py

@@ -45,7 +45,26 @@
             self._get_session, "set-quota", "user", user_name, resource, "0"
         )
 
+    @staticmethod
+    def _parse_user_and_zone(user_param, zone_param):
+        """Parse out the uesr name ane zone name from USER and ZONE string parameters.
+           If the USER string contains # and a non-null-length ZONE spec, ensure that multiply specified zone names agree.
+        """
+        if '#' in user_param:
+            u_parsed_user, u_parsed_zone = user_param.split('#',1)
+            if '#' in u_parsed_zone:
+                raise RuntimeError(f"{u_parsed_zone = } is wrongly formatted")
+            elif u_parsed_zone != "":
+                if zone_param != "" and u_parsed_zone != zone_param:
+                    raise RuntimeError(f"Two nonzero-length zone names ({u_parsed_zone}, {zone_param}) were given and do not agree.")
+            else:
+                raise RuntimeError(f"The compound user#zone specification may not contain a zero-length zone")
+            return u_parsed_user, u_parsed_zone
+        return user_param, zone_param 
+
     def get(self, user_name, user_zone=""):
+        user_name, user_zone = self._parse_user_and_zone(user_name, user_zone)
+
         if not user_zone:
             user_zone = self.sess.zone
 
@@ -121,15 +140,20 @@
     def remove(self, user_name, user_zone="", _object=None):
         if _object is None:
             _object = self.get(user_name, user_zone)
+
+        if _object.type == "rodsgroup":
+            uz_args = ( f"{_object.name}", )
+        else:
+            uz_args = ( f"{_object.name}#{_object.zone}", )
+
         message_body = GeneralAdminRequest(
             "rm",
             (
                 "user"
                 if (_object.type != "rodsgroup" or self.sess.server_version < (4, 3, 2))
                 else "group"
             ),
-            user_name,
-            user_zone,
+            *uz_args,
         )
         request = iRODSMessage(
             "RODS_API_REQ", msg=message_body, int_info=api_number["GENERAL_ADMIN_AN"]

irods/test/admin_test.py

@@ -4,7 +4,8 @@
 import os
 import sys
 import unittest
-from irods.models import User, Group
+from irods.column import Like
+from irods.models import Collection, Group, User
 from irods.exception import (
     UserDoesNotExist,
     ResourceDoesNotExist,
@@ -73,6 +74,20 @@
         with self.assertRaises(UserDoesNotExist):
             self.sess.users.get(self.new_user_name, self.sess.zone)
 
+    def testissue_763(self):
+        remote_zone = remote_user = None
+        try:
+            remote_zone = (sess := self.sess).zones.create('other_zone', 'remote')
+            remote_user = sess.users.create(user_name='myuser',user_type='rodsuser',user_zone=remote_zone.name)
+            remote_user.remove()
+            remaining_collections = list(
+                sess.query(Collection).filter(Like(Collection.name, f'%/{remote_user}#{remote_zone}'))
+            )
+            self.assertEqual(len(remaining_collections), 0)
+        finally:
+            if remote_zone:
+                remote_zone.remove()
+
     def test_create_with_user_options__issue_759(self):
         gpadmin_user = remote_zone = None
         try:

irods/test/user_group_test.py

@@ -143,6 +143,7 @@ def generator(p=OLDPASS):
             shutil.rmtree(ENV_DIR)
             ses.users.remove("alice")
 
+
     def test_modifying_password_at_various_lengths__issue_328(self):
         ses = self.sess
         try: