From 134df0cafb8897da8798fb16e58ff4732c245f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 7 Nov 2017 18:10:04 -0800
Subject: [PATCH 1/7] chg: Properly use python logging module.

---
 pymisp/__init__.py                 | 10 +++++--
 pymisp/abstract.py                 |  6 +++--
 pymisp/api.py                      | 42 ++++++++++++++----------------
 pymisp/data/misp-objects           |  2 +-
 pymisp/mispevent.py                |  5 ++--
 pymisp/tools/create_misp_object.py | 16 +++++++-----
 pymisp/tools/elfobject.py          |  5 ++--
 pymisp/tools/fileobject.py         |  9 ++++---
 pymisp/tools/machoobject.py        |  6 +++--
 pymisp/tools/peobject.py           |  5 ++--
 10 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/pymisp/__init__.py b/pymisp/__init__.py
index 55d2a19..3edf8b1 100644
--- a/pymisp/__init__.py
+++ b/pymisp/__init__.py
@@ -1,4 +1,9 @@
 __version__ = '2.4.81.2'
+import sys
+import logging
+logger = logging.getLogger(__name__)
+FORMAT = "[%(filename)s:%(lineno)s - %(funcName)s() ] %(message)s"
+logging.basicConfig(stream=sys.stderr, level=logging.WARNING, format=FORMAT)
 
 try:
     from .exceptions import PyMISPError, NewEventError, NewAttributeError, MissingDependency, NoURL, NoKey, InvalidMISPObject, UnknownMISPObjectTemplate  # noqa
@@ -9,5 +14,6 @@ try:
     from .tools import Neo4j  # noqa
     from .tools import stix  # noqa
     from .tools import openioc  # noqa
-except ImportError:
-    pass
+    logger.debug('pymisp loaded properly')
+except ImportError as e:
+    logger.warning('Unable to load pymisp properly: {}'.format(e))
diff --git a/pymisp/abstract.py b/pymisp/abstract.py
index a57795d..2a5d697 100644
--- a/pymisp/abstract.py
+++ b/pymisp/abstract.py
@@ -6,10 +6,12 @@ import json
 from json import JSONEncoder
 import collections
 import six  # Remove that import when discarding python2 support.
+import logging
+
+logger = logging.getLogger('pymisp')
 
 if six.PY2:
-    import warnings
-    warnings.warn("You're using python 2, it is strongly recommended to use python >=3.5")
+    logger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
 
 
 class MISPEncode(JSONEncoder):
diff --git a/pymisp/api.py b/pymisp/api.py
index bbbfe84..3ec4ed3 100644
--- a/pymisp/api.py
+++ b/pymisp/api.py
@@ -9,16 +9,19 @@ import datetime
 import os
 import base64
 import re
-import warnings
 import functools
 import logging
 
+logger = logging.getLogger('pymisp')
 
 try:
     from urllib.parse import urljoin
+    # Least dirty way to support python 2 and 3
+    basestring = str
+    unicode = str
 except ImportError:
     from urlparse import urljoin
-    warnings.warn("You're using python 2, it is strongly recommended to use python >=3.5")
+    loger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
 from io import BytesIO, open
 import zipfile
 
@@ -40,19 +43,6 @@ from .exceptions import PyMISPError, SearchError, MissingDependency, NoURL, NoKe
 from .mispevent import MISPEvent, MISPAttribute
 from .abstract import MISPEncode
 
