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

chg: Slight changes regarding timezones

pull/804/head
Raphaël Vinot 2021-10-28 16:11:46 -04:00
parent 70000175e7
commit 2bc689e3c7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/api.py
View File

@ -2812,6 +2812,8 @@ class PyMISP:
query.pop('pythonify') query.pop('pythonify')
if log_id is not None: if log_id is not None:
query['id'] = query.pop('log_id') query['id'] = query.pop('log_id')
if created is not None and isinstance(created, (datetime)):
query['created'] = query.pop('created').timestamp()
response = self._prepare_request('POST', 'admin/logs/index', data=query) response = self._prepare_request('POST', 'admin/logs/index', data=query)
normalized_response = self._check_json_response(response) normalized_response = self._check_json_response(response)

4
tests/testlive_comprehensive.py
View File

@ -2614,7 +2614,7 @@ class TestComprehensive(unittest.TestCase):
def test_first_last_seen(self): def test_first_last_seen(self):
event = MISPEvent() event = MISPEvent()
event.info = 'Test First Last seen' event.info = 'Test First Last seen'
event.add_attribute('ip-dst', '8.8.8.8', first_seen='2020-01-04', last_seen='2020-01-04T12:30:34.323242+0800') event.add_attribute('ip-dst', '8.8.8.8', first_seen='2020-01-03', last_seen='2020-01-04T12:30:34.323242+0800')
obj = event.add_object(name='file', first_seen=1580147259.268763, last_seen=1580147300) obj = event.add_object(name='file', first_seen=1580147259.268763, last_seen=1580147300)
attr = obj.add_attribute('filename', 'blah.exe', comment="blah") attr = obj.add_attribute('filename', 'blah.exe', comment="blah")
attr.first_seen = '2022-01-30' attr.first_seen = '2022-01-30'
@ -2622,7 +2622,7 @@ class TestComprehensive(unittest.TestCase):
try: try:
first = self.admin_misp_connector.add_event(event, pythonify=True) first = self.admin_misp_connector.add_event(event, pythonify=True)
# Simple attribute # Simple attribute
self.assertEqual(first.attributes[0].first_seen, datetime(2020, 1, 4, 0, 0).astimezone()) self.assertEqual(first.attributes[0].first_seen, datetime(2020, 1, 3, 0, 0).astimezone())
self.assertEqual(first.attributes[0].last_seen, datetime(2020, 1, 4, 4, 30, 34, 323242, tzinfo=timezone.utc)) self.assertEqual(first.attributes[0].last_seen, datetime(2020, 1, 4, 4, 30, 34, 323242, tzinfo=timezone.utc))
# Object # Object