From 15e1e67b5377a90eb7c42c49797398d0236d3d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Stucke?= Date: Thu, 8 Jan 2026 17:24:13 +0100 Subject: [PATCH] fix: fixed multiple crossdependencies between frontend and backend --- src/install/requirements_common.txt | 1 + src/plugins/analysis/file_system_metadata/routes/routes.py | 7 +++---- src/plugins/analysis/ip_and_uri_finder/requirements.txt | 2 -- src/plugins/analysis/qemu_exec/routes/routes.py | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/install/requirements_common.txt b/src/install/requirements_common.txt index e0629b93f..406a045f3 100644 --- a/src/install/requirements_common.txt +++ b/src/install/requirements_common.txt @@ -2,6 +2,7 @@ testresources==2.0.1 # General python dependencies +aiohttp~=3.13.3 docker~=7.1.0 pytest-rerunfailures~=14.0 lief~=0.17.0 diff --git a/src/plugins/analysis/file_system_metadata/routes/routes.py b/src/plugins/analysis/file_system_metadata/routes/routes.py index 17d037b9f..701dc446e 100644 --- a/src/plugins/analysis/file_system_metadata/routes/routes.py +++ b/src/plugins/analysis/file_system_metadata/routes/routes.py @@ -14,13 +14,12 @@ from web_interface.security.decorator import roles_accepted from web_interface.security.privileges import PRIVILEGES -from ..code.file_system_metadata import AnalysisPlugin - if TYPE_CHECKING: from web_interface.frontend_database import FrontendDatabase VIEW_PATH = Path(__file__).absolute().parent / 'ajax_view.html' +PLUGIN_NAME = 'file_system_metadata' class ParentAnalysisLookupMixin: @@ -31,7 +30,7 @@ def get_analysis_results_for_included_uid(self, uid: str) -> list: with get_shared_session(self.db.frontend) as db: vfp = db.get_vfps(uid) for parent_uid in vfp: - parent_analysis = db.get_analysis(parent_uid, AnalysisPlugin.NAME) or {} + parent_analysis = db.get_analysis(parent_uid, PLUGIN_NAME) or {} results.append(_get_results_from_parent_fo(parent_analysis.get('result', {}), parent_uid, vfp)) return results @@ -83,4 +82,4 @@ def get(self, uid: str): endpoint = self.ENDPOINTS[0][0] if not results: error_message(f'no results found for uid {uid}', endpoint, request_data={'uid': uid}) - return success_message({AnalysisPlugin.NAME: results}, endpoint, request_data={'uid': uid}) + return success_message({PLUGIN_NAME: results}, endpoint, request_data={'uid': uid}) diff --git a/src/plugins/analysis/ip_and_uri_finder/requirements.txt b/src/plugins/analysis/ip_and_uri_finder/requirements.txt index 3e1369345..43568657a 100644 --- a/src/plugins/analysis/ip_and_uri_finder/requirements.txt +++ b/src/plugins/analysis/ip_and_uri_finder/requirements.txt @@ -1,4 +1,2 @@ git+https://github.com/fkie-cad/common_analysis_ip_and_uri.git geoip2==4.7.0 -# dependency of geoip2 for python >= 3.12 -aiohttp~=3.13.3 diff --git a/src/plugins/analysis/qemu_exec/routes/routes.py b/src/plugins/analysis/qemu_exec/routes/routes.py index 5f42f8d49..7cf860fbe 100644 --- a/src/plugins/analysis/qemu_exec/routes/routes.py +++ b/src/plugins/analysis/qemu_exec/routes/routes.py @@ -11,8 +11,7 @@ from web_interface.security.decorator import roles_accepted from web_interface.security.privileges import PRIVILEGES -from ..code.qemu_exec import PLUGIN_NAME - +PLUGIN_NAME = 'qemu_exec' VIEW_PATH = Path(__file__).absolute().parent / 'ajax_view.html'