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

Merge branch 'lastinfosec-main' into main

pull/660/head
Raphaël Vinot 2020-11-03 13:31:03 +01:00
parent 7e84c36406 bdcc19c5fb
commit 56ff22228c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pymisp/api.py
View File

@ -15,6 +15,7 @@ from uuid import UUID
import warnings import warnings
import sys import sys
import copy import copy
from io import BytesIO, StringIO
from . import __version__, everything_broken from . import __version__, everything_broken
from .exceptions import MISPServerError, PyMISPUnexpectedResponse, PyMISPError, NoURL, NoKey from .exceptions import MISPServerError, PyMISPUnexpectedResponse, PyMISPError, NoURL, NoKey
@ -2523,20 +2524,27 @@ class PyMISP:
to_return.append(a) to_return.append(a)
return to_return return to_return
def upload_stix(self, path, version: str = '2'): def upload_stix(self, path: Optional[Union[str, Path, BytesIO, StringIO]] = None, data: Optional[Union[str, bytes]] = None, version: str = '2'):
"""Upload a STIX file to MISP. """Upload a STIX file to MISP.
:param path: Path to the STIX on the disk (can be a path-like object, or a pseudofile) :param path: Path to the STIX on the disk (can be a path-like object, or a pseudofile)
:param data: stix object
:param version: Can be 1 or 2 :param version: Can be 1 or 2
""" """
if isinstance(path, (str, Path)): to_post: Union[str, bytes]
with open(path, 'rb') as f: if path is not None:
to_post = f.read() if isinstance(path, (str, Path)):
with open(path, 'rb') as f:
to_post = f.read()
else:
to_post = path.read()
elif data is not None:
to_post = data
else: else:
to_post = path.read() raise MISPServerError("please fill path or data parameter")
if isinstance(to_post, bytes): if isinstance(to_post, bytes):
to_post = to_post.decode() # type: ignore to_post = to_post.decode()
if str(version) == '1': if str(version) == '1':
url = urljoin(self.root_url, '/events/upload_stix') url = urljoin(self.root_url, '/events/upload_stix')