fix

Author: xunluHu

api_app/analyzers_manager/classes.py

@@ -278,6 +278,16 @@ class DockerBasedAnalyzer(BaseAnalyzerMixin, metaclass=ABCMeta):
     poll_distance: int
     key_not_found_max_retries: int = 10
 
+    @staticmethod
+    def __get_response_json(resp: requests.Response) -> dict:
+        try:
+            data = resp.json()
+        except ValueError:
+            return {}
+        if isinstance(data, dict):
+            return data
+        return {}
+
     @staticmethod
     def __raise_in_case_bad_request(name, resp, params_to_check=None) -> bool:
         """
@@ -289,14 +299,15 @@ def __raise_in_case_bad_request(name, resp, params_to_check=None) -> bool:
         # different error messages for different cases
         if resp.status_code == 404:
             raise AnalyzerConfigurationException(f"{name} docker container is not running.")
+        resp_json = DockerBasedAnalyzer.__get_response_json(resp)
         if resp.status_code == 400:
-            err = resp.json().get("error", "")
+            err = resp_json.get("error") or resp.text or "Bad Request"
             raise AnalyzerRunException(err)
         if resp.status_code == 500:
             raise AnalyzerRunException(f"Internal Server Error in {name} docker container")
         # check to make sure there was a valid params in response
         for param in params_to_check:
-            param_value = resp.json().get(param, None)
+            param_value = resp_json.get(param, None)
             if not param_value:
                 raise AnalyzerRunException(
                     f"Unexpected Error. Please check log files under /var/log/intel_owl/{name.lower()}/"
@@ -310,12 +321,12 @@ def __raise_in_case_bad_request(name, resp, params_to_check=None) -> bool:
     def __query_for_result(url: str, key: str) -> Tuple[int, dict]:
         headers = {"Accept": "application/json"}
         resp = requests.get(f"{url}?key={key}", headers=headers)
-        return resp.status_code, resp.json()
+        return resp.status_code, DockerBasedAnalyzer.__get_response_json(resp)
 
     def __polling(self, req_key: str, chance: int, re_poll_try: int = 0):
         try:
             status_code, json_data = self.__query_for_result(self.url, req_key)
-        except (requests.RequestException, json.JSONDecodeError) as e:
+        except (requests.RequestException, ValueError) as e:
             raise AnalyzerRunException(e)
         if status_code == 404:
             # This happens when they key does not exist.
@@ -398,17 +409,19 @@ def _docker_run(
         except requests.exceptions.ConnectionError:
             self._raise_container_not_running()
 
+        resp1_json = DockerBasedAnalyzer.__get_response_json(resp1)
+
         # step #2: raise AnalyzerRunException in case of error
         # Modified to support synchronous analyzers that return results directly in the initial response, avoiding unnecessary polling.
         if avoid_polling:
-            report = resp1.json().get("report", None)
-            err = resp1.json().get("error", None)
+            report = resp1_json.get("report", None)
+            err = resp1_json.get("error", None)
         else:
             if not self.__raise_in_case_bad_request(self.name, resp1):
                 raise AssertionError
 
             # step #3: if no error, continue and try to fetch result
-            key = resp1.json().get("key")
+            key = resp1_json.get("key")
             final_resp = self.__poll_for_result(key)
             err = final_resp.get("error", None)
             report = final_resp.get("report", None)

api_app/helpers.py

@@ -108,16 +108,16 @@ def get_default_requests_timeout() -> tuple[float, float]:
 def patch_requests_default_timeout() -> None:
     import requests
 
-    session_request = requests.sessions.Session.request
-    if getattr(session_request, "_intelowl_default_timeout_patched", False):
+    api_request = requests.api.request
+    if getattr(api_request, "_intelowl_default_timeout_patched", False):
         return
 
-    @wraps(session_request)
-    def request(self, method, url, **kwargs):
+    @wraps(api_request)
+    def wrapped(method, url, **kwargs):
         if "timeout" not in kwargs or kwargs["timeout"] is None:
             kwargs["timeout"] = get_default_requests_timeout()
-        return request._intelowl_original(self, method, url, **kwargs)
+        return wrapped._intelowl_original(method, url, **kwargs)
 
-    request._intelowl_default_timeout_patched = True
-    request._intelowl_original = session_request
-    requests.sessions.Session.request = request
+    wrapped._intelowl_default_timeout_patched = True
+    wrapped._intelowl_original = api_request
+    requests.api.request = wrapped

tests/api_app/analyzers_manager/unit_tests/test_docker_based_analyzer_http_errors.py

@@ -0,0 +1,21 @@
+# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl
+# See the file 'LICENSE' for copying permission.
+
+from django.test import SimpleTestCase
+from requests import Response
+
+from api_app.analyzers_manager.classes import DockerBasedAnalyzer
+from api_app.analyzers_manager.exceptions import AnalyzerRunException
+
+
+class DockerBasedAnalyzerHttpErrorsTests(SimpleTestCase):
+    def test_bad_request_with_non_json_body_raises_analyzer_run_exception(self):
+        resp = Response()
+        resp.status_code = 400
+        resp._content = b""
+
+        with self.assertRaises(AnalyzerRunException):
+            DockerBasedAnalyzer._DockerBasedAnalyzer__raise_in_case_bad_request(
+                "StringsInfo",
+                resp,
+            )

tests/api_app/test_requests_timeout.py

@@ -14,38 +14,38 @@ def setUp(self):
         patch_requests_default_timeout()
 
     def test_injects_default_timeout_when_missing(self):
-        session_request = requests.sessions.Session.request
-        original = session_request._intelowl_original
+        api_request = requests.api.request
+        original = api_request._intelowl_original
         captured = {}
 
-        def stub(self, method, url, **kwargs):
+        def stub(method, url, **kwargs):
             captured["timeout"] = kwargs.get("timeout")
             return "ok"
 
-        session_request._intelowl_original = stub
+        api_request._intelowl_original = stub
         try:
-            result = requests.Session().request("GET", "http://example.com")
+            result = requests.get("http://example.com")
             self.assertEqual(result, "ok")
             self.assertEqual(captured["timeout"], get_default_requests_timeout())
         finally:
-            session_request._intelowl_original = original
+            api_request._intelowl_original = original
 
     def test_keeps_explicit_timeout(self):
-        session_request = requests.sessions.Session.request
-        original = session_request._intelowl_original
+        api_request = requests.api.request
+        original = api_request._intelowl_original
         captured = {}
 
-        def stub(self, method, url, **kwargs):
+        def stub(method, url, **kwargs):
             captured["timeout"] = kwargs.get("timeout")
             return "ok"
 
-        session_request._intelowl_original = stub
+        api_request._intelowl_original = stub
         try:
-            result = requests.Session().request("GET", "http://example.com", timeout=5)
+            result = requests.get("http://example.com", timeout=5)
             self.assertEqual(result, "ok")
             self.assertEqual(captured["timeout"], 5)
         finally:
-            session_request._intelowl_original = original
+            api_request._intelowl_original = original
 
     def test_timeout_can_be_configured_via_env(self):
         old_connect = os.environ.get("INTELOWL_REQUESTS_CONNECT_TIMEOUT")
@@ -54,20 +54,20 @@ def test_timeout_can_be_configured_via_env(self):
         os.environ["INTELOWL_REQUESTS_READ_TIMEOUT"] = "2.5"
 
         try:
-            session_request = requests.sessions.Session.request
-            original = session_request._intelowl_original
+            api_request = requests.api.request
+            original = api_request._intelowl_original
             captured = {}
 
-            def stub(self, method, url, **kwargs):
+            def stub(method, url, **kwargs):
                 captured["timeout"] = kwargs.get("timeout")
                 return "ok"
 
-            session_request._intelowl_original = stub
+            api_request._intelowl_original = stub
             try:
-                requests.Session().request("GET", "http://example.com")
+                requests.get("http://example.com")
                 self.assertEqual(captured["timeout"], (1.5, 2.5))
             finally:
-                session_request._intelowl_original = original
+                api_request._intelowl_original = original
         finally:
             if old_connect is None:
                 os.environ.pop("INTELOWL_REQUESTS_CONNECT_TIMEOUT", None)