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

Add support for downloading unzipped samples.

pull/2/merge v1.11
Raphaël Vinot 2015-09-18 14:38:52 +02:00
parent a7c3d8869c
commit 11b3470167
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/__init__.py
View File

@ -1,3 +1,3 @@
__version__ = '1.10' __version__ = '1.11'
from .api import PyMISP from .api import PyMISP

19
pymisp/api.py
View File

@ -572,14 +572,19 @@ class PyMISP(object):
for f in result['result']: for f in result['result']:
decoded = base64.b64decode(f['base64']) decoded = base64.b64decode(f['base64'])
zipped = BytesIO(decoded) zipped = BytesIO(decoded)
archive = zipfile.ZipFile(zipped)
try: try:
# New format archive = zipfile.ZipFile(zipped)
unzipped = BytesIO(archive.open(f['md5'], pwd='infected').read()) try:
except KeyError: # New format
# Old format unzipped = BytesIO(archive.open(f['md5'], pwd='infected').read())
unzipped = BytesIO(archive.open(f['filename'], pwd='infected').read()) except KeyError:
details.append([f['event_id'], f['filename'], unzipped]) # Old format
unzipped = BytesIO(archive.open(f['filename'], pwd='infected').read())
details.append([f['event_id'], f['filename'], unzipped])
except zipfile.BadZipfile:
# In case the sample isn't zipped
details.append([f['event_id'], f['filename'], zipped])
return True, details return True, details
def download_last(self, last): def download_last(self, last):