Check for admin_role in role_check.py (#15283)

Script was falsely identifying cross-linked
parents. It needs to check if parent roles if
content type is Team and role_field is
member_role OR admin_role.

Signed-off-by: Seth Foster <fosterbseth@gmail.com>

tools/scripts/ig-hotfix/role_check.py

@@ -22,7 +22,9 @@ def resolve(obj, path):
     if new_obj is None:
         return set()
     if not path:
-        return {new_obj,}
+        return {
+            new_obj,
+        }
 
     if isinstance(new_obj, ManyToManyDescriptor):
         return {x for o in new_obj.all() for x in resolve(o, path)}
@@ -53,7 +55,9 @@ def resolve(obj, path):
                 crosslinked[ct.id][obj.id][f'{f.name}_id'] = None
                 continue
             if r.content_object != obj:
-                sys.stderr.write(f"{cls.__name__} id={obj.id} {f.name} is pointing to a Role that is assigned to a different object: role.id={r.id} {r.content_type!r} {r.object_id} {r.role_field}\n")
+                sys.stderr.write(
+                    f"{cls.__name__} id={obj.id} {f.name} is pointing to a Role that is assigned to a different object: role.id={r.id} {r.content_type!r} {r.object_id} {r.role_field}\n"
+                )
                 crosslinked[ct.id][obj.id][f'{f.name}_id'] = None
                 continue
 
@@ -87,16 +91,23 @@ def resolve(obj, path):
 
     # Check the resource's role field parents for consistency with Role.parents.all().
     f = r.content_object._meta.get_field(r.role_field)
-    f_parent = set(f.parent_role) if isinstance(f.parent_role, list) else {f.parent_role,}
+    f_parent = (
+        set(f.parent_role)
+        if isinstance(f.parent_role, list)
+        else {
+            f.parent_role,
+        }
+    )
     dotted = {x for p in f_parent if '.' in p for x in resolve(r.content_object, p)}
     plus = set()
     for p in r.parents.all():
         if p.singleton_name:
             if f'singleton:{p.singleton_name}' not in f_parent:
                 plus.add(p)
-        elif (p.content_type, p.role_field) == (team_ct, 'member_role'):
+        elif p.content_type == team_ct:
             # Team has been granted this role; probably legitimate.
-            continue
+            if p.role_field in ('admin_role', 'member_role'):
+                continue
         elif (p.content_type, p.object_id) == (r.content_type, r.object_id):
             if p.role_field not in f_parent:
                 plus.add(p)
@@ -118,21 +129,26 @@ def resolve(obj, path):
         continue
     if rev is None or r.id != rev.id:
         if rev and (r.content_type_id, r.object_id, r.role_field) == (rev.content_type_id, rev.object_id, rev.role_field):
-            sys.stderr.write(f"Role id={r.id} {r.content_type!r} {r.object_id} {r.role_field} is an orphaned duplicate of Role id={rev.id}, which is actually being used by the assigned resource\n")
+            sys.stderr.write(
+                f"Role id={r.id} {r.content_type!r} {r.object_id} {r.role_field} is an orphaned duplicate of Role id={rev.id}, which is actually being used by the assigned resource\n"
+            )
             orphaned_roles.add(r.id)
         elif not rev:
             sys.stderr.write(f"Role id={r.id} {r.content_type!r} {r.object_id} {r.role_field} is pointing to an object currently using no role\n")
             crosslinked[r.content_type_id][r.object_id][f'{r.role_field}_id'] = r.id
         else:
-            sys.stderr.write(f"Role id={r.id} {r.content_type!r} {r.object_id} {r.role_field} is pointing to an object using a different role: id={rev.id} {rev.content_type!r} {rev.object_id} {rev.role_field}\n")
+            sys.stderr.write(
+                f"Role id={r.id} {r.content_type!r} {r.object_id} {r.role_field} is pointing to an object using a different role: id={rev.id} {rev.content_type!r} {rev.object_id} {rev.role_field}\n"
+            )
             crosslinked[r.content_type_id][r.object_id][f'{r.role_field}_id'] = r.id
         continue
 
 
 sys.stderr.write('===================================\n')
 
 
-print(f"""\
+print(
+    f"""\
 from collections import Counter
 
 from django.contrib.contenttypes.models import ContentType
@@ -144,7 +160,8 @@ def resolve(obj, path):
 delete_counts = Counter()
 update_counts = Counter()
 
-""")
+"""
+)
 
 
 print("# Resource objects that are pointing to the wrong Role.  Some of these")

tools/scripts/ig-hotfix/scenarios/test3.py

@@ -21,7 +21,9 @@
     cursor.execute("UPDATE main_instancegroup SET use_role_id = NULL WHERE name = 'red'")
     cursor.execute(f"UPDATE main_instancegroup SET use_role_id = {green.use_role_id} WHERE name = 'yellow'")
 
-    cursor.execute("ALTER TABLE main_instancegroup ADD CONSTRAINT main_instancegroup_use_role_id_48ea7ecc_fk_main_rbac_roles_id FOREIGN KEY (use_role_id) REFERENCES public.main_rbac_roles(id) DEFERRABLE INITIALLY DEFERRED NOT VALID")
+    cursor.execute(
+        "ALTER TABLE main_instancegroup ADD CONSTRAINT main_instancegroup_use_role_id_48ea7ecc_fk_main_rbac_roles_id FOREIGN KEY (use_role_id) REFERENCES public.main_rbac_roles(id) DEFERRABLE INITIALLY DEFERRED NOT VALID"
+    )
 
 print("=====================================")
 for ig in InstanceGroup.objects.all():