-logger = logging.getLogger(__name__)
-
-
-# Least dirty way to support python 2 and 3
-try:
-    basestring
-    unicode
-    warnings.warn("You're using python 2, it is strongly recommended to use python >=3.4")
-except NameError:
-    basestring = str
-    unicode = str
-
-
 def deprecated(func):
     '''This is a decorator which can be used to mark functions
     as deprecated. It will result in a warning being emitted
@@ -99,14 +89,14 @@ class PyMISP(object):
         self.cert = cert
         self.asynch = asynch
         if asynch and not ASYNC_OK:
-            warnings.warn("You turned on Async, but don't have requests_futures installed")
+            logger.warning("You turned on Async, but don't have requests_futures installed")
             self.asynch = False
 
         self.resources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
         if out_type != 'json':
             raise PyMISPError('The only output type supported by PyMISP is JSON. If you still rely on XML, use PyMISP v2.4.49')
         if debug is not None:
-            warnings.warn('debug is deprecated, configure logging in api client')
+            logger.warning('debug is deprecated, configure logging in your script: import logging; logging.getLogger(\'pymisp\').setLevel(logging.DEBUG)')
 
         try:
             # Make sure the MISP instance is working and the URL is valid
@@ -163,6 +153,8 @@ class PyMISP(object):
              'Accept': 'application/{}'.format(output),
              'content-type': 'application/{}'.format(output),
              'User-Agent': 'PyMISP {} - Python {}.{}.{}'.format(__version__, *sys.version_info)})
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug(session.headers)
         return session
 
     # #####################
@@ -209,15 +201,16 @@ class PyMISP(object):
 
     def _check_response(self, response):
         """Check if the response from the server is not an unexpected error"""
+        errors = []
         if response.status_code >= 500:
-            response.raise_for_status()
+            errors.append(response.json())
+            logger.critical('Something bad happened on the server-side: {}'.format(response.json()))
         try:
             to_return = response.json()
         except ValueError:
-            logger.debug(response.text)
-            raise PyMISPError('Unknown error: {}'.format(response.text))
+            # It the server didn't return a JSON blob, we've a problem.
+            raise PyMISPError('Unknown error (something is very broken server-side: {}'.format(response.text))
 
-        errors = []
         if isinstance(to_return, (list, str)):
             to_return = {'response': to_return}
         if to_return.get('error'):
@@ -905,8 +898,9 @@ class PyMISP(object):
         if controller not in ['events', 'attributes']:
             raise Exception('Invalid controller. Can only be {}'.format(', '.join(['events', 'attributes'])))
         url = urljoin(self.root_url, '{}/{}'.format(controller, path.lstrip('/')))
-        logger.debug('URL: %s', url)
-        logger.debug('Query: %s', query)
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug('URL: %s', url)
+            logger.debug('Query: %s', query)
 
         if ASYNC_OK and isinstance(session, FuturesSession) and async_callback:
             response = session.post(url, data=json.dumps(query), background_callback=async_callback)
@@ -1699,6 +1693,8 @@ class PyMISP(object):
         """Add an object"""
         session = self.__prepare_session()
         url = urljoin(self.root_url, 'objects/add/{}/{}'.format(event_id, template_id))
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug(url)
         response = session.post(url, data=misp_object.to_json())
         return self._check_response(response)
 
diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects
index bbf3e45..6b43b68 160000
--- a/pymisp/data/misp-objects
+++ b/pymisp/data/misp-objects
@@ -1 +1 @@
-Subproject commit bbf3e45649af5af50c98ad90a86916cf75e8c74d
+Subproject commit 6b43b68651a350a26891080ef0feda364b74727a
diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py
index 20eeb49..fc435fa 100644
--- a/pymisp/mispevent.py
+++ b/pymisp/mispevent.py
@@ -16,12 +16,13 @@ from collections import Counter
 from .abstract import AbstractMISP
 from .exceptions import UnknownMISPObjectTemplate, InvalidMISPObject, PyMISPError, NewEventError, NewAttributeError
 
+import logging
+logger = logging.getLogger('pymisp')
 
 import six  # Remove that import when discarding python2 support.
 
 if six.PY2:
-    import warnings
-    warnings.warn("You're using python 2, it is strongly recommended to use python >=3.5")
+    logger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
 
 try:
     from dateutil.parser import parse
diff --git a/pymisp/tools/create_misp_object.py b/pymisp/tools/create_misp_object.py
index be16ae3..faa1258 100644
--- a/pymisp/tools/create_misp_object.py
+++ b/pymisp/tools/create_misp_object.py
@@ -3,7 +3,9 @@
 
 from . import FileObject, PEObject, ELFObject, MachOObject
 from ..exceptions import MISPObjectException
-import warnings
+import logging
+
+logger = logging.getLogger('pymisp')
 
 try:
     import lief
@@ -57,15 +59,15 @@ def make_binary_objects(filepath=None, pseudofile=None, filename=None):
             elif isinstance(lief_parsed, lief.MachO.Binary):
                 return make_macho_objects(lief_parsed, misp_file)
         except lief.bad_format as e:
-            warnings.warn('\tBad format: {}'.format(e))
+            logger.warning('Bad format: {}'.format(e))
         except lief.bad_file as e:
-            warnings.warn('\tBad file: {}'.format(e))
+            logger.warning('Bad file: {}'.format(e))
         except lief.parser_error as e:
-            warnings.warn('\tParser error: {}'.format(e))
+            logger.warning('Parser error: {}'.format(e))
         except FileTypeNotImplemented as e:  # noqa
-            warnings.warn(e)
+            logger.warning(e)
     if not HAS_LIEF:
-        warnings.warn('Please install lief, documentation here: https://github.com/lief-project/LIEF')
+        logger.warning('Please install lief, documentation here: https://github.com/lief-project/LIEF')
     if not filepath:
-        warnings.warn('LIEF currently requires a filepath and not a pseudo file')
+        logger.warning('LIEF currently requires a filepath and not a pseudo file')
     return misp_file, None, None
diff --git a/pymisp/tools/elfobject.py b/pymisp/tools/elfobject.py
index ee3bd29..d9c9561 100644
--- a/pymisp/tools/elfobject.py
+++ b/pymisp/tools/elfobject.py
@@ -5,8 +5,9 @@ from .abstractgenerator import AbstractMISPObjectGenerator
 from ..exceptions import InvalidMISPObject
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
-import warnings
+import logging
 
+logger = logging.getLogger('pymisp')
 
 try:
     import lief
@@ -25,7 +26,7 @@ class ELFObject(AbstractMISPObjectGenerator):
 
     def __init__(self, parsed=None, filepath=None, pseudofile=None):
         if not HAS_PYDEEP:
-            warnings.warn("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
+            logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
         if not HAS_LIEF:
             raise ImportError('Please install lief, documentation here: https://github.com/lief-project/LIEF')
         if pseudofile:
diff --git a/pymisp/tools/fileobject.py b/pymisp/tools/fileobject.py
index e75884c..a12d38f 100644
--- a/pymisp/tools/fileobject.py
+++ b/pymisp/tools/fileobject.py
@@ -8,7 +8,10 @@ from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
 import math
 from collections import Counter
-import warnings
+import logging
+
+logger = logging.getLogger('pymisp')
+
 
 try:
     import pydeep
@@ -27,9 +30,9 @@ class FileObject(AbstractMISPObjectGenerator):
 
     def __init__(self, filepath=None, pseudofile=None, filename=None):
         if not HAS_PYDEEP:
-            warnings.warn("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
+            logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
         if not HAS_MAGIC:
-            warnings.warn("Please install python-magic: pip install python-magic.")
+            logger.warning("Please install python-magic: pip install python-magic.")
         if filename:
             # Useful in case the file is copied with a pre-defined name by a script but we want to keep the original name
             self.__filename = filename
diff --git a/pymisp/tools/machoobject.py b/pymisp/tools/machoobject.py
index 15663c9..6cf3fa2 100644
--- a/pymisp/tools/machoobject.py
+++ b/pymisp/tools/machoobject.py
@@ -5,7 +5,9 @@ from ..exceptions import InvalidMISPObject
 from .abstractgenerator import AbstractMISPObjectGenerator
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
-import warnings
+import logging
+
+logger = logging.getLogger('pymisp')
 
 
 try:
@@ -25,7 +27,7 @@ class MachOObject(AbstractMISPObjectGenerator):
 
     def __init__(self, parsed=None, filepath=None, pseudofile=None):
         if not HAS_PYDEEP:
-            warnings.warn("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
+            logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
         if not HAS_LIEF:
             raise ImportError('Please install lief, documentation here: https://github.com/lief-project/LIEF')
         if pseudofile:
diff --git a/pymisp/tools/peobject.py b/pymisp/tools/peobject.py
index 3467243..2e8bf4a 100644
--- a/pymisp/tools/peobject.py
+++ b/pymisp/tools/peobject.py
@@ -6,8 +6,9 @@ from .abstractgenerator import AbstractMISPObjectGenerator
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
 from datetime import datetime
-import warnings
+import logging
 
+logger = logging.getLogger('pymisp')
 
 try:
     import lief
@@ -26,7 +27,7 @@ class PEObject(AbstractMISPObjectGenerator):
 
     def __init__(self, parsed=None, filepath=None, pseudofile=None):
         if not HAS_PYDEEP:
-            warnings.warn("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
+            logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git")
         if not HAS_LIEF:
             raise ImportError('Please install lief, documentation here: https://github.com/lief-project/LIEF')
         if pseudofile:

From f1a88f460e50ed8eca67b1b04ece7448f4c47705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 7 Nov 2017 18:19:57 -0800
Subject: [PATCH 2/7] fix: Typo loger -> logger

---
 pymisp/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymisp/api.py b/pymisp/api.py
index 3ec4ed3..a7e993f 100644
--- a/pymisp/api.py
+++ b/pymisp/api.py
@@ -21,7 +21,7 @@ try:
     unicode = str
 except ImportError:
     from urlparse import urljoin
-    loger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
+    logger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
 from io import BytesIO, open
 import zipfile
 

From 4512a4eaca040017facb133b78f84e80e265525d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 7 Nov 2017 19:10:54 -0800
Subject: [PATCH 3/7] chg: small improvments in the logging system

---
 pymisp/__init__.py | 2 +-
 pymisp/api.py      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pymisp/__init__.py b/pymisp/__init__.py
index 3edf8b1..ed4316b 100644
--- a/pymisp/__init__.py
+++ b/pymisp/__init__.py
@@ -2,7 +2,7 @@ __version__ = '2.4.81.2'
 import sys
 import logging
 logger = logging.getLogger(__name__)
-FORMAT = "[%(filename)s:%(lineno)s - %(funcName)s() ] %(message)s"
+FORMAT = "%(levelname)s [%(filename)s:%(lineno)s - %(funcName)s() ] %(message)s"
 logging.basicConfig(stream=sys.stderr, level=logging.WARNING, format=FORMAT)
 
 try:
diff --git a/pymisp/api.py b/pymisp/api.py
index a7e993f..0908936 100644
--- a/pymisp/api.py
+++ b/pymisp/api.py
@@ -95,8 +95,9 @@ class PyMISP(object):
         self.resources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
         if out_type != 'json':
             raise PyMISPError('The only output type supported by PyMISP is JSON. If you still rely on XML, use PyMISP v2.4.49')
-        if debug is not None:
-            logger.warning('debug is deprecated, configure logging in your script: import logging; logging.getLogger(\'pymisp\').setLevel(logging.DEBUG)')
+        if debug:
+            logger.setLevel(logging.DEBUG)
+            logger.info('To configure logging in your script, leave it to None and use the following: import logging; logging.getLogger(\'pymisp\').setLevel(logging.DEBUG)')
 
         try:
             # Make sure the MISP instance is working and the URL is valid

From f54a029e2a88566ee63011921a32d2d87bccca5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 8 Nov 2017 17:33:55 -0800
Subject: [PATCH 4/7] new: Proper debug system

Make it easy to investigate the json blobs sent to the server.
---
 pymisp/abstract.py   |   2 +-
 pymisp/api.py        | 339 +++++++++++++++++--------------------------
 pymisp/exceptions.py |   1 +
 pymisp/mispevent.py  |  11 +-
 4 files changed, 141 insertions(+), 212 deletions(-)

diff --git a/pymisp/abstract.py b/pymisp/abstract.py
index 2a5d697..151a3bd 100644
--- a/pymisp/abstract.py
+++ b/pymisp/abstract.py
@@ -64,7 +64,7 @@ class AbstractMISP(collections.MutableMapping):
         return self.to_dict()
 
     def to_json(self):
-        return json.dumps(self.to_dict(), cls=MISPEncode)
+        return json.dumps(self, cls=MISPEncode)
 
     def __getitem__(self, key):
         return getattr(self, key)
diff --git a/pymisp/api.py b/pymisp/api.py
index 0908936..839fe73 100644
--- a/pymisp/api.py
+++ b/pymisp/api.py
@@ -11,6 +11,14 @@ import base64
 import re
 import functools
 import logging
+import warnings
+from io import BytesIO, open
+import zipfile
+
+from . import __version__
+from .exceptions import PyMISPError, SearchError, NoURL, NoKey
+from .mispevent import MISPEvent, MISPAttribute
+from .abstract import MISPEncode
 
 logger = logging.getLogger('pymisp')
 
@@ -22,8 +30,6 @@ try:
 except ImportError:
     from urlparse import urljoin
     logger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
-from io import BytesIO, open
-import zipfile
 
 try:
     import requests
@@ -38,10 +44,6 @@ try:
 except ImportError:
     ASYNC_OK = False
 
-from . import __version__
-from .exceptions import PyMISPError, SearchError, MissingDependency, NoURL, NoKey
-from .mispevent import MISPEvent, MISPAttribute
-from .abstract import MISPEncode
 
 def deprecated(func):
     '''This is a decorator which can be used to mark functions
