From 69f19a86168f8a9d154e9a85389d4e7b55c38182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 21 Sep 2015 14:40:06 +0200 Subject: [PATCH] Check the MISP instance to query is valid. And return a json object from upload_sample. --- pymisp/__init__.py | 2 +- pymisp/api.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pymisp/__init__.py b/pymisp/__init__.py index edac611..510e57e 100644 --- a/pymisp/__init__.py +++ b/pymisp/__init__.py @@ -1,3 +1,3 @@ -__version__ = '1.12' +__version__ = '2.0' from .api import PyMISP, PyMISPError, NewEventError, NewAttributeError, MissingDependency, NoURL, NoKey diff --git a/pymisp/api.py b/pymisp/api.py index 6326a3b..38647ba 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -110,6 +110,12 @@ class PyMISP(object): 'pattern-in-file', 'pattern-in-traffic', 'pattern-in-memory', 'named pipe', 'mutex', 'vulnerability', 'attachment', 'malware-sample', 'link', 'comment', 'text', 'other'] + try: + # Make sure the MISP instance is working and the URL is valid + self.get_version() + except Exception as e: + raise PyMISPError('Unable to connect to MISP ({}). Please make sure the API key and the URL are correct (http/https is required): {}'.format(self.root_url, e)) + def __prepare_session(self, force_out=None): """ Prepare the headers of the session @@ -459,7 +465,7 @@ class PyMISP(object): def _upload_sample(self, to_post): session = self.__prepare_session('json') url = urljoin(self.root_url, 'events/upload_sample') - return session.post(url, data=json.dumps(to_post)) + return session.post(url, data=json.dumps(to_post)).json() # ############################## # ######## REST Search #########