Extended a contract

Author: c8y3

pyproject.toml

@@ -24,7 +24,7 @@ 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"
+source_modules = ["app.business.access_controls", "app.business.assets"]
 forbidden_modules = "app.blueprints.iris_user"
 allow_indirect_imports = true
 

source/app/blueprints/rest/case/case_assets_routes.py

@@ -169,7 +169,7 @@ def deprecated_add_asset(caseid):
         request_data = call_modules_hook('on_preload_asset_create', data=request.get_json(), caseid=caseid)
         ioc_links = request_data.get('ioc_links')
         asset = asset_schema.load(request_data)
-        msg, created_asset = assets_create(caseid, asset, ioc_links)
+        msg, created_asset = assets_create(iris_current_user, caseid, asset, ioc_links)
         return response_success(msg, asset_schema.dump(created_asset))
     except ValidationError as e:
         return response_error('Data error', data=e.messages)

source/app/blueprints/rest/v2/case_routes/assets.py

@@ -41,6 +41,7 @@
 from app.iris_engine.module_handler.module_handler import call_deprecated_on_preload_modules_hook
 from app.models.authorization import CaseAccessLevel
 from app.schema.marshables import CaseAssetsSchema
+from app.blueprints.iris_user import iris_current_user
 
 
 class AssetsOperations:
@@ -88,7 +89,7 @@ def create(self, case_identifier):
             request_data = call_deprecated_on_preload_modules_hook('asset_create', request.get_json(), case_identifier)
             ioc_links = request_data.get('ioc_links')
             asset = self._schema.load(request_data)
-            _, create_asset = assets_create(case_identifier, asset, ioc_links)
+            _, create_asset = assets_create(iris_current_user, case_identifier, asset, ioc_links)
             return response_api_created(self._schema.dump(create_asset))
 
         except ValidationError as e:

source/app/business/assets.py

@@ -19,7 +19,6 @@
 from flask_sqlalchemy.pagination import Pagination
 
 from app import db
-from app.blueprints.iris_user import iris_current_user
 from app.business.errors import BusinessProcessingError
 from app.business.errors import ObjectNotFoundError
 from app.business.cases import cases_exists
@@ -37,12 +36,12 @@
 from app.util import add_obj_history_entry
 
 
-def assets_create(case_identifier, asset: CaseAssets, ioc_links):
+def assets_create(user, case_identifier, asset: CaseAssets, ioc_links):
     asset.case_id = case_identifier
 
     if case_assets_db_exists(asset):
         raise BusinessProcessingError('Asset with same value and type already exists')
-    asset = create_asset(asset=asset, caseid=case_identifier, user_id=iris_current_user.id)
+    asset = create_asset(asset=asset, caseid=case_identifier, user_id=user.id)
     # TODO should the custom attributes be set?
     if ioc_links:
         errors, _ = set_ioc_links(ioc_links, asset.asset_id)