@@ -89,7 +91,7 @@ class PyMISP(object):
         self.cert = cert
         self.asynch = asynch
         if asynch and not ASYNC_OK:
-            logger.warning("You turned on Async, but don't have requests_futures installed")
+            logger.critical("You turned on Async, but don't have requests_futures installed")
             self.asynch = False
 
         self.resources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
@@ -118,8 +120,7 @@ class PyMISP(object):
             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))
 
         try:
-            session = self.__prepare_session()
-            response = session.get(urljoin(self.root_url, 'attributes/describeTypes.json'))
+            response = self.__prepare_request('GET', urljoin(self.root_url, 'attributes/describeTypes.json'))
             describe_types = self._check_response(response)
             if describe_types.get('error'):
                 for e in describe_types.get('error'):
@@ -137,26 +138,32 @@ class PyMISP(object):
         self.category_type_mapping = self.describe_types['category_type_mappings']
         self.sane_default = self.describe_types['sane_defaults']
 
-    def __prepare_session(self, output='json', async_implemented=False):
-        """Prepare the session headers"""
-
-        if not HAVE_REQUESTS:
-            raise MissingDependency('Missing dependency, install requests (`pip install requests`)')
-        if self.asynch and async_implemented:
-            session = FuturesSession()
+    def __prepare_request(self, request_type, url, data=None,
+                          background_callback=None, output_type='json'):
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug('{} - {}'.format(request_type, url))
+            if data is not None:
+                logger.debug(data)
+        if data is None:
+            req = requests.Request(request_type, url)
         else:
