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

chg: Support dict in tag/untag

pull/534/head
Raphaël Vinot 2020-01-30 11:07:49 +01:00
parent 2a2871eced
commit 864d294294
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pymisp/api.py
View File

@ -1354,15 +1354,15 @@ class PyMISP:
publish_timestamp: Optional[Union[Union[datetime, date, int, str, float, None], publish_timestamp: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
last: Optional[Union[Union[datetime, date, int, str, float, None], last: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
timestamp: Optional[Union[Union[datetime, date, int, str, float, None], timestamp: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
published: Optional[bool]=None, published: Optional[bool]=None,
enforce_warninglist: Optional[bool]=None, enforceWarninglist: Optional[bool]=None, enforce_warninglist: Optional[bool]=None, enforceWarninglist: Optional[bool]=None,
to_ids: Optional[Union[ToIDSType, List[ToIDSType]]]=None, to_ids: Optional[Union[ToIDSType, List[ToIDSType]]]=None,
@ -1575,7 +1575,7 @@ class PyMISP:
timestamp: Optional[Union[Union[datetime, date, int, str, float, None], timestamp: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
pythonify: Optional[bool]=None) -> Union[dict, List[MISPEvent]]: pythonify: Optional[bool]=None) -> Union[dict, List[MISPEvent]]:
"""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)
@ -1628,11 +1628,11 @@ class PyMISP:
publish_timestamp: Optional[Union[Union[datetime, date, int, str, float, None], publish_timestamp: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
last: Optional[Union[Union[datetime, date, int, str, float, None], last: Optional[Union[Union[datetime, date, int, str, float, None],
Tuple[Union[datetime, date, int, str, float, None], Tuple[Union[datetime, date, int, str, float, None],
Union[datetime, date, int, str, float, None]] Union[datetime, date, int, str, float, None]]
]]=None, ]]=None,
org: Optional[SearchType]=None, org: Optional[SearchType]=None,
source: Optional[str]=None, source: Optional[str]=None,
include_attribute: Optional[bool]=None, include_attribute: Optional[bool]=None,
@ -2044,10 +2044,12 @@ class PyMISP:
raise PyMISPError('The misp_entity must be MISPEvent, MISPObject or MISPAttribute') raise PyMISPError('The misp_entity must be MISPEvent, MISPObject or MISPAttribute')
def tag(self, misp_entity: Union[AbstractMISP, str], tag: Union[MISPTag, str], local: bool=False) -> dict: def tag(self, misp_entity: Union[AbstractMISP, str, dict], tag: Union[MISPTag, str], local: bool=False) -> dict:
"""Tag an event or an attribute. misp_entity can be a MISPEvent, a MISP Attribute, or a UUID""" """Tag an event or an attribute. misp_entity can be a MISPEvent, a MISP Attribute, or a UUID"""
if isinstance(misp_entity, AbstractMISP) and 'uuid' in misp_entity: if isinstance(misp_entity, AbstractMISP) and 'uuid' in misp_entity:
uuid = misp_entity.uuid uuid = misp_entity.uuid
elif isinstance(misp_entity, dict) and 'uuid' in misp_entity:
uuid = misp_entity['uuid']
elif isinstance(misp_entity, str): elif isinstance(misp_entity, str):
uuid = misp_entity uuid = misp_entity
if isinstance(tag, MISPTag): if isinstance(tag, MISPTag):
@ -2056,10 +2058,12 @@ class PyMISP:
response = self._prepare_request('POST', 'tags/attachTagToObject', data=to_post) response = self._prepare_request('POST', 'tags/attachTagToObject', data=to_post)
return self._check_json_response(response) return self._check_json_response(response)
def untag(self, misp_entity: Union[AbstractMISP, str], tag: Union[MISPTag, str]) -> dict: def untag(self, misp_entity: Union[AbstractMISP, str, dict], tag: Union[MISPTag, str]) -> dict:
"""Untag an event or an attribute. misp_entity can be a UUID""" """Untag an event or an attribute. misp_entity can be a UUID"""
if isinstance(misp_entity, AbstractMISP) and 'uuid' in misp_entity: if isinstance(misp_entity, AbstractMISP) and 'uuid' in misp_entity:
uuid = misp_entity.uuid uuid = misp_entity.uuid
elif isinstance(misp_entity, dict) and 'uuid' in misp_entity:
uuid = misp_entity['uuid']
elif isinstance(misp_entity, str): elif isinstance(misp_entity, str):
uuid = misp_entity uuid = misp_entity
if isinstance(tag, MISPTag): if isinstance(tag, MISPTag):