Migrate to a new permission checker

backend/dataall/api/Objects/Environment/resolvers.py

@@ -84,11 +84,8 @@ def create_environment(context: Context, source, input=None):
         input['cdk_role_name'] = cdk_role_name
         env = Environment.create_environment(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=input.get('organizationUri'),
             data=input,
-            check_perm=True,
         )
         Stack.create_stack(
             session=session,
@@ -123,11 +120,8 @@ def update_environment(
 
         environment = db.api.Environment.update_environment(
             session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=input,
-            check_perm=True,
         )
 
         if EnvironmentResourceManager.deploy_updated_stack(session, previous_resource_prefix, environment):
@@ -140,11 +134,8 @@ def invite_group(context: Context, source, input):
     with context.engine.scoped_session() as session:
         environment, environment_group = db.api.Environment.invite_group(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=input['environmentUri'],
             data=input,
-            check_perm=True,
         )
 
     stack_helper.deploy_stack(targetUri=environment.environmentUri)
@@ -163,11 +154,8 @@ def add_consumption_role(context: Context, source, input):
             )
         consumption_role = db.api.Environment.add_consumption_role(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=input['environmentUri'],
             data=input,
-            check_perm=True,
         )
 
     return consumption_role
@@ -177,11 +165,8 @@ def update_group_permissions(context, source, input):
     with context.engine.scoped_session() as session:
         environment = db.api.Environment.update_group_permissions(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=input['environmentUri'],
             data=input,
-            check_perm=True,
         )
 
     stack_helper.deploy_stack(targetUri=environment.environmentUri)
@@ -193,11 +178,8 @@ def remove_group(context: Context, source, environmentUri=None, groupUri=None):
     with context.engine.scoped_session() as session:
         environment = db.api.Environment.remove_group(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
-            data={'groupUri': groupUri},
-            check_perm=True,
+            group=groupUri,
         )
 
     stack_helper.deploy_stack(targetUri=environment.environmentUri)
@@ -209,11 +191,8 @@ def remove_consumption_role(context: Context, source, environmentUri=None, consu
     with context.engine.scoped_session() as session:
         status = db.api.Environment.remove_consumption_role(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=consumptionRoleUri,
-            data={'environmentUri': environmentUri},
-            check_perm=True,
+            env_uri=environmentUri,
         )
 
     return status
@@ -227,11 +206,8 @@ def list_environment_invited_groups(
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_environment_invited_groups(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -241,11 +217,8 @@ def list_environment_groups(context: Context, source, environmentUri=None, filte
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_user_environment_groups(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -257,11 +230,8 @@ def list_all_environment_groups(
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_all_environment_groups(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -273,11 +243,8 @@ def list_environment_consumption_roles(
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_user_environment_consumption_roles(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -289,11 +256,8 @@ def list_all_environment_consumption_roles(
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_all_environment_consumption_roles(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -315,14 +279,7 @@ def list_environments(context: Context, source, filter=None):
     if filter is None:
         filter = {}
     with context.engine.scoped_session() as session:
-        return db.api.Environment.paginated_user_environments(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=None,
-            data=filter,
-            check_perm=True,
-        )
+        return db.api.Environment.paginated_user_environments(session, filter)
 
 
 def list_environment_networks(
@@ -333,11 +290,8 @@ def list_environment_networks(
     with context.engine.scoped_session() as session:
         return db.api.Environment.paginated_environment_networks(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -355,15 +309,7 @@ def resolve_vpc_list(context: Context, source, **kwargs):
 
 def get_environment(context: Context, source, environmentUri: str = None):
     with context.engine.scoped_session() as session:
-        ResourcePolicy.check_user_resource_permission(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            resource_uri=environmentUri,
-            permission_name=permissions.GET_ENVIRONMENT,
-        )
-        environment = db.api.Environment.get_environment_by_uri(session, environmentUri)
-        return environment
+        return db.api.Environment.find_environment_by_uri(session, uri=environmentUri)
 
 
 def resolve_user_role(context: Context, source: models.Environment):
@@ -394,11 +340,8 @@ def list_environment_group_permissions(
     with context.engine.scoped_session() as session:
         return db.api.Environment.list_group_permissions(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
-            data={'groupUri': groupUri},
-            check_perm=True,
+            group_uri=groupUri
         )
 
 
@@ -518,23 +461,13 @@ def delete_environment(
     context: Context, source, environmentUri: str = None, deleteFromAWS: bool = False
 ):
     with context.engine.scoped_session() as session:
-        ResourcePolicy.check_user_resource_permission(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            resource_uri=environmentUri,
-            permission_name=permissions.DELETE_ENVIRONMENT,
-        )
         environment = db.api.Environment.get_environment_by_uri(session, environmentUri)
 
         try:
             db.api.Environment.delete_environment(
                 session,
-                username=context.username,
-                groups=context.groups,
                 uri=environmentUri,
-                data={'environment': environment},
-                check_perm=True,
+                environment=environment
             )
         except exc.IntegrityError:
             raise exceptions.EnvironmentResourcesFound(

backend/dataall/api/Objects/Glossary/resolvers.py

@@ -26,14 +26,7 @@ def create_glossary(
     context: Context, source, input: dict = None
 ) -> models.GlossaryNode:
     with context.engine.scoped_session() as session:
-        return db.api.Glossary.create_glossary(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=None,
-            data=input,
-            check_perm=True,
-        )
+        return db.api.Glossary.create_glossary(session, input)
 
 
 def tree(context: Context, source: models.GlossaryNode):
@@ -93,23 +86,17 @@ def create_category(
     with context.engine.scoped_session() as session:
         return db.api.Glossary.create_category(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=parentUri,
             data=input,
-            check_perm=True,
         )
 
 
 def create_term(context: Context, source, parentUri: str = None, input: dict = None):
     with context.engine.scoped_session() as session:
         return db.api.Glossary.create_term(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=parentUri,
             data=input,
-            check_perm=True,
         )
 
 
@@ -119,11 +106,7 @@ def list_glossaries(context: Context, source, filter: dict = None):
     with context.engine.scoped_session() as session:
         return db.api.Glossary.list_glossaries(
             session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=None,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -137,11 +120,8 @@ def resolve_categories(
     with context.engine.scoped_session() as session:
         return db.api.Glossary.list_categories(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=source.nodeUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -153,11 +133,8 @@ def resolve_terms(context: Context, source: models.GlossaryNode, filter: dict =
     with context.engine.scoped_session() as session:
         return db.api.Glossary.list_terms(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=source.nodeUri,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -167,11 +144,8 @@ def update_node(
     with context.engine.scoped_session() as session:
         return db.api.Glossary.update_node(
             session,
-            username=context.username,
-            groups=context.groups,
             uri=nodeUri,
             data=input,
-            check_perm=True,
         )
 
 
@@ -193,14 +167,7 @@ def resolve_user_role(context: Context, source: models.GlossaryNode, **kwargs):
 
 def delete_node(context: Context, source, nodeUri: str = None) -> bool:
     with context.engine.scoped_session() as session:
-        return db.api.Glossary.delete_node(
-            session,
-            username=context.username,
-            groups=context.groups,
-            uri=nodeUri,
-            data=None,
-            check_perm=True,
-        )
+        return db.api.Glossary.delete_node(session, nodeUri)
 
 
 def hierarchical_search(context: Context, source, filter: dict = None):
@@ -210,11 +177,7 @@ def hierarchical_search(context: Context, source, filter: dict = None):
     with context.engine.scoped_session() as session:
         return db.api.Glossary.hierarchical_search(
             session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=None,
             data=filter,
-            check_perm=True,
         )
 
 
@@ -251,11 +214,7 @@ def search_terms(context: Context, source, filter: dict = None):
     with context.engine.scoped_session() as session:
         return db.api.Glossary.search_terms(
             session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=None,
             data=filter,
-            check_perm=True,
         )
 
 

backend/dataall/api/Objects/Group/resolvers.py

@@ -14,11 +14,8 @@ def resolve_group_environment_permissions(context, source, environmentUri):
     with context.engine.scoped_session() as session:
         return db.api.Environment.list_group_permissions(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=environmentUri,
-            data={'groupUri': source.groupUri},
-            check_perm=True,
+            group_uri=source.groupUri
         )
 
 

backend/dataall/api/Objects/KeyValueTag/resolvers.py

@@ -9,23 +9,17 @@ def list_key_value_tags(
     with context.engine.scoped_session() as session:
         return db.api.KeyValueTag.list_key_value_tags(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=targetUri,
-            data={'targetType': targetType},
-            check_perm=True,
+            target_type=targetType,
         )
 
 
 def update_key_value_tags(context: Context, source, input=None):
     with context.engine.scoped_session() as session:
         kv_tags = db.api.KeyValueTag.update_key_value_tags(
             session=session,
-            username=context.username,
-            groups=context.groups,
             uri=input['targetUri'],
             data=input,
-            check_perm=True,
         )
         stack_helper.deploy_stack(targetUri=input['targetUri'])
         return kv_tags