Moved up some imports to iris_current_user

Author: c8y3

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

@@ -631,7 +631,7 @@ def case_delete_event(cur_id, caseid):
     if not event:
         return response_error('Not a valid event ID for this case')
 
-    events_delete(event)
+    events_delete(iris_current_user, event)
 
     return response_success(f'Event ID {cur_id} deleted')
 
@@ -773,7 +773,7 @@ def case_duplicate_event(cur_id, caseid):
             event.event_title = f"[DUPLICATED] - {event.event_title}"
 
         db.session.add(event)
-        update_timeline_state(caseid=caseid)
+        update_timeline_state(caseid)
         db.session.commit()
 
         # Update category
@@ -959,7 +959,7 @@ def case_events_upload_csv(caseid):
             add_obj_history_entry(event, 'created')
 
             db.session.add(event)
-            update_timeline_state(caseid=caseid)
+            update_timeline_state(caseid)
 
             save_event_category(event.event_id, request_data.get('event_category_id'))
 

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

@@ -40,6 +40,7 @@
 from app.iris_engine.utils.collab import notify
 from app.models.authorization import CaseAccessLevel
 from app.iris_engine.module_handler.module_handler import call_deprecated_on_preload_modules_hook
+from app.blueprints.iris_user import iris_current_user
 
 
 class Events:
@@ -142,7 +143,7 @@ def delete(self, case_identifier, identifier):
                 return ac_api_return_access_denied(caseid=event.case_id)
             self._check_event_and_case_identifier_match(event, case_identifier)
 
-            events_delete(event)
+            events_delete(iris_current_user, event)
 
             return response_api_deleted()
         except ObjectNotFoundError:

source/app/business/events.py

@@ -77,7 +77,7 @@ def events_get(identifier) -> CasesEvent:
 def events_update(event: CasesEvent, event_category_id, event_assets, event_iocs, event_sync_iocs_assets) -> CasesEvent:
     add_obj_history_entry(event, 'updated')
 
-    update_timeline_state(caseid=event.case_id)
+    update_timeline_state(event.case_id)
     db.session.commit()
 
     save_event_category(event.event_id, event_category_id)
@@ -98,8 +98,8 @@ def events_update(event: CasesEvent, event_category_id, event_assets, event_iocs
     return event
 
 
-def events_delete(event: CasesEvent):
-    delete_event(event)
+def events_delete(user, event: CasesEvent):
+    delete_event(user.id, event)
 
     call_modules_hook('on_postload_event_delete', event.event_id, caseid=event.case_id)
     collab_notify(event.case_id, 'events', 'deletion', event.event_id)

source/app/datamgmt/alerts/alerts_db.py

@@ -412,7 +412,7 @@ def create_case_from_alerts(alerts: List[Alert], iocs_list: List[str], assets_li
             add_obj_history_entry(event, 'created')
 
             db.session.add(event)
-            update_timeline_state(caseid=case.case_id)
+            update_timeline_state(case.case_id)
 
             event.category = [unspecified_cat]
 
@@ -580,7 +580,7 @@ def create_case_from_alert(alert: Alert, iocs_list: List[str], assets_list: List
         add_obj_history_entry(event, 'created')
 
         db.session.add(event)
-        update_timeline_state(caseid=case.case_id)
+        update_timeline_state(case.case_id)
 
         event.category = [unspecified_cat]
 
@@ -702,7 +702,7 @@ def merge_alert_in_case(alert: Alert, case: Cases, iocs_list: List[str],
         add_obj_history_entry(event, 'created')
 
         db.session.add(event)
-        update_timeline_state(caseid=case.case_id)
+        update_timeline_state(case.case_id)
 
         event.category = [unspecified_cat]
 

source/app/datamgmt/case/case_db.py

@@ -239,12 +239,12 @@ def case_db_save(case: Cases):
     case.name = f'#{case.case_id} - {case.name}'
 
     # Create the states
-    update_timeline_state(caseid=case.case_id, userid=case.user_id)
-    update_tasks_state(caseid=case.case_id, userid=case.user_id)
-    update_evidences_state(caseid=case.case_id, userid=case.user_id)
-    update_ioc_state(caseid=case.case_id, userid=case.user_id)
-    update_assets_state(caseid=case.case_id, userid=case.user_id)
-    update_notes_state(caseid=case.case_id, userid=case.user_id)
+    update_timeline_state(case.case_id, case.user_id)
+    update_tasks_state(case.case_id, case.user_id)
+    update_evidences_state(case.case_id, case.user_id)
+    update_ioc_state(case.case_id, case.user_id)
+    update_assets_state(case.case_id, case.user_id)
+    update_notes_state(case.case_id, case.user_id)
 
     db.session.commit()
 

source/app/datamgmt/case/case_events_db.py

@@ -365,7 +365,7 @@ def get_case_iocs_for_tm(caseid):
     return iocs
 
 
-def delete_event(event):
+def delete_event(user_identifier, event):
     case_identifier = event.case_id
     delete_event_category(event.event_id)
 
@@ -393,7 +393,7 @@ def delete_event(event):
     db.session.commit()
 
     db.session.delete(event)
-    update_timeline_state(caseid=case_identifier)
+    update_timeline_state(case_identifier, user_identifier)
 
     db.session.commit()
 

source/app/datamgmt/states.py

@@ -36,9 +36,6 @@ def _update_object_state(object_name, caseid, userid) -> ObjectState:
     Returns:
         ObjectState object
     """
-    if not userid:
-        userid = iris_current_user.id
-
     os = ObjectState.query.filter(and_(
         ObjectState.object_name == object_name,
         ObjectState.object_case_id == caseid
@@ -83,6 +80,8 @@ def delete_case_states(caseid):
 
 
 def update_timeline_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('timeline', caseid, userid)
 
 
@@ -91,6 +90,8 @@ def get_timeline_state(caseid):
 
 
 def update_tasks_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('tasks', caseid, userid)
 
 
@@ -99,6 +100,8 @@ def get_tasks_state(caseid):
 
 
 def update_evidences_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('evidences', caseid, userid)
 
 
@@ -107,6 +110,8 @@ def get_evidences_state(caseid):
 
 
 def update_ioc_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('ioc', caseid, userid)
 
 
@@ -115,6 +120,8 @@ def get_ioc_state(caseid):
 
 
 def update_assets_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('assets', caseid, userid)
 
 
@@ -123,6 +130,8 @@ def get_assets_state(caseid):
 
 
 def update_notes_state(caseid, userid=None):
+    if not userid:
+        userid = iris_current_user.id
     return _update_object_state('notes', caseid, userid)