Merge pull request #906 from dfir-iris/api_v2_alerts_comments

Api v2 alerts comments

Author: whikernel

source/app/blueprints/rest/alerts_routes.py

@@ -904,6 +904,7 @@ def alerts_batch_escalate_route() -> Response:
 
 
 @alerts_rest_blueprint.route('/alerts/<int:alert_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/alerts/{alert_identifier}/comments')
 @ac_api_requires(Permissions.alerts_read)
 def alert_comments_get(alert_id):
     """

source/app/blueprints/rest/api_v2_routes.py

@@ -20,6 +20,9 @@
 
 from app.blueprints.rest.v2.alerts import alerts_blueprint
 from app.blueprints.rest.v2.assets import assets_blueprint
+from app.blueprints.rest.v2.events import events_blueprint
+from app.blueprints.rest.v2.evidences import evidences_blueprint
+from app.blueprints.rest.v2.notes import notes_blueprint
 from app.blueprints.rest.v2.auth import auth_blueprint
 from app.blueprints.rest.v2.cases import cases_blueprint
 from app.blueprints.rest.v2.dashboard import dashboard_blueprint
@@ -39,6 +42,9 @@
 rest_v2_blueprint.register_blueprint(tasks_blueprint)
 rest_v2_blueprint.register_blueprint(iocs_blueprint)
 rest_v2_blueprint.register_blueprint(assets_blueprint)
+rest_v2_blueprint.register_blueprint(events_blueprint)
+rest_v2_blueprint.register_blueprint(evidences_blueprint)
+rest_v2_blueprint.register_blueprint(notes_blueprint)
 rest_v2_blueprint.register_blueprint(alerts_blueprint)
 rest_v2_blueprint.register_blueprint(dashboard_blueprint)
 rest_v2_blueprint.register_blueprint(manage_v2_blueprint)

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

@@ -337,6 +337,7 @@ def deprecated_asset_delete(cur_id, caseid):
 
 
 @case_assets_rest_blueprint.route('/case/assets/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/assets/{asset_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comment_asset_list(cur_id, caseid):

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

@@ -140,6 +140,7 @@ def case_delete_rfile(cur_id, caseid):
 
 
 @case_evidences_rest_blueprint.route('/case/evidences/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/evidences/{evidence_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comment_evidence_list(cur_id, caseid):

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

@@ -247,6 +247,7 @@ def case_update_ioc(cur_id, caseid):
 
 
 @case_ioc_rest_blueprint.route('/case/ioc/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/iocs/{ioc_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comment_ioc_list(cur_id, caseid):

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

@@ -392,6 +392,7 @@ def case_edit_notes_groups(cur_id, caseid):
 
 
 @case_notes_rest_blueprint.route('/case/notes/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/notes/{note_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comment_note_list(cur_id, caseid):

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

@@ -164,6 +164,7 @@ def deprecated_case_delete_task(cur_id: int, caseid: int):
 
 
 @case_tasks_rest_blueprint.route('/case/tasks/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/tasks/{task_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comment_task_list(cur_id: int, caseid: int):

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

@@ -81,6 +81,7 @@
 
 
 @case_timeline_rest_blueprint.route('/case/timeline/events/<int:cur_id>/comments/list', methods=['GET'])
+@endpoint_deprecated('GET', '/api/v2/events/{event_identifier}/comments')
 @ac_requires_case_identifier(CaseAccessLevel.read_only, CaseAccessLevel.full_access)
 @ac_api_requires()
 def case_comments_get(cur_id, caseid):

source/app/blueprints/rest/case_comments.py

@@ -23,7 +23,7 @@
 from app.schema.marshables import CommentSchema
 from app.blueprints.responses import response_error
 from app.blueprints.responses import response_success
-from app.business.case_comments import case_comments_update
+from app.business.comments import comments_update_for_case
 from app.business.errors import BusinessProcessingError
 
 
@@ -32,7 +32,7 @@ def case_comment_update(comment_id, object_type, caseid):
         comment_schema = CommentSchema()
         rq_t = request.get_json()
         comment_text = rq_t.get('comment_text')
-        comment = case_comments_update(comment_text, comment_id, object_type, caseid)
+        comment = comments_update_for_case(comment_text, comment_id, object_type, caseid)
         return response_success("Comment edited", data=comment_schema.dump(comment))
     except BusinessProcessingError as e:
         return response_error(e.get_message(), data=e.get_data())

source/app/blueprints/rest/endpoints.py

@@ -31,11 +31,10 @@ def response_api_success(data):
 
 
 def _get_next_page(paginated_elements: Pagination):
-    if paginated_elements.has_next:
-        next_page = paginated_elements.has_next
-    else:
-        next_page = None
-    return next_page
+    if not paginated_elements.has_next:
+        return None
+
+    return paginated_elements.has_next
 
 
 def response_api_paginated(schema, paginated_elements: Pagination):
@@ -91,6 +90,6 @@ def endpoint_removed(message, version):
     def inner_wrap(f):
         @wraps(f)
         def wrap(*args, **kwargs):
-            return response_error(f"Endpoint deprecated in {version}. {message}.", status=410)
+            return response_error(f'Endpoint deprecated in {version}. {message}.', status=410)
         return wrap
     return inner_wrap