From 13e0cd0901b705ccc8b744221b3f382b2db7a918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 1 Jul 2016 13:52:31 +0200 Subject: [PATCH 1/4] Make scripts executable --- examples/events/create_dummy_event.py | 0 examples/events/create_massive_dummy_events.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 examples/events/create_dummy_event.py mode change 100644 => 100755 examples/events/create_massive_dummy_events.py diff --git a/examples/events/create_dummy_event.py b/examples/events/create_dummy_event.py old mode 100644 new mode 100755 diff --git a/examples/events/create_massive_dummy_events.py b/examples/events/create_massive_dummy_events.py old mode 100644 new mode 100755 From 836845abde53ee55bca93f098ece78880ab6b5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 1 Jul 2016 14:21:48 +0200 Subject: [PATCH 2/4] Use same variable names as testing environment --- examples/events/create_massive_dummy_events.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/events/create_massive_dummy_events.py b/examples/events/create_massive_dummy_events.py index 192c782..12a2826 100755 --- a/examples/events/create_massive_dummy_events.py +++ b/examples/events/create_massive_dummy_events.py @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- from pymisp import PyMISP -from keys import misp_url, misp_key, misp_verifycert +from keys import url, key import argparse import tools -def init(url, key): - return PyMISP(url, key, misp_verifycert, 'json') if __name__ == '__main__': parser = argparse.ArgumentParser(description='Create a given number of event containing a given number of attributes eachh.') @@ -15,7 +13,7 @@ if __name__ == '__main__': parser.add_argument("-a", "--attribute", type=int, help="Number of attributes per event (default 3000)") args = parser.parse_args() - misp = init(misp_url, misp_key) + misp = PyMISP(url, key, True, 'json') if args.limit is None: args.limit = 1 From 51a97255830318c45b2cc96a18076729d727150f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 11 Jul 2016 17:57:16 +0200 Subject: [PATCH 3/4] Add remove tag method --- pymisp/api.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pymisp/api.py b/pymisp/api.py index fb1d38b..35c8059 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -364,6 +364,13 @@ class PyMISP(object): return self._check_response(response) + def remove_tag(self, event, tag): + session = self.__prepare_session('json') + to_post = {'request': {'Event': {'id': event['Event']['id'], 'tag': tag}}} + response = session.post(urljoin(self.root_url, 'events/removeTag'), data=json.dumps(to_post)) + + return self._check_response(response) + def change_threat_level(self, event, threat_level_id): event['Event']['threat_level_id'] = threat_level_id self._prepare_update(event) From c97651e6ac93fcc23c9c263cd1a6200fffb04431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 11 Jul 2016 18:54:17 +0200 Subject: [PATCH 4/4] Version bump --- pymisp/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymisp/__init__.py b/pymisp/__init__.py index 2b6f91f..c6a29ba 100644 --- a/pymisp/__init__.py +++ b/pymisp/__init__.py @@ -1,3 +1,3 @@ -__version__ = '2.4.48.1' +__version__ = '2.4.48.2' from .api import PyMISP, PyMISPError, NewEventError, NewAttributeError, MissingDependency, NoURL, NoKey