-            session = requests.Session()
-        session.verify = self.ssl
-        session.proxies = self.proxies
-        session.cert = self.cert
-        session.headers.update(
+            req = requests.Request(request_type, url, data=data)
+        if self.asynch and background_callback is not None:
+            s = FuturesSession()
+        else:
+            s = requests.Session()
+        prepped = s.prepare_request(req)
+        prepped.headers.update(
             {'Authorization': self.key,
-             'Accept': 'application/{}'.format(output),
-             'content-type': 'application/{}'.format(output),
+             'Accept': 'application/{}'.format(output_type),
+             'content-type': 'application/{}'.format(output_type),
              'User-Agent': 'PyMISP {} - Python {}.{}.{}'.format(__version__, *sys.version_info)})
         if logger.isEnabledFor(logging.DEBUG):
-            logger.debug(session.headers)
-        return session
+            logger.debug(prepped.headers)
+        if self.asynch and background_callback is not None:
+            return s.send(prepped, verify=self.ssl, proxies=self.proxies, cert=self.cert, background_callback=background_callback)
+        else:
+            return s.send(prepped, verify=self.ssl, proxies=self.proxies, cert=self.cert)
 
     # #####################
     # ### Core helpers ####
@@ -294,13 +301,11 @@ class PyMISP(object):
 
         Warning, there's a limit on the number of results
         """
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events/index')
-        if filters is not None:
-            filters = json.dumps(filters)
-            response = session.post(url, data=filters)
+        if filters is None:
+            response = self.__prepare_request('GET', url)
         else:
-            response = session.get(url)
+            response = self.__prepare_request('POST', url, json.dumps(filters))
         return self._check_response(response)
 
     def get_event(self, event_id):
@@ -308,9 +313,8 @@ class PyMISP(object):
 
         :param event_id: Event id to get
         """
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events/{}'.format(event_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def add_event(self, event):
@@ -318,14 +322,12 @@ class PyMISP(object):
 
         :param event: Event as JSON object / string to add
         """
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events')
         if isinstance(event, MISPEvent):
-            event = json.dumps(event, cls=MISPEncode)
-        if isinstance(event, basestring):
-            response = session.post(url, data=event)
-        else:
-            response = session.post(url, data=json.dumps(event))
+            event = event.to_json()
+        elif not isinstance(event, basestring):
+            event = json.dumps(event)
+        response = self.__prepare_request('POST', url, event)
         return self._check_response(response)
 
     def update_event(self, event_id, event):
@@ -334,14 +336,12 @@ class PyMISP(object):
         :param event_id: Event id to update
         :param event: Event as JSON object / string to add
         """
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events/{}'.format(event_id))
         if isinstance(event, MISPEvent):
-            event = json.dumps(event, cls=MISPEncode)
-        if isinstance(event, basestring):
-            response = session.post(url, data=event)
-        else:
-            response = session.post(url, data=json.dumps(event))
+            event = event.to_json()
+        elif not isinstance(event, basestring):
+            event = json.dumps(event)
+        response = self.__prepare_request('POST', url, event)
         return self._check_response(response)
 
     def delete_event(self, event_id):
@@ -349,26 +349,23 @@ class PyMISP(object):
 
         :param event_id: Event id to delete
         """
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events/{}'.format(event_id))
-        response = session.delete(url)
+        response = self.__prepare_request('DELETE', url)
         return self._check_response(response)
 
     def delete_attribute(self, attribute_id, hard_delete=False):
         """Delete an attribute by ID"""
-        session = self.__prepare_session()
         if hard_delete:
             url = urljoin(self.root_url, 'attributes/delete/{}/1'.format(attribute_id))
         else:
             url = urljoin(self.root_url, 'attributes/delete/{}'.format(attribute_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def pushEventToZMQ(self, event_id):
         """Force push an event on ZMQ"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'events/pushEventToZMQ/{}.json'.format(event_id))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     # ##############################################
@@ -401,12 +398,11 @@ class PyMISP(object):
         event_id = full_event.id
         if full_event.published:
             return {'error': 'Already published'}
-        session = self.__prepare_session()
         if not alert:
             url = urljoin(self.root_url, 'events/publish/{}'.format(event_id))
         else:
             url = urljoin(self.root_url, 'events/alert/{}'.format(event_id))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     def change_threat_level(self, event, threat_level_id):
@@ -431,20 +427,18 @@ class PyMISP(object):
         """Tag an event or an attribute"""
         if not self._valid_uuid(uuid):
             raise PyMISPError('Invalid UUID')
-        session = self.__prepare_session()
+        url = urljoin(self.root_url, 'tags/attachTagToObject')
         to_post = {'uuid': uuid, 'tag': tag}
-        path = 'tags/attachTagToObject'
-        response = session.post(urljoin(self.root_url, path), data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
 
     def untag(self, uuid, tag):
         """Untag an event or an attribute"""
         if not self._valid_uuid(uuid):
             raise PyMISPError('Invalid UUID')
-        session = self.__prepare_session()
+        url = urljoin(self.root_url, 'tags/removeTagFromObject')
         to_post = {'uuid': uuid, 'tag': tag}
-        path = 'tags/removeTagFromObject'
-        response = session.post(urljoin(self.root_url, path), data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
 
     # ##### File attributes #####
@@ -474,9 +468,8 @@ class PyMISP(object):
             if proposal:
                 response = self.proposal_add(eventID_to_update, a)
             else:
-                session = self.__prepare_session()
                 url = urljoin(self.root_url, 'attributes/add/{}'.format(eventID_to_update))
-                response = self._check_response(session.post(url, data=json.dumps(a, cls=MISPEncode)))
+                response = self.__prepare_request('POST', url, a.to_json())
         return response
 
     def add_named_attribute(self, event, type_value, value, category=None, to_ids=False, comment=None, distribution=None, proposal=False, **kwargs):
@@ -803,61 +796,54 @@ class PyMISP(object):
 
     def _upload_sample(self, to_post, event_id=None):
         """Helper to upload a sample"""
-        session = self.__prepare_session()
         if event_id is None:
             url = urljoin(self.root_url, 'events/upload_sample')
         else:
             url = urljoin(self.root_url, 'events/upload_sample/{}'.format(event_id))
-        logger.info(to_post)
-        response = session.post(url, data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
 
     # ############################
     # ######## Proposals #########
     # ############################
 
-    def __query_proposal(self, session, path, id, attribute=None):
+    def __query_proposal(self, path, id, attribute=None):
         """Helper to prepare a query to handle proposals"""
         url = urljoin(self.root_url, 'shadow_attributes/{}/{}'.format(path, id))
         if path in ['add', 'edit']:
             query = {'request': {'ShadowAttribute': attribute}}
-            response = session.post(url, data=json.dumps(query, cls=MISPEncode))
+            response = self.__prepare_request('POST', url, json.dumps(query, cls=MISPEncode))
         elif path == 'view':
-            response = session.get(url)
+            response = self.__prepare_request('GET', url)
         else:  # accept or discard
-            response = session.post(url)
+            response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     def proposal_view(self, event_id=None, proposal_id=None):
         """View a proposal"""
-        session = self.__prepare_session()
         if proposal_id is not None and event_id is not None:
             return {'error': 'You can only view an event ID or a proposal ID'}
         if event_id is not None:
             id = event_id
         else:
             id = proposal_id
-        return self.__query_proposal(session, 'view', id)
+        return self.__query_proposal('view', id)
 
     def proposal_add(self, event_id, attribute):
         """Add a proposal"""
-        session = self.__prepare_session()
-        return self.__query_proposal(session, 'add', event_id, attribute)
+        return self.__query_proposal('add', event_id, attribute)
 
     def proposal_edit(self, attribute_id, attribute):
         """Edit a proposal"""
-        session = self.__prepare_session()
-        return self.__query_proposal(session, 'edit', attribute_id, attribute)
+        return self.__query_proposal('edit', attribute_id, attribute)
 
     def proposal_accept(self, proposal_id):
         """Accept a proposal"""
-        session = self.__prepare_session()
-        return self.__query_proposal(session, 'accept', proposal_id)
+        return self.__query_proposal('accept', proposal_id)
 
     def proposal_discard(self, proposal_id):
         """Discard a proposal"""
-        session = self.__prepare_session()
-        return self.__query_proposal(session, 'discard', proposal_id)
+        return self.__query_proposal('discard', proposal_id)
 
     # ##############################
     # ###### Attribute update ######
@@ -868,8 +854,7 @@ class PyMISP(object):
         if to_ids not in [0, 1]:
             raise Exception('to_ids can only be 0 or 1')
         query = {"to_ids": to_ids}
-        session = self.__prepare_session()
-        return self.__query(session, 'edit/{}'.format(attribute_uuid), query, controller='attributes')
+        return self.__query('edit/{}'.format(attribute_uuid), query, controller='attributes')
 
     # ##############################
     # ###### Attribute update ######
@@ -885,28 +870,24 @@ class PyMISP(object):
             query['adhereToWarninglists'] = adhereToWarninglists
         if distribution is not None:
             query['distribution'] = distribution
-        session = self.__prepare_session()
-        return self.__query(session, 'freeTextImport/{}'.format(event_id), query, controller='events')
+        return self.__query('freeTextImport/{}'.format(event_id), query, controller='events')
 
     # ##############################
     # ######## REST Search #########
     # ##############################
 
-    def __query(self, session, path, query, controller='events', async_callback=None):
+    def __query(self, path, query, controller='events', async_callback=None):
         """Helper to prepare a search query"""
         if query.get('error') is not None:
             return query
         if controller not in ['events', 'attributes']:
             raise Exception('Invalid controller. Can only be {}'.format(', '.join(['events', 'attributes'])))
         url = urljoin(self.root_url, '{}/{}'.format(controller, path.lstrip('/')))
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug('URL: %s', url)
-            logger.debug('Query: %s', query)
 
-        if ASYNC_OK and isinstance(session, FuturesSession) and async_callback:
-            response = session.post(url, data=json.dumps(query), background_callback=async_callback)
+        if ASYNC_OK and async_callback:
+            response = self.__prepare_request('POST', url, json.dumps(query), async_callback)
         else:
-            response = session.post(url, data=json.dumps(query))
+            response = self.__prepare_request('POST', url, json.dumps(query))
             return self._check_response(response)
 
     def search_index(self, published=None, eventid=None, tag=None, datefrom=None,
@@ -952,13 +933,12 @@ class PyMISP(object):
                 if not set(param).issubset(rule_levels[rule]):
                     raise SearchError('Values in your {} are invalid, has to be in {}'.format(rule, ', '.join(str(x) for x in rule_levels[rule])))
             to_post[rule] = '|'.join(str(x) for x in param)
-        session = self.__prepare_session(async_implemented=(async_callback is not None))
         url = urljoin(self.root_url, buildup_url)
 
         if self.asynch and async_callback:
-            response = session.post(url, data=json.dumps(to_post), background_callback=async_callback)
+            response = self.__prepare_request('POST', url, json.dumps(to_post), async_callback)
         else:
-            response = session.post(url, data=json.dumps(to_post))
+            response = self.__prepare_request('POST', url, json.dumps(to_post))
             res = self._check_response(response)
             if normalize:
                 to_return = {'response': []}
@@ -971,8 +951,7 @@ class PyMISP(object):
     def search_all(self, value):
         """Search a value in the whole database"""
         query = {'value': value, 'searchall': 1}
-        session = self.__prepare_session()
-        return self.__query(session, 'restSearch/download', query)
+        return self.__query('restSearch/download', query)
 
     def __prepare_rest_search(self, values, not_values):
         """Prepare a search, generate the chain processed by the server
@@ -1082,8 +1061,7 @@ class PyMISP(object):
             raise SearchError('Unused parameter: {}'.format(', '.join(kwargs.keys())))
 
         # Create a session, make it async if and only if we have a callback
-        session = self.__prepare_session(async_implemented=(async_callback is not None))
-        return self.__query(session, 'restSearch/download', query, controller, async_callback)
+        return self.__query('restSearch/download', query, controller, async_callback)
 
     def get_attachment(self, attribute_id):
         """Get an attachement (not a malware sample) by attribute ID.
@@ -1091,9 +1069,8 @@ class PyMISP(object):
 
         :param attribute_id: Attribute ID to fetched
         """
-        attach = urljoin(self.root_url, 'attributes/downloadAttachment/download/{}'.format(attribute_id))
-        session = self.__prepare_session()
-        response = session.get(attach)
+        url = urljoin(self.root_url, 'attributes/downloadAttachment/download/{}'.format(attribute_id))
+        response = self.__prepare_request('GET', url)
         try:
             response.json()
             # The query fails, response contains a json blob
@@ -1104,9 +1081,9 @@ class PyMISP(object):
 
     def get_yara(self, event_id):
         """Get the yara rules from an event"""
+        url = urljoin(self.root_url, 'attributes/restSearch')
         to_post = {'request': {'eventid': event_id, 'type': 'yara'}}
-        session = self.__prepare_session()
-        response = session.post(urljoin(self.root_url, 'attributes/restSearch'), data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, data=json.dumps(to_post))
         result = self._check_response(response)
         if result.get('error') is not None:
             return False, result.get('error')
@@ -1117,9 +1094,9 @@ class PyMISP(object):
 
     def download_samples(self, sample_hash=None, event_id=None, all_samples=False):
         """Download samples, by hash or event ID. If there are multiple samples in one event, use the all_samples switch"""
+        url = urljoin(self.root_url, 'attributes/downloadSample')
         to_post = {'request': {'hash': sample_hash, 'eventID': event_id, 'allSamples': all_samples}}
-        session = self.__prepare_session()
-        response = session.post(urljoin(self.root_url, 'attributes/downloadSample'), data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, data=json.dumps(to_post))
         result = self._check_response(response)
         if result.get('error') is not None:
             return False, result.get('error')
@@ -1155,9 +1132,8 @@ class PyMISP(object):
 
     def get_all_tags(self, quiet=False):
         """Get all the tags used on the instance"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'tags')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         r = self._check_response(response)
         if not quiet or r.get('errors'):
             return r
@@ -1170,9 +1146,8 @@ class PyMISP(object):
     def new_tag(self, name=None, colour="#00ace6", exportable=False):
         """Create a new tag"""
         to_post = {'Tag': {'name': name, 'colour': colour, 'exportable': exportable}}
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'tags/add')
-        response = session.post(url, data=json.dumps(to_post))
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
 
     # ########## Version ##########
@@ -1192,16 +1167,14 @@ class PyMISP(object):
 
     def get_recommended_api_version(self):
         """Returns the recommended API version from the server"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'servers/getPyMISPVersion.json')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def get_version(self):
         """Returns the version of the instance."""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'servers/getVersion.json')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def get_version_master(self):
@@ -1217,19 +1190,17 @@ class PyMISP(object):
 
     def get_attributes_statistics(self, context='type', percentage=None):
         """Get attributes statistics from the MISP instance"""
-        session = self.__prepare_session()
         if (context != 'category'):
             context = 'type'
         if percentage is not None:
             url = urljoin(self.root_url, 'attributes/attributeStatistics/{}/{}'.format(context, percentage))
         else:
             url = urljoin(self.root_url, 'attributes/attributeStatistics/{}'.format(context))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def get_tags_statistics(self, percentage=None, name_sort=None):
         """Get tags statistics from the MISP instance"""
-        session = self.__prepare_session()
         if percentage is not None:
             percentage = 'true'
         else:
@@ -1239,32 +1210,29 @@ class PyMISP(object):
         else:
             name_sort = 'false'
         url = urljoin(self.root_url, 'tags/tagStatistics/{}/{}'.format(percentage, name_sort))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     # ############## Sightings ##################
 
     def sighting_per_id(self, attribute_id):
         """Add a sighting to an attribute (by attribute ID)"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'sightings/add/{}'.format(attribute_id))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     def sighting_per_uuid(self, attribute_uuid):
         """Add a sighting to an attribute (by attribute UUID)"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'sightings/add/{}'.format(attribute_uuid))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     def set_sightings(self, sightings):
         """Push a sighting (python dictionary)"""
         if isinstance(sightings, dict):
             sightings = json.dumps(sightings)
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'sightings/add/')
-        response = session.post(url, data=sightings)
+        response = self.__prepare_request('POST', url, sightings)
         return self._check_response(response)
 
     def sighting_per_json(self, json_file):
@@ -1277,9 +1245,8 @@ class PyMISP(object):
 
     def get_sharing_groups(self):
         """Get the existing sharing groups"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'sharing_groups.json')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['response']
 
     # ############## Users ##################
@@ -1325,57 +1292,49 @@ class PyMISP(object):
         return user
 
     def get_users_list(self):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['response']
 
     def get_user(self, user_id):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users/view/{}'.format(user_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def add_user(self, email, org_id, role_id, **kwargs):
-        new_user = self._set_user_parameters(**dict(email=email, org_id=org_id, role_id=role_id, **kwargs))
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users/add/')
-        response = session.post(url, data=json.dumps(new_user))
+        new_user = self._set_user_parameters(**dict(email=email, org_id=org_id, role_id=role_id, **kwargs))
+        response = self.__prepare_request('POST', url, json.dumps(new_user))
         return self._check_response(response)
 
     def add_user_json(self, json_file):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'admin/users/add/')
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     def get_user_fields_list(self):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users/add/')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def edit_user(self, user_id, **kwargs):
         edit_user = self._set_user_parameters(**kwargs)
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users/edit/{}'.format(user_id))
-        response = session.post(url, data=json.dumps(edit_user))
+        response = self.__prepare_request('POST', url, json.dumps(edit_user))
         return self._check_response(response)
 
     def edit_user_json(self, json_file, user_id):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'admin/users/edit/{}'.format(user_id))
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     def delete_user(self, user_id):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/users/delete/{}'.format(user_id))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     # ############## Organisations ##################
@@ -1401,64 +1360,56 @@ class PyMISP(object):
         return organisation
 
     def get_organisations_list(self, scope="local"):
-        session = self.__prepare_session()
         scope = scope.lower()
         if scope not in ["local", "external", "all"]:
             raise ValueError("Authorized fields are 'local','external' or 'all'")
         url = urljoin(self.root_url, 'organisations/index/scope:{}'.format(scope))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['response']
 
     def get_organisation(self, organisation_id):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'organisations/view/{}'.format(organisation_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def add_organisation(self, name, **kwargs):
         new_org = self._set_organisation_parameters(**dict(name=name, **kwargs))
-        session = self.__prepare_session()
         if 'local' in new_org:
             if new_org.get('local') is False:
                 if 'uuid' not in new_org:
                     raise PyMISPError('A remote org MUST have a valid uuid')
         url = urljoin(self.root_url, 'admin/organisations/add/')
-        response = session.post(url, data=json.dumps(new_org))
+        response = self.__prepare_request('POST', url, json.dumps(new_org))
         return self._check_response(response)
 
     def add_organisation_json(self, json_file):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'admin/organisations/add/')
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     def get_organisation_fields_list(self):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/organisations/add/')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def edit_organisation(self, org_id, **kwargs):
         edit_org = self._set_organisation_parameters(**kwargs)
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/organisations/edit/{}'.format(org_id))
-        response = session.post(url, data=json.dumps(edit_org))
+        response = self.__prepare_request('POST', url, json.dumps(edit_org))
         return self._check_response(response)
 
     def edit_organisation_json(self, json_file, org_id):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'admin/organisations/edit/{}'.format(org_id))
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     def delete_organisation(self, org_id):
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'admin/organisations/delete/{}'.format(org_id))
-        response = session.post(url)
+        response = self.__prepare_request('POST', url)
         return self._check_response(response)
 
     # ############## Servers ##################
