MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

new: Properly support attribute/add of multiple attributes (2.4.113+)

pull/434/head
Raphaël Vinot 2019-08-06 16:50:09 +02:00
parent 89a24d4923
commit a3140f3773
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/aping.py
View File

@ -365,7 +365,7 @@ class ExpandedPyMISP(PyMISP):
for new_attr in new_attribute['Attribute']:
a = MISPAttribute()
a.from_dict(**attribute)
a.from_dict(**new_attr)
to_return['attributes'].append(a)
return to_return

13
tests/testlive_comprehensive.py
View File

@ -1351,12 +1351,13 @@ class TestComprehensive(unittest.TestCase):
attr4.type = 'ip-dst'
attr4.add_tag('tlp:amber___test')
response = self.user_misp_connector.add_attribute(first.id, [attr1, attr2, attr3, attr4])
# FIXME: https://github.com/MISP/MISP/issues/4959
# self.assertEqual(response['attributes'][0].value, '1.2.3.5')
# self.assertEqual(response['attributes'][1].value, '1.2.3.6')
# self.assertEqual(response['attributes'][1].tags[0].name, 'tlp:amber___test')
# self.assertEqual(response['errors']['attribute_0']['value'][0], 'A similar attribute already exists for this event.')
# self.assertEqual(response['errors']['attribute_2']['value'][0], 'A similar attribute already exists for this event.')
if 'attributes' in response:
# FIXME: this if statement can be removed as soon as 2.4.113 is released: the format changed between 112 and 113, we test 113+
self.assertEqual(response['attributes'][0].value, '1.2.3.5')
self.assertEqual(response['attributes'][1].value, '1.2.3.6')
self.assertEqual(response['attributes'][1].tags[0].name, 'tlp:amber___test')
self.assertEqual(response['errors']['attribute_0']['value'][0], 'A similar attribute already exists for this event.')
self.assertEqual(response['errors']['attribute_2']['value'][0], 'A similar attribute already exists for this event.')
# Add attribute as proposal
new_proposal = MISPAttribute()