diff --git a/.travis.yml b/.travis.yml index fbe3487..5653c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: python -cache: pip - services: - redis-server diff --git a/REQUIREMENTS b/REQUIREMENTS index 92a84d7..16f5512 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -12,6 +12,8 @@ pyeupi ipasn-redis asnhistory git+https://github.com/Rafiot/uwhoisd.git@testing#egg=uwhois&subdirectory=client +git+https://github.com/MISP/MISP-STIX-Converter.git#egg=misp_stix_converter +git+https://github.com/CIRCL/PyMISP.git#egg=pymisp pillow pytesseract SPARQLWrapper diff --git a/misp_modules/modules/import_mod/stiximport.py b/misp_modules/modules/import_mod/stiximport.py index 99e891c..39ac9dc 100755 --- a/misp_modules/modules/import_mod/stiximport.py +++ b/misp_modules/modules/import_mod/stiximport.py @@ -1,9 +1,5 @@ import json -import re import base64 -import hashlib -import tempfile -import os from pymisp.tools import stix @@ -36,16 +32,11 @@ def handler(q=False): if not package: return json.dumps({"success": 0}) - tfile = tempfile.NamedTemporaryFile(mode="w", prefix="STIX", delete=False) - tfile.write(package) - tfile.close() - - pkg = stix.load_stix(tfile.name) + pkg = stix.load_stix(package) for attrib in pkg.attributes: r["results"].append({ "values" : [attrib.value] , "types": [attrib.type], "categories": [attrib.category]}) - os.unlink(tfile.name) return r def introspection(): diff --git a/setup.py b/setup.py index 0010c05..3bdc180 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,5 @@ setup( 'pillow', 'pytesseract', 'shodan', - 'misp_stix_converter' ], )