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

Allow to pass a bytestream to upload_sample. 

Fix #101
pull/98/head
Raphaël Vinot 2017-07-18 11:26:09 +02:00
parent 9f595251d5
commit 59f9b37b5e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pymisp/api.py
View File

@ -685,16 +685,20 @@ class PyMISP(object):
to_post['request']['comment'] = comment to_post['request']['comment'] = comment
return to_post return to_post
def _encode_file_to_upload(self, path): def _encode_file_to_upload(self, filepath_or_bytes):
with open(path, 'rb') as f: if isinstance(filepath_or_bytes, basestring) and os.path.isfile(filepath_or_bytes):
return base64.b64encode(f.read()).decode() with open(filepath_or_bytes, 'rb') as f:
binblob = f.read()
else:
binblob = filepath_or_bytes
return base64.b64encode(binblob).decode()
def upload_sample(self, filename, filepath, event_id, distribution=None, def upload_sample(self, filename, filepath_or_bytes, event_id, distribution=None,
to_ids=True, category=None, comment=None, info=None, to_ids=True, category=None, comment=None, info=None,
analysis=None, threat_level_id=None): analysis=None, threat_level_id=None):
to_post = self._prepare_upload(event_id, distribution, to_ids, category, to_post = self._prepare_upload(event_id, distribution, to_ids, category,
comment, info, analysis, threat_level_id) comment, info, analysis, threat_level_id)
to_post['request']['files'] = [{'filename': filename, 'data': self._encode_file_to_upload(filepath)}] to_post['request']['files'] = [{'filename': filename, 'data': self._encode_file_to_upload(filepath_or_bytes)}]
return self._upload_sample(to_post) return self._upload_sample(to_post)
def upload_samplelist(self, filepaths, event_id, distribution=None, def upload_samplelist(self, filepaths, event_id, distribution=None,