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

fix: merge SG params to allow search

pull/500/head
Tom King 2020-02-13 16:20:14 +00:00
parent cf45bf0c46
commit 415e06f375
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pymisp/aping.py
View File

@ -1488,6 +1488,7 @@ class ExpandedPyMISP(PyMISP):
query['eventid'] = eventid query['eventid'] = eventid
query['withAttachments'] = self._make_misp_bool(with_attachments) query['withAttachments'] = self._make_misp_bool(with_attachments)
query['metadata'] = self._make_misp_bool(metadata) query['metadata'] = self._make_misp_bool(metadata)
query['sharinggroup'] = sharinggroup
query['uuid'] = uuid query['uuid'] = uuid
if publish_timestamp is not None: if publish_timestamp is not None:
if isinstance(publish_timestamp, (list, tuple)): if isinstance(publish_timestamp, (list, tuple)):
@ -1586,7 +1587,7 @@ class ExpandedPyMISP(PyMISP):
analysis: Optional[List[SearchType]]=None, analysis: Optional[List[SearchType]]=None,
org: Optional[SearchParameterTypes]=None, org: Optional[SearchParameterTypes]=None,
timestamp: Optional[DateInterval]=None, timestamp: Optional[DateInterval]=None,
sharinggroup: Optional[SearchType]=None, sharinggroup: Optional[List[SearchType]]=None,
pythonify: Optional[bool]=None): pythonify: Optional[bool]=None):
"""Search only at the index level. Using ! in front of a value means NOT (default is OR) """Search only at the index level. Using ! in front of a value means NOT (default is OR)
@ -1610,7 +1611,8 @@ class ExpandedPyMISP(PyMISP):
query['datefrom'] = self._make_timestamp(query.pop('date_from')) query['datefrom'] = self._make_timestamp(query.pop('date_from'))
if query.get('date_to'): if query.get('date_to'):
query['dateuntil'] = self._make_timestamp(query.pop('date_to')) query['dateuntil'] = self._make_timestamp(query.pop('date_to'))
if isinstance(query.get('sharinggroup'), list):
query['sharinggroup'] = '|'.join([str(sg) for sg in query['sharinggroup']])
if query.get('timestamp') is not None: if query.get('timestamp') is not None:
timestamp = query.pop('timestamp') timestamp = query.pop('timestamp')
if isinstance(timestamp, (list, tuple)): if isinstance(timestamp, (list, tuple)):