@@ -1521,17 +1472,15 @@ class PyMISP(object):
         new_server = self._set_server_parameters(url, name, authkey, organisation, internal,
                                                  push, pull, self_signed, push_rules, pull_rules, submitted_cert,
                                                  submitted_client_cert, None, None)
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'servers/add')
-        response = session.post(url, data=json.dumps(new_server))
+        response = self.__prepare_request('POST', url, json.dumps(new_server))
         return self._check_response(response)
 
     def add_server_json(self, json_file):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'servers/add')
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     def edit_server(self, server_id, url=None, name=None, authkey=None, organisation=None, internal=None, push=False,
@@ -1540,35 +1489,31 @@ class PyMISP(object):
         new_server = self._set_server_parameters(url, name, authkey, organisation, internal,
                                                  push, pull, self_signed, push_rules, pull_rules, submitted_cert,
                                                  submitted_client_cert, delete_cert, delete_client_cert)
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'servers/edit/{}'.format(server_id))
-        response = session.post(url, data=json.dumps(new_server))
+        response = self.__prepare_request('POST', url, json.dumps(new_server))
         return self._check_response(response)
 
     def edit_server_json(self, json_file, server_id):
-        session = self.__prepare_session()
         with open(json_file, 'r') as f:
             jdata = json.load(f)
         url = urljoin(self.root_url, 'servers/edit/{}'.format(server_id))
