Reverted DIE changes and upgraded to 0.4.0. Closes #2735 (#2794)

* Reverted DIE changes and upgraded to 0.4.0

* Removed conditional import

* Updated uWSGi dependency

Author: fgibertoni

api_app/analyzers_manager/file_analyzers/detectiteasy.py

@@ -1,12 +1,7 @@
 import json
 import logging
 
-from api_app.analyzers_manager.exceptions import AnalyzerRunException
-
-try:
-    import die
-except ImportError:
-    die = None
+import die
 
 from api_app.analyzers_manager.classes import FileAnalyzer
 from tests.mock_utils import MockUpResponse
@@ -22,20 +17,12 @@ def update(self):
     def run(self):
         logger.info(f"Running DIE on {self.filepath} for {self.md5}")
 
-        if die:
-            json_report = die.scan_file(
-                self.filepath,
-                die.ScanFlags.RESULT_AS_JSON,
-                str(die.database_path / "db"),
-            )
-            result = json.loads(json_report)
-        else:
-            message = "DIE package not imported because incompatible in ARM"
-            self.report.errors.append(message)
-            result = {"errors": message}
-            raise AnalyzerRunException(message)
-
-        return result
+        json_report = die.scan_file(
+            self.filepath,
+            die.ScanFlags.RESULT_AS_JSON,
+            str(die.database_path / "db"),
+        )
+        return json.loads(json_report)
 
     @staticmethod
     def mocked_docker_analyzer_get(*args, **kwargs):

docker/Dockerfile

@@ -48,7 +48,6 @@ RUN apt-get update \
     && pip3 install --no-cache-dir --upgrade pip
 
 COPY requirements/project-requirements.txt $PYTHONPATH/project-requirements.txt
-COPY requirements/amd-only-requirements.txt $PYTHONPATH/amd-only-requirements.txt
 COPY requirements/certego-requirements.txt $PYTHONPATH/certego-requirements.txt
 WORKDIR $PYTHONPATH
 
@@ -70,11 +69,6 @@ RUN touch ${LOG_PATH}/django/api_app.log ${LOG_PATH}/django/api_app_errors.log \
     # download github stuff
     && ${PYTHONPATH}/api_app/analyzers_manager/repo_downloader.sh
 
-# last step cause there is an if that could invalidate the cache
-RUN if [[ "$TARGETARCH" == "amd64" ]]; \
-    then pip3 install --no-cache-dir --compile -r amd-only-requirements.txt;  \
-    else echo "skipping installation of AMD only requirements"; fi
-
 FROM backend-build
 
 COPY --from=frontend-build /build /var/www/reactapp

requirements/amd-only-requirements.txt

@@ -29,7 +29,7 @@ dataclasses==0.6
 # https://github.com/advisories/GHSA-q4qm-xhf9-4p8f
 # unpatched CVE: noproblem, we just use this for debugging purposes
 flower==2.0.0
-uWSGI==2.0.22
+uWSGI==2.0.28
 uwsgitop==0.12
 whitenoise==6.9.0
 daphne==4.1.0
@@ -89,6 +89,7 @@ pylnk3==0.4.2
 androguard==3.4.0a1 # version >=4.x of androguard raises a dependency conflict with quark-engine==25.1.1
 wad==0.4.6
 debloat==1.6.4
+die-python==0.4.0
 
 # httpx required for HTTP/2 support (Mullvad DNS rejects HTTP/1.1 with protocol errors)
 httpx[http2]==0.28.1