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

Merge pull request #8173 from JakubOnderka/fix-id-translator 

fix: [internal] Event ID translator
pull/8176/head
Jakub Onderka 2022-02-26 11:16:12 +01:00 committed by GitHub
parent 351d2bfa20 5ec36f8d4b
commit 29e0695df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/Event.php
View File

@ -1388,7 +1388,11 @@ class Event extends AppModel
if (empty($data)) {
return null;
}
return $data;
// Old format used by old MISP version
if (isset($data['id'])) {
return $data;
}
return $data[0];
}
public function quickDelete(array $event)

21
tests/testlive_comprehensive_local.py
View File

@ -258,6 +258,27 @@ class TestComprehensive(unittest.TestCase):
self.user_misp_connector.delete_event(event)
def test_search_index_by_eventid(self):
# Search by non exists uuid
index = self.admin_misp_connector.search_index(eventid=uuid.uuid4())
self.assertEqual(len(index), 0, index)
# Search by non exists id
index = self.admin_misp_connector.search_index(eventid=9999)
self.assertEqual(len(index), 0, index)
event = create_simple_event()
event = self.user_misp_connector.add_event(event)
check_response(event)
index = self.admin_misp_connector.search_index(eventid=event.id)
self.assertEqual(len(index), 1, index)
index = self.admin_misp_connector.search_index(eventid=event.uuid)
self.assertEqual(len(index), 1, index)
self.user_misp_connector.delete_event(event)
def test_search_index_minimal(self):
# pythonify is not supported for minimal results
self.user_misp_connector.global_pythonify = False