MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #395 from MISP/lenientResponseType 

fix: [direct_call] Allows the response type to be something else than a JSON (e.g. csv)
pull/401/head
Raphaël Vinot 2019-05-22 16:27:18 +02:00 committed by GitHub
parent 121d8853e2 98ce3f803e
commit 6620710580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pymisp/api.py
View File

@ -236,7 +236,7 @@ class PyMISP(object):
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()
@ -244,7 +244,10 @@ class PyMISP(object):
# 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 @@ class PyMISP(object):
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 ###############

4
pymisp/aping.py
View File

@ -62,7 +62,7 @@ class ExpandedPyMISP(PyMISP):
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 @@ class ExpandedPyMISP(PyMISP):
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):