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

fix: Re-enable support for uploading STIX 1 documents 

Fix #711
pull/749/head
Raphaël Vinot 2021-03-04 12:35:23 +01:00
parent 39a7b8242f
commit 0697f1470b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pymisp/api.py
View File

@ -2905,7 +2905,7 @@ class PyMISP:
if str(version) == '1':
url = urljoin(self.root_url, '/events/upload_stix')
response = self._prepare_request('POST', url, data=to_post, output_type='xml') # type: ignore
response = self._prepare_request('POST', url, data=to_post, output_type='xml', content_type='xml') # type: ignore
else:
url = urljoin(self.root_url, '/events/upload_stix/2')
response = self._prepare_request('POST', url, data=to_post) # type: ignore
@ -3389,7 +3389,7 @@ class PyMISP:
return f'<{self.__class__.__name__}(url={self.root_url})'
def _prepare_request(self, request_type: str, url: str, data: Union[str, Iterable, Mapping, AbstractMISP] = {}, params: Mapping = {},
kw_params: Mapping = {}, output_type: str = 'json') -> requests.Response:
kw_params: Mapping = {}, output_type: str = 'json', content_type: str = 'json') -> requests.Response:
'''Prepare a request for python-requests'''
url = urljoin(self.root_url, url)
if data == {} or isinstance(data, str):
@ -3419,7 +3419,7 @@ class PyMISP:
prepped.headers.update(
{'Authorization': self.key,
'Accept': f'application/{output_type}',
'content-type': 'application/json',
'content-type': 'application/{content_type}',
'User-Agent': user_agent})
logger.debug(prepped.headers)
settings = self.__session.merge_environment_settings(req.url, proxies=self.proxies or {}, stream=None,