Merge 98ce3f8 into 121d885

pymisp/api.py

@@ -236,15 +236,18 @@ def flatten_error_messages(self, response):
 
         return messages
 
-    def _check_response(self, response):
+    def _check_response(self, response, lenient_response_type=False):
         """Check if the response from the server is not an unexpected error"""
         try:
             json_response = response.json()
         except ValueError:
             # If the server didn't return a JSON blob, we've a problem.
             if not len(response.text):
                 raise PyMISPEmptyResponse('The server returned an empty response. \n{}\n{}\n'.format(response.request.headers, response.request.body))
-            raise PyMISPError(everything_broken.format(response.request.headers, response.request.body, response.text))
+            if lenient_response_type and not response.headers.get('content-type').startswith('application/json;'):
+                return response.text
+            else:
+                raise PyMISPError(everything_broken.format(response.request.headers, response.request.body, response.text))
 
         errors = []
 
@@ -445,7 +448,7 @@ def direct_call(self, url, data=None):
             if isinstance(data, dict):
                 data = json.dumps(data)
             response = self._prepare_request('POST', url, data)
-        return self._check_response(response)
+        return self._check_response(response, lenient_response_type=True)
 
     # ##############################################
     # ############### Event handling ###############

pymisp/aping.py

@@ -62,7 +62,7 @@ def make_timestamp(self, value: DateTypes):
         else:
             return value
 
-    def _check_response(self, response):
+    def _check_response(self, response, lenient_response_type=False):
         """Check if the response from the server is not an unexpected error"""
         if response.status_code >= 500:
             logger.critical(everything_broken.format(response.request.headers, response.request.body, response.text))
@@ -84,6 +84,8 @@ def _check_response(self, response):
                 response = response['response']
             return response
         except Exception:
+            if lenient_response_type and not response.headers.get('content-type').startswith('application/json;'):
+                    return response.text
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug(response.text)
             if not len(response.content):