-        response = session.post(url, data=json.dumps(jdata))
+        response = self.__prepare_request('POST', url, json.dumps(jdata))
         return self._check_response(response)
 
     # ############## Roles ##################
 
     def get_roles_list(self):
         """Get the list of existing roles"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, '/roles')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['response']
 
     # ############## Tags ##################
 
     def get_tags_list(self):
         """Get the list of existing tags"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, '/tags')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['Tag']
 
     # ##############################################
@@ -1579,9 +1524,8 @@ class PyMISP(object):
 
     def download_all_suricata(self):
         """Download all suricata rules events."""
-        suricata_rules = urljoin(self.root_url, 'events/nids/suricata/download')
-        session = self.__prepare_session('rules')
-        response = session.get(suricata_rules)
+        url = urljoin(self.root_url, 'events/nids/suricata/download')
+        response = self.__prepare_request('GET', url, output_type='rules')
         return response
 
     def download_suricata_rule_event(self, event_id):
@@ -1589,18 +1533,16 @@ class PyMISP(object):
 
         :param event_id: ID of the event to download (same as get)
         """
-        template = urljoin(self.root_url, 'events/nids/suricata/download/{}'.format(event_id))
-        session = self.__prepare_session('rules')
-        response = session.get(template)
+        url = urljoin(self.root_url, 'events/nids/suricata/download/{}'.format(event_id))
+        response = self.__prepare_request('GET', url, output_type='rules')
         return response
 
     # ############## Text ###############
 
     def get_all_attributes_txt(self, type_attr, tags=False, eventId=False, allowNonIDS=False, date_from=False, date_to=False, last=False, enforceWarninglist=False, allowNotPublished=False):
         """Get all attributes from a specific type as plain text. Only published and IDS flagged attributes are exported, except if stated otherwise."""
-        session = self.__prepare_session('txt')
         url = urljoin(self.root_url, 'attributes/text/download/%s/%s/%s/%s/%s/%s/%s/%s/%s' % (type_attr, tags, eventId, allowNonIDS, date_from, date_to, last, enforceWarninglist, allowNotPublished))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url, output_type='txt')
         return response
 
     # ############## STIX ##############
@@ -1610,12 +1552,10 @@ class PyMISP(object):
         if tags:
             if isinstance(tags, list):
                 tags = "&&".join(tags)
-
-        session = self.__prepare_session()
         url = urljoin(self.root_url, "/events/stix/download/{}/{}/{}/{}/{}".format(
             event_id, with_attachments, tags, from_date, to_date))
         logger.debug("Getting STIX event from %s", url)
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def get_stix(self, **kwargs):
@@ -1627,58 +1567,50 @@ class PyMISP(object):
 
     def fetch_feed(self, feed_id):
         """Fetch one single feed"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/fetchFromFeed/{}'.format(feed_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def view_feeds(self):
         """Get the content of all the feeds"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def view_feed(self, feed_ids):
         """Get the content of a single feed"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/view/{}'.format(feed_ids))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def cache_feeds_all(self):
         """ Cache all the feeds"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/cacheFeeds/all')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def cache_feed(self, feed_id):
         """Cache a specific feed"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/cacheFeeds/{}'.format(feed_id))
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def cache_feeds_freetext(self):
         """Cache all the freetext feeds"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/cacheFeeds/freetext')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def cache_feeds_misp(self):
         """Cache all the MISP feeds"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/cacheFeeds/misp')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def compare_feeds(self):
         """Generate the comparison matrix for all the MISP feeds"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'feeds/compareFeeds')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)
 
     def cache_all_feeds(self):
@@ -1692,25 +1624,20 @@ class PyMISP(object):
 
     def add_object(self, event_id, template_id, misp_object):
         """Add an object"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'objects/add/{}/{}'.format(event_id, template_id))
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug(url)
-        response = session.post(url, data=misp_object.to_json())
+        response = self.__prepare_request('POST', url, misp_object.to_json())
         return self._check_response(response)
 
     def add_object_reference(self, misp_object_reference):
         """Add a reference to an object"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'object_references/add')
-        response = session.post(url, data=misp_object_reference.to_json())
+        response = self.__prepare_request('POST', url, misp_object_reference.to_json())
         return self._check_response(response)
 
     def get_object_templates_list(self):
         """Returns the list of Object templates available on the MISP instance"""
-        session = self.__prepare_session()
         url = urljoin(self.root_url, 'objectTemplates')
-        response = session.get(url)
+        response = self.__prepare_request('GET', url)
         return self._check_response(response)['response']
 
     def get_object_template_id(self, object_uuid):
@@ -1727,7 +1654,6 @@ class PyMISP(object):
 
     @deprecated
     def add_tag(self, event, tag, attribute=False):
-        session = self.__prepare_session()
         if attribute:
             to_post = {'request': {'Attribute': {'id': event['id'], 'tag': tag}}}
             path = 'attributes/addTag'
@@ -1737,17 +1663,18 @@ class PyMISP(object):
                 event = event["Event"]
             to_post = {'request': {'Event': {'id': event['id'], 'tag': tag}}}
             path = 'events/addTag'
-        response = session.post(urljoin(self.root_url, path), data=json.dumps(to_post))
+        url = urljoin(self.root_url, path)
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
 
     @deprecated
     def remove_tag(self, event, tag, attribute=False):
-        session = self.__prepare_session()
         if attribute:
             to_post = {'request': {'Attribute': {'id': event['id'], 'tag': tag}}}
             path = 'attributes/removeTag'
         else:
             to_post = {'request': {'Event': {'id': event['Event']['id'], 'tag': tag}}}
             path = 'events/removeTag'
-        response = session.post(urljoin(self.root_url, path), data=json.dumps(to_post))
+        url = urljoin(self.root_url, path)
+        response = self.__prepare_request('POST', url, json.dumps(to_post))
         return self._check_response(response)
diff --git a/pymisp/exceptions.py b/pymisp/exceptions.py
index 8a09c10..d828e74 100644
--- a/pymisp/exceptions.py
+++ b/pymisp/exceptions.py
@@ -40,6 +40,7 @@ class InvalidMISPObject(MISPObjectException):
     """Exception raised when an object doesn't respect the contrains in the definition"""
     pass
 
