From 2fa56348e5f24ed753280ccc9eb0f9764f8cb1c8 Mon Sep 17 00:00:00 2001 From: netjinho Date: Thu, 4 Oct 2018 19:31:46 +0200 Subject: [PATCH] Fixed leaked taxonomy tags problem --- pymisp/api.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pymisp/api.py b/pymisp/api.py index d605ea2..4b3df50 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -1767,6 +1767,7 @@ class PyMISP(object): def disable_taxonomy(self, taxonomy_id): """Disable a taxonomy by id.""" + self.disable_taxonomy_tags(taxonomy_id) url = urljoin(self.root_url, '/taxonomies/disable/{}'.format(taxonomy_id)) response = self._prepare_request('POST', url) return self._check_response(response) @@ -1779,9 +1780,11 @@ class PyMISP(object): def enable_taxonomy_tags(self, taxonomy_id): """Enable all the tags of a taxonomy by id.""" - url = urljoin(self.root_url, '/taxonomies/addTag/{}'.format(taxonomy_id)) - response = self._prepare_request('POST', url) - return self._check_response(response) + enabled = self.get_taxonomy(taxonomy_id)['Taxonomy']['enabled'] + if enabled: + url = urljoin(self.root_url, '/taxonomies/addTag/{}'.format(taxonomy_id)) + response = self._prepare_request('POST', url) + return self._check_response(response) def disable_taxonomy_tags(self, taxonomy_id): """Disable all the tags of a taxonomy by id.""" @@ -1834,6 +1837,7 @@ class PyMISP(object): """Get a noticelist by id.""" url = urljoin(self.root_url, '/noticelists/view/{}'.format(noticelist_id)) response = self._prepare_request('GET', url) + return self._check_response(response) def update_noticelists(self): """Update all the noticelists."""