Extended existing import constraint

Author: c8y3

pyproject.toml

@@ -49,7 +49,7 @@ allow_indirect_imports = true
 [[tool.importlinter.contracts]]
 name = "Do not import API layer from the persistence layer (iris_user)"
 type = "forbidden"
-source_modules = "app.datamgmt.case"
+source_modules = ["app.datamgmt.case", "app.datamgmt.datastore"]
 forbidden_modules = "app.blueprints.iris_user"
 allow_indirect_imports = true
 

source/app/blueprints/rest/datastore_routes.py

@@ -137,7 +137,7 @@ def datastore_update_file(cur_id: int, caseid: int):
 
         msg_added_as = ''
         if dsf.file_is_ioc:
-            datastore_add_file_as_ioc(dsf)
+            datastore_add_file_as_ioc(iris_current_user.id, dsf)
             msg_added_as += 'and added in IOC'
 
         if dsf.file_is_evidence:
@@ -262,7 +262,7 @@ def datastore_add_file(cur_id: int, caseid: int):
 
         msg_added_as = ''
         if dsf_sc.file_is_ioc:
-            datastore_add_file_as_ioc(dsf_sc)
+            datastore_add_file_as_ioc(iris_current_user.id, dsf_sc)
             msg_added_as += 'and added in IOC'
 
         if dsf_sc.file_is_evidence:

source/app/datamgmt/datastore/datastore_db.py

@@ -25,9 +25,9 @@
 from sqlalchemy import func
 
 from app import app
-from app.datamgmt.db_operations import db_create, db_delete
+from app.datamgmt.db_operations import db_create
+from app.datamgmt.db_operations import db_delete
 from app.db import db
-from app.blueprints.iris_user import iris_current_user
 from app.models.evidences import CaseReceivedFile
 from app.models.models import DataStoreFile
 from app.models.models import DataStorePath
@@ -341,7 +341,7 @@ def datastore_delete_file(cur_id, cid):
     return False, f'File {cur_id} deleted'
 
 
-def datastore_add_file_as_ioc(dsf):
+def datastore_add_file_as_ioc(user_identifier, dsf):
     ioc = Ioc.query.filter(
         Ioc.ioc_value == dsf.file_sha256
     ).first()
@@ -361,7 +361,7 @@ def datastore_add_file_as_ioc(dsf):
         ioc.ioc_type_id = ioc_type_id.type_id
         ioc.ioc_tlp_id = ioc_tlp_id.tlp_id
         ioc.ioc_tags = 'datastore'
-        ioc.user_id = iris_current_user.id
+        ioc.user_id = user_identifier
 
         db_create(ioc)