Merge pull request #929 from dfir-iris/api_v2_update_comment

Api v2 update comment

Author: whikernel

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.ruff.lint]
 preview = true
-select = ["E101", "E225", "E23", "E24", "E3", "E4", "E7", "E9", "F", "PLR0402", "RET506", "UP032", "W29"]
+select = ["E101", "E225", "E23", "E24", "E3", "E4", "E7", "E9", "F", "PLR0402", "RET506", "TID252", "UP032", "W29"]
 ignore = ["E402", "E711", "E712", "E721", "E722"]
 
 [tool.importlinter]
@@ -10,8 +10,8 @@ include_external_packages = true
 [[tool.importlinter.contracts]]
 name = "Do not import the persistence layer from the API layer"
 type = "forbidden"
-source_modules = "app.blueprints.rest.v2.alerts"
-forbidden_modules = "app.datamgmt.alerts"
+source_modules = "app.blueprints.rest.v2"
+forbidden_modules = "app.datamgmt"
 allow_indirect_imports = true
 
 [[tool.importlinter.contracts]]
@@ -21,10 +21,24 @@ source_modules = ["app.blueprints.rest.search_routes", "app.blueprints.rest.dim_
 forbidden_modules = "sqlalchemy"
 allow_indirect_imports = true
 
+[[tool.importlinter.contracts]]
+name = "Do not import API layer from the business layer"
+type = "forbidden"
+source_modules = ["app.business.access_controls", "app.business.assets"]
+forbidden_modules = "app.blueprints.iris_user"
+allow_indirect_imports = true
+
 [[tool.importlinter.contracts]]
 name = "Do not import sqlalchemy from the business layer"
 type = "forbidden"
 source_modules = "app.business"
 forbidden_modules = "sqlalchemy"
 allow_indirect_imports = true
 
+[[tool.importlinter.contracts]]
+name = "Do not import API layer from the persistence layer"
+type = "forbidden"
+source_modules = "app.datamgmt.dashboard"
+forbidden_modules = "app.blueprints.iris_user"
+allow_indirect_imports = true
+

source/app/blueprints/access_controls.py

@@ -47,7 +47,7 @@
 from app.datamgmt.case.case_db import get_case
 from app.datamgmt.manage.manage_access_control_db import user_has_client_access
 from app.datamgmt.manage.manage_users_db import get_user
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.business.access_controls import ac_fast_check_user_has_case_access
 from app.iris_engine.access_control.utils import ac_get_effective_permissions_of_user
 from app.iris_engine.utils.tracker import track_activity
@@ -578,3 +578,7 @@ def is_authentication_oidc():
 
 def is_authentication_ldap():
     return app.config.get('AUTHENTICATION_TYPE') == "ldap"
+
+
+def ac_fast_check_current_user_has_case_access(cid, access_level):
+    return ac_fast_check_user_has_case_access(iris_current_user.id, cid, access_level)

source/app/blueprints/graphql/cases.py

@@ -41,7 +41,7 @@
 from app.blueprints.graphql.permissions import permissions_check_current_user_has_some_case_access
 from app.iris_engine.module_handler.module_handler import call_deprecated_on_preload_modules_hook
 from app.schema.marshables import CaseSchema
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.datamgmt.manage.manage_access_control_db import user_has_client_access
 
 from app.blueprints.graphql.iocs import IOCConnection

source/app/blueprints/graphql/graphql_route.py

@@ -50,7 +50,7 @@
 
 from app.business.cases import cases_get_by_identifier
 from app.business.iocs import iocs_get
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.blueprints.graphql.permissions import permissions_check_current_user_has_some_case_access
 import warnings
 

source/app/blueprints/graphql/permissions.py

@@ -22,10 +22,9 @@
 from flask import session
 from flask import request
 
-from app.blueprints.access_controls import get_case_access_from_api
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.access_controls import get_case_access_from_api, ac_fast_check_current_user_has_case_access
+from app.blueprints.iris_user import iris_current_user
 from app.iris_engine.access_control.utils import ac_get_effective_permissions_of_user
-from app.business.access_controls import ac_fast_check_current_user_has_case_access
 
 
 class PermissionDeniedError(Exception):

…/iris_engine/access_control/iris_user.py source/app/blueprints/iris_user.pysource/app/iris_engine/access_control/iris_user.py renamed to source/app/blueprints/iris_user.py source/app/iris_engine/access_control/iris_user.py renamed to source/app/blueprints/iris_user.py

@@ -29,7 +29,7 @@
 from app.models.authorization import Permissions
 from app.blueprints.responses import response_error
 from app.blueprints.access_controls import ac_requires
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 
 alerts_blueprint = Blueprint(
     'alerts',

source/app/blueprints/pages/alerts/alerts_routes.py

@@ -22,7 +22,7 @@
 from flask import url_for
 from flask_wtf import FlaskForm
 
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.datamgmt.case.case_db import get_case
 from app.datamgmt.case.case_tasks_db import get_case_tasks_comments_count
 from app.datamgmt.case.case_tasks_db import get_task

source/app/blueprints/pages/case/case_tasks_routes.py

@@ -23,7 +23,7 @@
 from flask_wtf import FlaskForm
 
 from app import app
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.datamgmt.dashboard.dashboard_db import get_tasks_status
 from app.forms import CaseGlobalTaskForm
 from app.iris_engine.access_control.utils import ac_get_user_case_counts

source/app/blueprints/pages/dashboard/dashboard_routes.py

@@ -46,7 +46,7 @@
 from app.datamgmt.manage.manage_users_db import update_user_groups
 from app.datamgmt.manage.manage_users_db import get_user
 from app.forms import LoginForm, MFASetupForm
-from app.iris_engine.access_control.iris_user import iris_current_user
+from app.blueprints.iris_user import iris_current_user
 from app.iris_engine.utils.tracker import track_activity
 from app.datamgmt.manage.manage_groups_db import get_groups_list
 from app.business.auth import generate_auth_tokens