+
 class UnknownMISPObjectTemplate(MISPObjectException):
     """Exception raised when the template is unknown"""
     pass
diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py
index fc435fa..645dc9b 100644
--- a/pymisp/mispevent.py
+++ b/pymisp/mispevent.py
@@ -16,10 +16,11 @@ from collections import Counter
 from .abstract import AbstractMISP
 from .exceptions import UnknownMISPObjectTemplate, InvalidMISPObject, PyMISPError, NewEventError, NewAttributeError
 
+import six  # Remove that import when discarding python2 support.
+
 import logging
 logger = logging.getLogger('pymisp')
 
-import six  # Remove that import when discarding python2 support.
 
 if six.PY2:
     logger.warning("You're using python 2, it is strongly recommended to use python >=3.5")
@@ -139,7 +140,7 @@ class MISPAttribute(AbstractMISP):
             try:
                 c.verify(signed_data, signature=base64.b64decode(self.sig), verify=keys[:1])
                 return {self.uuid: True}
-            except:
+            except Exception:
                 return {self.uuid: False}
 
     def set_all_values(self, **kwargs):
@@ -252,7 +253,7 @@ class MISPAttribute(AbstractMISP):
                         else:
                             with f.open(name, pwd=b'infected') as unpacked:
                                 self._malware_binary = BytesIO(unpacked.read())
