diff --git a/source/app/blueprints/access_controls.py b/source/app/blueprints/access_controls.py index aee140078..4bf9e34db 100644 --- a/source/app/blueprints/access_controls.py +++ b/source/app/blueprints/access_controls.py @@ -40,6 +40,7 @@ from app import app from app import db +from app.blueprints.responses import response_error 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 @@ -50,7 +51,6 @@ from app.models.authorization import Permissions from app.models.authorization import CaseAccessLevel -from app.blueprints.responses import response_error from app.util import not_authenticated_redirection_url diff --git a/source/app/blueprints/responses.py b/source/app/blueprints/responses.py index e870de97b..e582be00a 100644 --- a/source/app/blueprints/responses.py +++ b/source/app/blueprints/responses.py @@ -41,3 +41,12 @@ def response_error(msg, data=None, status=400): 'data': data if data is not None else [] } return response(status, data=content) + + +def response_success(msg='', data=None): + content = { + "status": "success", + "message": msg, + "data": data if data is not None else [] + } + return response(200, data=content) diff --git a/source/app/blueprints/rest/activities_routes.py b/source/app/blueprints/rest/activities_routes.py index c8782ed95..1b8fc4c5a 100644 --- a/source/app/blueprints/rest/activities_routes.py +++ b/source/app/blueprints/rest/activities_routes.py @@ -22,7 +22,7 @@ from app.datamgmt.activities.activities_db import get_users_activities from app.models.authorization import Permissions from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success activities_rest_blueprint = Blueprint('activities_rest', __name__) diff --git a/source/app/blueprints/rest/alerts_routes.py b/source/app/blueprints/rest/alerts_routes.py index 36dd8572b..46e254748 100644 --- a/source/app/blueprints/rest/alerts_routes.py +++ b/source/app/blueprints/rest/alerts_routes.py @@ -59,7 +59,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error from app.util import add_obj_history_entry -from app.util import response_success +from app.blueprints.responses import response_success alerts_rest_blueprint = Blueprint('alerts_rest', __name__) diff --git a/source/app/blueprints/rest/api_routes.py b/source/app/blueprints/rest/api_routes.py index a12ae5808..10e767507 100644 --- a/source/app/blueprints/rest/api_routes.py +++ b/source/app/blueprints/rest/api_routes.py @@ -20,7 +20,7 @@ from app import app from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success rest_api_blueprint = Blueprint('rest_api', __name__) diff --git a/source/app/blueprints/rest/case/case_assets_routes.py b/source/app/blueprints/rest/case/case_assets_routes.py index 10abbb4cd..34b72121c 100644 --- a/source/app/blueprints/rest/case/case_assets_routes.py +++ b/source/app/blueprints/rest/case/case_assets_routes.py @@ -64,7 +64,7 @@ from app.schema.marshables import CommentSchema from app.blueprints.access_controls import ac_requires_case_identifier, ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.blueprints.access_controls import ac_api_return_access_denied case_assets_rest_blueprint = Blueprint('case_assets_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_evidences_routes.py b/source/app/blueprints/rest/case/case_evidences_routes.py index ab88332d7..330c19882 100644 --- a/source/app/blueprints/rest/case/case_evidences_routes.py +++ b/source/app/blueprints/rest/case/case_evidences_routes.py @@ -43,7 +43,7 @@ from app.blueprints.access_controls import ac_requires_case_identifier from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_evidences_rest_blueprint = Blueprint('case_evidences_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_graphs_routes.py b/source/app/blueprints/rest/case/case_graphs_routes.py index cbd3de723..07ea68a4d 100644 --- a/source/app/blueprints/rest/case/case_graphs_routes.py +++ b/source/app/blueprints/rest/case/case_graphs_routes.py @@ -26,7 +26,7 @@ from app.models.authorization import CaseAccessLevel from app.blueprints.access_controls import ac_requires_case_identifier from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success case_graph_rest_blueprint = Blueprint('case_graph_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_ioc_routes.py b/source/app/blueprints/rest/case/case_ioc_routes.py index 85f02644d..e30167797 100644 --- a/source/app/blueprints/rest/case/case_ioc_routes.py +++ b/source/app/blueprints/rest/case/case_ioc_routes.py @@ -62,7 +62,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_ioc_rest_blueprint = Blueprint('case_ioc_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_notes_routes.py b/source/app/blueprints/rest/case/case_notes_routes.py index f41a23659..5cd6eaba8 100644 --- a/source/app/blueprints/rest/case/case_notes_routes.py +++ b/source/app/blueprints/rest/case/case_notes_routes.py @@ -56,7 +56,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.rest.endpoints import endpoint_removed from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_notes_rest_blueprint = Blueprint('case_notes_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_routes.py b/source/app/blueprints/rest/case/case_routes.py index f731c03a0..3d1e7c727 100644 --- a/source/app/blueprints/rest/case/case_routes.py +++ b/source/app/blueprints/rest/case/case_routes.py @@ -72,7 +72,7 @@ from app.util import add_obj_history_entry from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_rest_blueprint = Blueprint('case_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_tasks_routes.py b/source/app/blueprints/rest/case/case_tasks_routes.py index 8899962ce..f0b9ebe9a 100644 --- a/source/app/blueprints/rest/case/case_tasks_routes.py +++ b/source/app/blueprints/rest/case/case_tasks_routes.py @@ -56,7 +56,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_tasks_rest_blueprint = Blueprint('case_tasks_rest', __name__) diff --git a/source/app/blueprints/rest/case/case_timeline_routes.py b/source/app/blueprints/rest/case/case_timeline_routes.py index acdf87a0a..ef61e20af 100644 --- a/source/app/blueprints/rest/case/case_timeline_routes.py +++ b/source/app/blueprints/rest/case/case_timeline_routes.py @@ -70,7 +70,7 @@ from app.blueprints.access_controls import ac_api_requires from app.util import add_obj_history_entry from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success case_timeline_rest_blueprint = Blueprint('case_timeline_rest', __name__) diff --git a/source/app/blueprints/rest/case_comments.py b/source/app/blueprints/rest/case_comments.py index 8cb7e312d..dbf7bd985 100644 --- a/source/app/blueprints/rest/case_comments.py +++ b/source/app/blueprints/rest/case_comments.py @@ -22,7 +22,7 @@ from app.schema.marshables import CommentSchema from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.business.case_comments import case_comments_update from app.business.errors import BusinessProcessingError diff --git a/source/app/blueprints/rest/context_routes.py b/source/app/blueprints/rest/context_routes.py index fe69cea09..7ea7f7a3c 100644 --- a/source/app/blueprints/rest/context_routes.py +++ b/source/app/blueprints/rest/context_routes.py @@ -30,7 +30,7 @@ from app.models.models import Client from app.blueprints.access_controls import ac_api_requires from app.util import not_authenticated_redirection_url -from app.util import response_success +from app.blueprints.responses import response_success context_rest_blueprint = Blueprint('context_rest', __name__) diff --git a/source/app/blueprints/rest/dashboard_routes.py b/source/app/blueprints/rest/dashboard_routes.py index 653af9939..dfd6369e5 100644 --- a/source/app/blueprints/rest/dashboard_routes.py +++ b/source/app/blueprints/rest/dashboard_routes.py @@ -46,7 +46,7 @@ from app.blueprints.access_controls import ac_api_requires from app.util import not_authenticated_redirection_url from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.util import is_authentication_oidc from oic.oauth2.exception import GrantError diff --git a/source/app/blueprints/rest/datastore_routes.py b/source/app/blueprints/rest/datastore_routes.py index ed69c309a..25b6aa4de 100644 --- a/source/app/blueprints/rest/datastore_routes.py +++ b/source/app/blueprints/rest/datastore_routes.py @@ -50,7 +50,7 @@ from app.blueprints.access_controls import ac_api_requires from app.util import add_obj_history_entry from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success datastore_rest_blueprint = Blueprint('datastore_rest', __name__) diff --git a/source/app/blueprints/rest/dim_tasks_routes.py b/source/app/blueprints/rest/dim_tasks_routes.py index 685e5e732..599fc2040 100644 --- a/source/app/blueprints/rest/dim_tasks_routes.py +++ b/source/app/blueprints/rest/dim_tasks_routes.py @@ -40,7 +40,7 @@ from app.blueprints.access_controls import ac_requires_case_identifier from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from iris_interface.IrisInterfaceStatus import IIStatus dim_tasks_rest_blueprint = Blueprint('dim_tasks_rest', __name__) diff --git a/source/app/blueprints/rest/filters_routes.py b/source/app/blueprints/rest/filters_routes.py index 2ff1dfe57..87b483e5e 100644 --- a/source/app/blueprints/rest/filters_routes.py +++ b/source/app/blueprints/rest/filters_routes.py @@ -26,7 +26,7 @@ from app.iris_engine.utils.tracker import track_activity from app.schema.marshables import SavedFilterSchema from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success from app.blueprints.responses import response_error saved_filters_rest_blueprint = Blueprint('saved_filters_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_access_control_routes.py b/source/app/blueprints/rest/manage/manage_access_control_routes.py index 3c964c652..9f924cdc2 100644 --- a/source/app/blueprints/rest/manage/manage_access_control_routes.py +++ b/source/app/blueprints/rest/manage/manage_access_control_routes.py @@ -25,7 +25,7 @@ from app.iris_engine.access_control.utils import ac_trace_user_effective_cases_access_2 from app.models.authorization import Permissions from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success manage_ac_rest_blueprint = Blueprint('access_control_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_alerts_status_routes.py b/source/app/blueprints/rest/manage/manage_alerts_status_routes.py index f9b9034e9..c82266013 100644 --- a/source/app/blueprints/rest/manage/manage_alerts_status_routes.py +++ b/source/app/blueprints/rest/manage/manage_alerts_status_routes.py @@ -27,7 +27,7 @@ from app.schema.marshables import AlertResolutionSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_alerts_status_rest_blueprint = Blueprint('manage_alerts_status_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_analysis_status_routes.py b/source/app/blueprints/rest/manage/manage_analysis_status_routes.py index 16a368728..17ac1f891 100644 --- a/source/app/blueprints/rest/manage/manage_analysis_status_routes.py +++ b/source/app/blueprints/rest/manage/manage_analysis_status_routes.py @@ -26,7 +26,7 @@ from app.schema.marshables import AnalysisStatusSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_analysis_status_rest_blueprint = Blueprint('manage_analysis_status_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_assets_routes.py b/source/app/blueprints/rest/manage/manage_assets_routes.py index e8c8dc34e..595af98de 100644 --- a/source/app/blueprints/rest/manage/manage_assets_routes.py +++ b/source/app/blueprints/rest/manage/manage_assets_routes.py @@ -26,7 +26,7 @@ from app.schema.marshables import CaseAssetsSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied -from app.util import response_success +from app.blueprints.responses import response_success manage_assets_rest_blueprint = Blueprint('manage_assets_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_assets_type_routes.py b/source/app/blueprints/rest/manage/manage_assets_type_routes.py index ea2070b1a..26af87ca4 100644 --- a/source/app/blueprints/rest/manage/manage_assets_type_routes.py +++ b/source/app/blueprints/rest/manage/manage_assets_type_routes.py @@ -33,7 +33,7 @@ from app.schema.marshables import AssetTypeSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_assets_type_rest_blueprint = Blueprint('manage_assets_type_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_attributes_routes.py b/source/app/blueprints/rest/manage/manage_attributes_routes.py index d49260d1d..5dcd1b8ae 100644 --- a/source/app/blueprints/rest/manage/manage_attributes_routes.py +++ b/source/app/blueprints/rest/manage/manage_attributes_routes.py @@ -26,7 +26,7 @@ from app.models.models import CustomAttribute from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_attributes_rest_blueprint = Blueprint('manage_attributes_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_case_classifications_routes.py b/source/app/blueprints/rest/manage/manage_case_classifications_routes.py index 2c14d0471..a63f3c26f 100644 --- a/source/app/blueprints/rest/manage/manage_case_classifications_routes.py +++ b/source/app/blueprints/rest/manage/manage_case_classifications_routes.py @@ -31,7 +31,7 @@ from app.schema.marshables import CaseClassificationSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_case_classification_rest_blueprint = Blueprint('manage_case_classifications_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_case_state.py b/source/app/blueprints/rest/manage/manage_case_state.py index 4fbf5bd42..57b8461db 100644 --- a/source/app/blueprints/rest/manage/manage_case_state.py +++ b/source/app/blueprints/rest/manage/manage_case_state.py @@ -31,7 +31,7 @@ from app.schema.marshables import CaseStateSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_case_state_rest_blueprint = Blueprint('manage_case_state_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_case_templates_routes.py b/source/app/blueprints/rest/manage/manage_case_templates_routes.py index e6afd719c..aab98e66d 100644 --- a/source/app/blueprints/rest/manage/manage_case_templates_routes.py +++ b/source/app/blueprints/rest/manage/manage_case_templates_routes.py @@ -34,7 +34,7 @@ from app.blueprints.access_controls import ac_requires_case_identifier from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_case_templates_rest_blueprint = Blueprint('manage_case_templates_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_cases_routes.py b/source/app/blueprints/rest/manage/manage_cases_routes.py index ad2d81e53..07167dbf9 100644 --- a/source/app/blueprints/rest/manage/manage_cases_routes.py +++ b/source/app/blueprints/rest/manage/manage_cases_routes.py @@ -54,7 +54,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.business.cases import cases_delete from app.business.cases import cases_update from app.business.cases import cases_create diff --git a/source/app/blueprints/rest/manage/manage_customers_routes.py b/source/app/blueprints/rest/manage/manage_customers_routes.py index 150aba44c..d0faa0a08 100644 --- a/source/app/blueprints/rest/manage/manage_customers_routes.py +++ b/source/app/blueprints/rest/manage/manage_customers_routes.py @@ -45,7 +45,7 @@ from app.schema.marshables import CustomerSchema from app.blueprints.access_controls import ac_api_requires_client_access from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_customers_rest_blueprint = Blueprint('manage_customers_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_event_categories_routes.py b/source/app/blueprints/rest/manage/manage_event_categories_routes.py index bda7bcf13..ec383cbb6 100644 --- a/source/app/blueprints/rest/manage/manage_event_categories_routes.py +++ b/source/app/blueprints/rest/manage/manage_event_categories_routes.py @@ -23,7 +23,7 @@ from app.schema.marshables import EventCategorySchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_event_categories_rest_blueprint = Blueprint('manage_event_categories_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_evidence_types_routes.py b/source/app/blueprints/rest/manage/manage_evidence_types_routes.py index 89d2a7187..2bf31c48a 100644 --- a/source/app/blueprints/rest/manage/manage_evidence_types_routes.py +++ b/source/app/blueprints/rest/manage/manage_evidence_types_routes.py @@ -31,7 +31,7 @@ from app.schema.marshables import EvidenceTypeSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_evidence_types_rest_blueprint = Blueprint('manage_evidence_types_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_groups.py b/source/app/blueprints/rest/manage/manage_groups.py index 969e49591..e6f857bb0 100644 --- a/source/app/blueprints/rest/manage/manage_groups.py +++ b/source/app/blueprints/rest/manage/manage_groups.py @@ -46,7 +46,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.iris_engine.demo_builder import protect_demo_mode_group manage_groups_rest_blueprint = Blueprint('manage_groups_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_ioc_types_routes.py b/source/app/blueprints/rest/manage/manage_ioc_types_routes.py index 1bf09f593..6f5a07d9c 100644 --- a/source/app/blueprints/rest/manage/manage_ioc_types_routes.py +++ b/source/app/blueprints/rest/manage/manage_ioc_types_routes.py @@ -30,7 +30,7 @@ from app.schema.marshables import IocTypeSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_ioc_type_rest_blueprint = Blueprint('manage_ioc_types_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_modules_routes.py b/source/app/blueprints/rest/manage/manage_modules_routes.py index f579a4e9b..a6b114f92 100644 --- a/source/app/blueprints/rest/manage/manage_modules_routes.py +++ b/source/app/blueprints/rest/manage/manage_modules_routes.py @@ -40,7 +40,7 @@ from app.models.authorization import Permissions from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.schema.marshables import IrisModuleSchema manage_modules_rest_blueprint = Blueprint('manage_module_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_server_settings_routes.py b/source/app/blueprints/rest/manage/manage_server_settings_routes.py index 79ec66c9f..3bd5f6e3f 100644 --- a/source/app/blueprints/rest/manage/manage_server_settings_routes.py +++ b/source/app/blueprints/rest/manage/manage_server_settings_routes.py @@ -32,7 +32,7 @@ from app.schema.marshables import ServerSettingsSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from dictdiffer import diff manage_server_settings_rest_blueprint = Blueprint('manage_server_settings_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_severities_routes.py b/source/app/blueprints/rest/manage/manage_severities_routes.py index e025fef28..de0eb164a 100644 --- a/source/app/blueprints/rest/manage/manage_severities_routes.py +++ b/source/app/blueprints/rest/manage/manage_severities_routes.py @@ -25,7 +25,7 @@ from app.schema.marshables import SeveritySchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_severities_rest_blueprint = Blueprint('manage_severities_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_tags.py b/source/app/blueprints/rest/manage/manage_tags.py index e724ad07c..3b159aca5 100644 --- a/source/app/blueprints/rest/manage/manage_tags.py +++ b/source/app/blueprints/rest/manage/manage_tags.py @@ -24,7 +24,7 @@ from app.schema.marshables import TagsSchema from app.blueprints.access_controls import ac_api_requires from app.util import AlchemyEncoder -from app.util import response_success +from app.blueprints.responses import response_success manage_tags_rest_blueprint = Blueprint('manage_tags_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_task_status_routes.py b/source/app/blueprints/rest/manage/manage_task_status_routes.py index 1b4c76124..bdb261738 100644 --- a/source/app/blueprints/rest/manage/manage_task_status_routes.py +++ b/source/app/blueprints/rest/manage/manage_task_status_routes.py @@ -21,7 +21,7 @@ from app.models.models import TaskStatus from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_task_status_rest_blueprint = Blueprint('manage_task_status_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_templates_routes.py b/source/app/blueprints/rest/manage/manage_templates_routes.py index a853dfb55..2c0c791cd 100644 --- a/source/app/blueprints/rest/manage/manage_templates_routes.py +++ b/source/app/blueprints/rest/manage/manage_templates_routes.py @@ -38,7 +38,7 @@ from app.models.models import ReportType from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success _ALLOWED_EXTENSIONS = {'md', 'html', 'doc', 'docx'} diff --git a/source/app/blueprints/rest/manage/manage_tlps_routes.py b/source/app/blueprints/rest/manage/manage_tlps_routes.py index 14dc51e1f..a72ec43f2 100644 --- a/source/app/blueprints/rest/manage/manage_tlps_routes.py +++ b/source/app/blueprints/rest/manage/manage_tlps_routes.py @@ -21,7 +21,7 @@ from app.models import Tlp from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success manage_tlp_type_rest_blueprint = Blueprint('manage_tlp_types_rest', __name__) diff --git a/source/app/blueprints/rest/manage/manage_users.py b/source/app/blueprints/rest/manage/manage_users.py index f5453da60..18344861a 100644 --- a/source/app/blueprints/rest/manage/manage_users.py +++ b/source/app/blueprints/rest/manage/manage_users.py @@ -49,7 +49,7 @@ from app.blueprints.access_controls import ac_api_requires from app.blueprints.access_controls import ac_api_return_access_denied from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.iris_engine.demo_builder import protect_demo_mode_user manage_users_rest_blueprint = Blueprint('manage_users_rest', __name__) diff --git a/source/app/blueprints/rest/overview_routes.py b/source/app/blueprints/rest/overview_routes.py index 9992849df..892c5abeb 100644 --- a/source/app/blueprints/rest/overview_routes.py +++ b/source/app/blueprints/rest/overview_routes.py @@ -22,7 +22,7 @@ from app.datamgmt.overview.overview_db import get_overview_db from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success overview_rest_blueprint = Blueprint('overview_rest', __name__) diff --git a/source/app/blueprints/rest/profile_routes.py b/source/app/blueprints/rest/profile_routes.py index 5d5e04e3d..56043ae28 100644 --- a/source/app/blueprints/rest/profile_routes.py +++ b/source/app/blueprints/rest/profile_routes.py @@ -36,7 +36,7 @@ from app.schema.marshables import BasicUserSchema from app.blueprints.access_controls import ac_api_requires from app.blueprints.responses import response_error -from app.util import response_success +from app.blueprints.responses import response_success from app.blueprints.rest.endpoints import endpoint_removed profile_rest_blueprint = Blueprint('profile_rest', __name__) diff --git a/source/app/blueprints/rest/search_routes.py b/source/app/blueprints/rest/search_routes.py index bc725ccc2..7da5e4410 100644 --- a/source/app/blueprints/rest/search_routes.py +++ b/source/app/blueprints/rest/search_routes.py @@ -30,7 +30,7 @@ from app.models.models import Notes from app.models.models import Tlp from app.blueprints.access_controls import ac_api_requires -from app.util import response_success +from app.blueprints.responses import response_success search_rest_blueprint = Blueprint('search_rest', __name__) diff --git a/source/app/util.py b/source/app/util.py index 334150bcc..b80370da3 100644 --- a/source/app/util.py +++ b/source/app/util.py @@ -53,15 +53,6 @@ def response(status, data=None): return app.response_class(response=data, status=status, mimetype='application/json') -def response_success(msg='', data=None): - content = { - "status": "success", - "message": msg, - "data": data if data is not None else [] - } - return response(200, data=content) - - def g_db_commit(): db.session.commit()