mirror of https://github.com/MISP/PyMISP
chg: More test cases
Raphaël Vinot
parent
2fa56348e5
commit
9a2610a61f
|
|
@ -1712,11 +1712,11 @@ class PyMISP(object):
|
|||
return {'Tag': tag}
|
||||
|
||||
def edit_tag(self, tag_id, name=None, colour=None, exportable=None, hide_tag=None, org_id=None, count=None,
|
||||
user_id=None, numerical_value=None, attribute_count=None):
|
||||
user_id=None, numerical_value=None, attribute_count=None):
|
||||
"""Edit only the provided parameters of a tag."""
|
||||
old_tag = self.get_tag(tag_id)
|
||||
new_tag = self._set_tag_parameters(name, colour, exportable, hide_tag, org_id, count, user_id,
|
||||
numerical_value, attribute_count, old_tag)
|
||||
numerical_value, attribute_count, old_tag)
|
||||
url = urljoin(self.root_url, '/tags/edit/{}'.format(tag_id))
|
||||
response = self._prepare_request('POST', url, json.dumps(new_tag))
|
||||
return self._check_response(response)
|
||||
|
|
@ -1792,7 +1792,6 @@ class PyMISP(object):
|
|||
response = self._prepare_request('POST', url)
|
||||
return self._check_response(response)
|
||||
|
||||
|
||||
# ############## WarningLists ##################
|
||||
|
||||
def get_warninglists(self):
|
||||
|
|
@ -1813,17 +1812,35 @@ class PyMISP(object):
|
|||
response = self._prepare_request('POST', url)
|
||||
return self._check_response(response)
|
||||
|
||||
def toggle_warninglist(self, warninglist_id=None, warninglist_name=None, force_enable=None):
|
||||
'''Toggle (enable/disable) the status of a warninglist by ID.
|
||||
:param warninglist_id: ID of the WarningList
|
||||
:param force_enable: Force the warning list in the enabled state (does nothing if already enabled)
|
||||
'''
|
||||
if warninglist_id is None and warninglist_name is None:
|
||||
raise Exception('Either warninglist_id or warninglist_name is required.')
|
||||
query = {}
|
||||
if warninglist_id is not None:
|
||||
if not isinstance(warninglist_id, list):
|
||||
warninglist_id = [warninglist_id]
|
||||
query['id'] = warninglist_id
|
||||
if warninglist_name is not None:
|
||||
if not isinstance(warninglist_name, list):
|
||||
warninglist_name = [warninglist_name]
|
||||
query['name'] = warninglist_name
|
||||
if force_enable is not None:
|
||||
query['enabled'] = force_enable
|
||||
url = urljoin(self.root_url, '/warninglists/toggleEnable')
|
||||
response = self._prepare_request('POST', url, json.dumps(query))
|
||||
return self._check_response(response)
|
||||
|
||||
def enable_warninglist(self, warninglist_id):
|
||||
"""Enable a warninglist by id."""
|
||||
url = urljoin(self.root_url, '/warninglists/enableWarninglist/{}/true'.format(warninglist_id))
|
||||
response = self._prepare_request('POST', url)
|
||||
return self._check_response(response)
|
||||
return self.toggle_warninglist(warninglist_id=warninglist_id, force_enable=True)
|
||||
|
||||
def disable_warninglist(self, warninglist_id):
|
||||
"""Disable a warninglist by id."""
|
||||
url = urljoin(self.root_url, '/warninglists/enableWarninglist/{}'.format(warninglist_id))
|
||||
response = self._prepare_request('POST', url)
|
||||
return self._check_response(response)
|
||||
return self.toggle_warninglist(warninglist_id=warninglist_id, force_enable=False)
|
||||
|
||||
# ############## NoticeLists ##################
|
||||
|
||||
|
|
|
|||
|
|
@ -40,22 +40,7 @@ class ExpandedPyMISP(PyMISP):
|
|||
:param warninglist_id: ID of the WarningList
|
||||
:param force_enable: Force the warning list in the enabled state (does nothing is already enabled)
|
||||
'''
|
||||
if warninglist_id is None and warninglist_name is None:
|
||||
raise Exception('Either warninglist_id or warninglist_name is required.')
|
||||
query = {}
|
||||
if warninglist_id is not None:
|
||||
if not isinstance(warninglist_id, list):
|
||||
warninglist_id = [warninglist_id]
|
||||
query['id'] = warninglist_id
|
||||
if warninglist_name is not None:
|
||||
if not isinstance(warninglist_name, list):
|
||||
warninglist_name = [warninglist_name]
|
||||
query['name'] = warninglist_name
|
||||
if force_enable is not None:
|
||||
query['enabled'] = force_enable
|
||||
url = urljoin(self.root_url, '/warninglists/toggleEnable')
|
||||
response = self._prepare_request('POST', url, json.dumps(query))
|
||||
return self._check_response(response)
|
||||
return super().toggle_warninglist(warninglist_id, warninglist_name, force_enable)
|
||||
|
||||
def make_timestamp(self, value: DateTypes):
|
||||
if isinstance(value, datetime):
|
||||
|
|
|
|||
|
|
@ -750,27 +750,106 @@ class TestComprehensive(unittest.TestCase):
|
|||
self.admin_misp_connector.delete_event(third.id)
|
||||
|
||||
def test_update_modules(self):
|
||||
# warninglist
|
||||
self.admin_misp_connector.update_warninglists()
|
||||
r = self.admin_misp_connector.update_warninglists()
|
||||
self.assertEqual(r['name'], 'All warninglists are up to date already.')
|
||||
# taxonomies
|
||||
self.admin_misp_connector.update_taxonomies()
|
||||
r = self.admin_misp_connector.update_taxonomies()
|
||||
self.assertEqual(r['name'], 'All taxonomy libraries are up to date already.')
|
||||
# object templates
|
||||
self.admin_misp_connector.update_object_templates()
|
||||
r = self.admin_misp_connector.update_object_templates()
|
||||
self.assertEqual(type(r), list)
|
||||
# notice lists
|
||||
|
||||
def test_tags(self):
|
||||
# Get list
|
||||
tags = self.admin_misp_connector.get_tags_list()
|
||||
self.assertTrue(isinstance(tags, list))
|
||||
# Get tag
|
||||
for tag in tags:
|
||||
if not tag['hide_tag']:
|
||||
break
|
||||
tag = self.admin_misp_connector.get_tag(tags[0]['id'])
|
||||
self.assertTrue('name' in tag)
|
||||
self.admin_misp_connector.disable_tag(tag['id'])
|
||||
# FIXME: returns the tag with ID 1
|
||||
self.admin_misp_connector.enable_tag(tag['id'])
|
||||
# FIXME: returns the tag with ID 1
|
||||
|
||||
def test_taxonomies(self):
|
||||
# Make sure we're up-to-date
|
||||
self.admin_misp_connector.update_taxonomies()
|
||||
r = self.admin_misp_connector.update_taxonomies()
|
||||
self.assertEqual(r['name'], 'All taxonomy libraries are up to date already.')
|
||||
# Get list
|
||||
taxonomies = self.admin_misp_connector.get_taxonomies_list()
|
||||
self.assertTrue(isinstance(taxonomies, list))
|
||||
list_name_test = 'tlp'
|
||||
for tax in taxonomies:
|
||||
if tax['Taxonomy']['namespace'] == list_name_test:
|
||||
break
|
||||
r = self.admin_misp_connector.get_taxonomy(tax['Taxonomy']['id'])
|
||||
self.assertEqual(r['Taxonomy']['namespace'], list_name_test)
|
||||
self.assertTrue('enabled' in r['Taxonomy'])
|
||||
r = self.admin_misp_connector.enable_taxonomy(tax['Taxonomy']['id'])
|
||||
self.assertEqual(r['message'], 'Taxonomy enabled')
|
||||
r = self.admin_misp_connector.disable_taxonomy(tax['Taxonomy']['id'])
|
||||
self.assertEqual(r['message'], 'Taxonomy disabled')
|
||||
|
||||
def test_warninglists(self):
|
||||
# Make sure we're up-to-date
|
||||
self.admin_misp_connector.update_warninglists()
|
||||
r = self.admin_misp_connector.update_warninglists()
|
||||
self.assertEqual(r['name'], 'All warninglists are up to date already.')
|
||||
# Get list
|
||||
r = self.admin_misp_connector.get_warninglists()
|
||||
# FIXME It returns Warninglists object instead of a list of warning lists directly. This is inconsistent.
|
||||
warninglists = r['Warninglists']
|
||||
self.assertTrue(isinstance(warninglists, list))
|
||||
list_name_test = 'List of known hashes with common false-positives (based on Florian Roth input list)'
|
||||
for wl in warninglists:
|
||||
if wl['Warninglist']['name'] == list_name_test:
|
||||
break
|
||||
testwl = wl['Warninglist']
|
||||
r = self.admin_misp_connector.get_warninglist(testwl['id'])
|
||||
self.assertEqual(r['Warninglist']['name'], list_name_test)
|
||||
self.assertTrue('WarninglistEntry' in r['Warninglist'])
|
||||
r = self.admin_misp_connector.enable_warninglist(testwl['id'])
|
||||
self.assertEqual(r['success'], '1 warninglist(s) enabled')
|
||||
r = self.admin_misp_connector.disable_warninglist(testwl['id'])
|
||||
self.assertEqual(r['success'], '1 warninglist(s) disabled')
|
||||
|
||||
def test_noticelists(self):
|
||||
# Make sure we're up-to-date
|
||||
self.admin_misp_connector.update_noticelists()
|
||||
r = self.admin_misp_connector.update_noticelists()
|
||||
self.assertEqual(r['name'], 'All noticelists are up to date already.')
|
||||
# Get list
|
||||
noticelists = self.admin_misp_connector.get_noticelists()
|
||||
self.assertTrue(isinstance(noticelists, list))
|
||||
list_name_test = 'gdpr'
|
||||
for nl in noticelists:
|
||||
if nl['Noticelist']['name'] == list_name_test:
|
||||
break
|
||||
testnl = nl
|
||||
r = self.admin_misp_connector.get_noticelist(testnl['Noticelist']['id'])
|
||||
self.assertEqual(r['Noticelist']['name'], list_name_test)
|
||||
self.assertTrue('NoticelistEntry' in r['Noticelist'])
|
||||
r = self.admin_misp_connector.enable_noticelist(testnl['Noticelist']['id'])
|
||||
self.assertTrue(r['Noticelist']['enabled'])
|
||||
r = self.admin_misp_connector.disable_noticelist(testnl['Noticelist']['id'])
|
||||
self.assertFalse(r['Noticelist']['enabled'])
|
||||
|
||||
def test_galaxies(self):
|
||||
if not travis_run:
|
||||
# galaxies
|
||||
# Make sure we're up-to-date
|
||||
self.admin_misp_connector.update_galaxies()
|
||||
r = self.admin_misp_connector.update_galaxies()
|
||||
self.assertEqual(r['name'], 'Galaxies updated.')
|
||||
# Get list
|
||||
galaxies = self.admin_misp_connector.get_galaxies()
|
||||
self.assertTrue(isinstance(galaxies, list))
|
||||
list_name_test = 'Mobile Attack - Attack Pattern'
|
||||
for galaxy in galaxies:
|
||||
if galaxy['Galaxy']['name'] == list_name_test:
|
||||
break
|
||||
r = self.admin_misp_connector.get_galaxy(galaxy['Galaxy']['id'])
|
||||
self.assertEqual(r['Galaxy']['name'], list_name_test)
|
||||
self.assertTrue('GalaxyCluster' in r)
|
||||
|
||||
@unittest.skip("Currently failing")
|
||||
def test_search_type_event_csv(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue