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

Merge remote-tracking branch 'MISP/master' 

# Conflicts:
#	misp_modules/modules/expansion/vmray_submit.py
#	misp_modules/modules/import_mod/vmray_import.py
pull/69/head
Koen Van Impe 2016-11-18 18:10:24 +01:00
parent 9d48571566 5624104b77
commit df69126485
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misp_modules/modules/expansion/vmray_submit.py
View File

@ -14,6 +14,7 @@ TODO:
import json
import base64
<<<<<<< HEAD
<<<<<<< HEAD
import io
import sys
import os
@ -25,12 +26,16 @@ sys.path.append(base_dir)
from vmray_rest_api import VMRayRESTAPI, VMRayRESTAPIError
=======
=======
>>>>>>> MISP/master
import io
>>>>>>> upstream/master
from ._vmray.vmray_rest_api import VMRayRESTAPI
from ._vmray.vmray_rest_api import VMRayRESTAPI
misperrors = {'error': 'Error'}
mispattributes = {'input': ['attachment', 'malware-sample'], 'output': ['text', 'sha1', 'sha256', 'md5', 'link']}
moduleinfo = {'version': '0.2', 'author': 'Koen Van Impe',
@ -104,11 +109,15 @@ def handler(q=False):
if data and sample_filename:
args = {}
args["shareable"] = shareable
<<<<<<< HEAD
<<<<<<< HEAD
args["sample_file"] = {'data': io.BytesIO( data ) , 'filename': sample_filename }
=======
args["sample_file"] = {'data': io.BytesIO(data), 'filename': attachment}
>>>>>>> upstream/master
=======
args["sample_file"] = {'data': io.BytesIO(data), 'filename': attachment}
>>>>>>> MISP/master
args["reanalyze"] = reanalyze
try:

3
misp_modules/modules/import_mod/vmray_import.py
View File

@ -106,6 +106,7 @@ def handler(q=False):
url3 = "&sub=%2Freport%2Foverview.html"
p["results"].append({"values": url1 + url2 + url3, "types": "link"})
vmray_results = {'results': vmray_results["results"] + p["results"]}
<<<<<<< HEAD
>>>>>>> upstream/master
if include_analysisid:
@ -115,6 +116,8 @@ def handler(q=False):
url3 = "&sub=%2Freport%2Foverview.html"
a_id["results"].append({ "values": url1 + url2 + url3, "types": "link" })
vmray_results = {'results': vmray_results["results"] + a_id["results"] }
=======
>>>>>>> MISP/master
# Clean up (remove doubles)
if vti_patterns_found: