mirror of https://github.com/MISP/misp-modules
Merge remote-tracking branch 'MISP/master'
# Conflicts: # misp_modules/modules/expansion/vmray_submit.py # misp_modules/modules/import_mod/vmray_import.pypull/69/head
commit
df69126485
|
@ -14,6 +14,7 @@ TODO:
|
||||||
import json
|
import json
|
||||||
import base64
|
import base64
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
import io
|
import io
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
@ -25,12 +26,16 @@ sys.path.append(base_dir)
|
||||||
from vmray_rest_api import VMRayRESTAPI, VMRayRESTAPIError
|
from vmray_rest_api import VMRayRESTAPI, VMRayRESTAPIError
|
||||||
|
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
>>>>>>> MISP/master
|
||||||
|
|
||||||
import io
|
import io
|
||||||
>>>>>>> upstream/master
|
>>>>>>> upstream/master
|
||||||
|
|
||||||
from ._vmray.vmray_rest_api import VMRayRESTAPI
|
from ._vmray.vmray_rest_api import VMRayRESTAPI
|
||||||
|
|
||||||
|
from ._vmray.vmray_rest_api import VMRayRESTAPI
|
||||||
|
|
||||||
misperrors = {'error': 'Error'}
|
misperrors = {'error': 'Error'}
|
||||||
mispattributes = {'input': ['attachment', 'malware-sample'], 'output': ['text', 'sha1', 'sha256', 'md5', 'link']}
|
mispattributes = {'input': ['attachment', 'malware-sample'], 'output': ['text', 'sha1', 'sha256', 'md5', 'link']}
|
||||||
moduleinfo = {'version': '0.2', 'author': 'Koen Van Impe',
|
moduleinfo = {'version': '0.2', 'author': 'Koen Van Impe',
|
||||||
|
@ -104,11 +109,15 @@ def handler(q=False):
|
||||||
if data and sample_filename:
|
if data and sample_filename:
|
||||||
args = {}
|
args = {}
|
||||||
args["shareable"] = shareable
|
args["shareable"] = shareable
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
args["sample_file"] = {'data': io.BytesIO( data ) , 'filename': sample_filename }
|
args["sample_file"] = {'data': io.BytesIO( data ) , 'filename': sample_filename }
|
||||||
=======
|
=======
|
||||||
args["sample_file"] = {'data': io.BytesIO(data), 'filename': attachment}
|
args["sample_file"] = {'data': io.BytesIO(data), 'filename': attachment}
|
||||||
>>>>>>> upstream/master
|
>>>>>>> upstream/master
|
||||||
|
=======
|
||||||
|
args["sample_file"] = {'data': io.BytesIO(data), 'filename': attachment}
|
||||||
|
>>>>>>> MISP/master
|
||||||
args["reanalyze"] = reanalyze
|
args["reanalyze"] = reanalyze
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -106,6 +106,7 @@ def handler(q=False):
|
||||||
url3 = "&sub=%2Freport%2Foverview.html"
|
url3 = "&sub=%2Freport%2Foverview.html"
|
||||||
p["results"].append({"values": url1 + url2 + url3, "types": "link"})
|
p["results"].append({"values": url1 + url2 + url3, "types": "link"})
|
||||||
vmray_results = {'results': vmray_results["results"] + p["results"]}
|
vmray_results = {'results': vmray_results["results"] + p["results"]}
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> upstream/master
|
>>>>>>> upstream/master
|
||||||
|
|
||||||
if include_analysisid:
|
if include_analysisid:
|
||||||
|
@ -115,6 +116,8 @@ def handler(q=False):
|
||||||
url3 = "&sub=%2Freport%2Foverview.html"
|
url3 = "&sub=%2Freport%2Foverview.html"
|
||||||
a_id["results"].append({ "values": url1 + url2 + url3, "types": "link" })
|
a_id["results"].append({ "values": url1 + url2 + url3, "types": "link" })
|
||||||
vmray_results = {'results': vmray_results["results"] + a_id["results"] }
|
vmray_results = {'results': vmray_results["results"] + a_id["results"] }
|
||||||
|
=======
|
||||||
|
>>>>>>> MISP/master
|
||||||
|
|
||||||
# Clean up (remove doubles)
|
# Clean up (remove doubles)
|
||||||
if vti_patterns_found:
|
if vti_patterns_found:
|
||||||
|
|
Loading…
Reference in New Issue