-            except:
+            except Exception:
                 # not a encrypted zip file, assuming it is a new malware sample
                 self._prepare_new_malware_sample()
 
@@ -383,7 +384,7 @@ class MISPEvent(AbstractMISP):
             try:
                 c.verify(signed_data, signature=base64.b64decode(self.sig), verify=keys[:1])
                 to_return[self.uuid] = True
-            except:
+            except Exception:
                 to_return[self.uuid] = False
         for a in self.attributes:
             to_return.update(a.verify(gpg_uid))
@@ -393,7 +394,7 @@ class MISPEvent(AbstractMISP):
             try:
                 c.verify(to_verify_global, signature=base64.b64decode(self.global_sig), verify=keys[:1])
                 to_return['global'] = True
-            except:
+            except Exception:
                 to_return['global'] = False
         return to_return
 

From e6ab90012d5c5e1fd1c0973360ac87f18c0a742c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 8 Nov 2017 18:01:27 -0800
Subject: [PATCH 5/7] chg: Update readme for new logging system

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index b8a77c0..de40a54 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,23 @@ cd examples
 python3 last.py -l 10
 ```
 
+## Debugging
+
+You have two options there:
+
+1. Pass `debug=True` to `PyMISP` and it will enable logging.DEBUG to stderr on the whole module
+
+2. Use the python logging module directly:
+
+```python
+
+import logging
+logger = logging.getLogger('pymisp')
+
+# Configure it as you whish, for example, enable DEBUG mode:
+logger.setLevel(logging.DEBUG)
+```
+
 ## Documentation
 
 [PyMISP API documentation is available](https://media.readthedocs.org/pdf/pymisp/master/pymisp.pdf).

From 5d414cb8e95070fdb0b09b1fb39f79319e035150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 9 Nov 2017 13:45:31 -0800
Subject: [PATCH 6/7] chg: Bump misp-objects

---
 pymisp/data/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects
index 6b43b68..66c4578 160000
--- a/pymisp/data/misp-objects
+++ b/pymisp/data/misp-objects
@@ -1 +1 @@
-Subproject commit 6b43b68651a350a26891080ef0feda364b74727a
+Subproject commit 66c4578f08efc6b92737f1667cbaf237149a8e46

From c18c4538a5e3b3017fe2d1fe5e7e5e5b8621cf81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 9 Nov 2017 13:47:17 -0800
Subject: [PATCH 7/7] chg: Bump CHANGELOG

---
 CHANGELOG.txt | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f6e5ebf..8fc6177 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,78 @@ Changelog
 =========
 
 
+v2.4.82 (2017-11-09)
+--------------------
+
+New
+~~~
+- Proper debug system. [Raphaël Vinot]
+
+  Make it easy to investigate the json blobs sent to the server.
+
+Changes
+~~~~~~~
+- Bump misp-objects. [Raphaël Vinot]
+- Update readme for new logging system. [Raphaël Vinot]
+- Small improvments in the logging system. [Raphaël Vinot]
+- Properly use python logging module. [Raphaël Vinot]
+- Update asciidoctor generator. [Raphaël Vinot]
+- Remove warning if PyMISP is too new. [Raphaël Vinot]
+- Add simple asciidoc generator for MISP event. [Raphaël Vinot]
+- Update changelog. [Raphaël Vinot]
+
+Fix
+~~~
+- Typo loger -> logger. [Raphaël Vinot]
+- Let load unknown object relations in known templates. [Raphaël Vinot]
+
+  This isn't recommended, but happens very often.
+- Allow to load non-malware ZIP files in MISP Event. [Raphaël Vinot]
+
+  Prior to his patch, any zip file loaded by MISP Event was unpacked and
+  processed as an excrypted malware from MISP.
+- Properly pass the distribution when uploading a sample. [Raphaël
+  Vinot]
+- Properly upload a sample in an existing event. [Raphaël Vinot]
+
+  Fix https://github.com/MISP/PyMISP/issues/123
+- Properly set the distribution at event level. [Raphaël Vinot]
+
+  fix #120
+- Properly pop the distribution key. [Raphaël Vinot]
+- Update dependencies for VT generator. [Raphaël Vinot]
+
+Other
+~~~~~
+- Merge pull request #126 from CenturyLinkCIRT/master. [Raphaël Vinot]
+
+  Added vt_to_misp.py example and VTReportObject
+- Merge branch 'master' of https://github.com/MISP/PyMISP. [Thomas
+  Gardner]
+- Fix test suite. [Raphaël Vinot]
+- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
+- Merge pull request #122 from LDO-CERT/master. [Raphaël Vinot]
+
+  Created add_generic_object.py
+- Created add_generic_object.py. [garanews]
+
+  usage: add_generic_object.py [-h] -e EVENT -t TYPE -d DICT
+
+  Examples:
+  python3 add_generic_object.py -e 1683 -t email -d '{"subject":"The Pink Letter", "to":"jon@snow.org"}'
+  python3 add_generic_object.py -e 2343 -t person -d '{"first-name":"Daenerys", "last-name":"Targaryen", "place-of-birth":"Dragonstone"}'
+  python3 add_generic_object.py -e 3596 -t "domain|ip" -d '{"domain":"stormborn.org", "ip":"50.63.202.33"}'
+- Added vtreportobject and vt_to_misp example. [Thomas Gardner]
+- Created add_generic_object.py. [garanews]
+
+  usage: add_generic_object.py [-h] -e EVENT -t TYPE -d DICT
+
+  Examples:
+  python3 add_generic_object.py -e 1683 -t email -d '{"subject":"The Pink Letter", "to":"jon@snow.org"}'
+  python3 add_generic_object.py -e 2343 -t person -d '{"first-name":"Daenerys", "last-name":"Targaryen", "place-of-birth":"Dragonstone"}'
+  python3 add_generic_object.py -e 3596 -t "domain|ip" -d '{"domain":"stormborn.org", "ip":"50.63.202.33"}'
+
+
 v2.4.81.2 (2017-10-24)
 ----------------------