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

Add debug option

pull/3/head
Raphaël Vinot 2015-11-25 09:51:22 +01:00
parent 654f238e5c
commit a334055749
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pymisp/api.py
View File

@ -89,7 +89,7 @@ class PyMISP(object):
:param out_type: Type of object (json or xml) :param out_type: Type of object (json or xml)
""" """
def __init__(self, url, key, ssl=True, out_type='json'): def __init__(self, url, key, ssl=True, out_type='json', debug=False):
if not url: if not url:
raise NoURL('Please provide the URL of your MISP instance.') raise NoURL('Please provide the URL of your MISP instance.')
if not key: if not key:
@ -99,6 +99,7 @@ class PyMISP(object):
self.key = key self.key = key
self.ssl = ssl self.ssl = ssl
self.out_type = out_type self.out_type = out_type
self.debug = debug
self.categories = ['Internal reference', 'Targeting data', 'Antivirus detection', self.categories = ['Internal reference', 'Targeting data', 'Antivirus detection',
'Payload delivery', 'Payload installation', 'Artifacts dropped', 'Payload delivery', 'Payload installation', 'Artifacts dropped',
@ -144,10 +145,17 @@ class PyMISP(object):
def _check_response(self, response): def _check_response(self, response):
if response.status_code >= 500: if response.status_code >= 500:
response.raise_for_status() response.raise_for_status()
to_return = response.json() try:
to_return = response.json()
except:
if self.debug:
print(response.text)
raise PyMISPError('Unknown error: {}'.format(response.text))
if 400 <= response.status_code < 500: if 400 <= response.status_code < 500:
if to_return.get('error') is None: if to_return.get('error') is None:
to_return['error'] = to_return.get('message') to_return['error'] = to_return.get('message')
if self.debug:
print(json.dumps(to_return, indent=4))
return to_return return to_return
# ################################################ # ################################################

3
tests/test.py
View File

@ -7,11 +7,12 @@ import time
import unittest import unittest
class TestBasic(unittest.TestCase): class TestBasic(unittest.TestCase):
def setUp(self): def setUp(self):
self.maxDiff = None self.maxDiff = None
self.misp = PyMISP(url, key, True, 'json') self.misp = PyMISP(url, key, True, 'json', True)
def _clean_event(self, event): def _clean_event(self, event):
event['Event'].pop('uuid', None) event['Event'].pop('uuid', None)