From 6a0a819aad5e1399a2d81ceb5d033d4d247a7442 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Wed, 12 Jun 2019 13:39:52 +0300 Subject: [PATCH] minor cleanups --- publish_to_pip.sh | 1 + setup.py | 4 ++-- src/MISP_maltego/resources/etc/MISP_maltego.conf | 2 -- src/MISP_maltego/transforms/common/util.py | 2 +- src/MISP_maltego/transforms/eventtoattributes.py | 2 ++ src/MISP_maltego/transforms/galaxytoevent.py | 10 ++++++++++ 6 files changed, 16 insertions(+), 5 deletions(-) mode change 100644 => 100755 publish_to_pip.sh diff --git a/publish_to_pip.sh b/publish_to_pip.sh old mode 100644 new mode 100755 index 3b87c40..a57a1d4 --- a/publish_to_pip.sh +++ b/publish_to_pip.sh @@ -2,3 +2,4 @@ python3 setup.py sdist bdist_wheel twine upload dist/* rm -Rf build +rm -Rf dist diff --git a/setup.py b/setup.py index 159b47c..07aacc7 100755 --- a/setup.py +++ b/setup.py @@ -5,11 +5,11 @@ from setuptools import setup, find_packages setup( name='MISP_maltego', author='Christophe Vandeplas', - version='1.3.2', + version='1.3.4', author_email='christophe@vandeplas.com', maintainer='Christophe Vandeplas', url='https://github.com/MISP/MISP-maltego', - description='Maltego transform for interacting with a MISP Threat Sharing community.', + description='Maltego transform for interacting with a MISP Threat Sharing community and with MITRE ATT&CK.', license='AGPLv3', packages=find_packages('src'), package_dir={'': 'src'}, diff --git a/src/MISP_maltego/resources/etc/MISP_maltego.conf b/src/MISP_maltego/resources/etc/MISP_maltego.conf index 24806b7..91339ba 100644 --- a/src/MISP_maltego/resources/etc/MISP_maltego.conf +++ b/src/MISP_maltego/resources/etc/MISP_maltego.conf @@ -6,5 +6,3 @@ misp_verify = True misp_debug = False [MISP_maltego.remote] - -# TODO: put remote transform options here diff --git a/src/MISP_maltego/transforms/common/util.py b/src/MISP_maltego/transforms/common/util.py index ab26bed..49b179d 100644 --- a/src/MISP_maltego/transforms/common/util.py +++ b/src/MISP_maltego/transforms/common/util.py @@ -8,7 +8,7 @@ import os.path import tempfile import time -# FIXME from galaxy to MISP Event is confusing +# FIXME from galaxy 'to MISP Event' is confusing # mapping_maltego_to_misp = { # 'maltego.Hash': ['md5', 'sha1', 'sha256', 'sha224', 'sha384', 'sha512', 'sha512/224', 'sha512/256'], diff --git a/src/MISP_maltego/transforms/eventtoattributes.py b/src/MISP_maltego/transforms/eventtoattributes.py index b8d71fa..27b2be9 100644 --- a/src/MISP_maltego/transforms/eventtoattributes.py +++ b/src/MISP_maltego/transforms/eventtoattributes.py @@ -16,6 +16,8 @@ __maintainer__ = 'Christophe Vandeplas' __email__ = 'christophe@vandeplas.com' __status__ = 'Development' +# FIXME have a more human readable version of the MISP event value in the graph. change entity + event_to_entity + do_transform + class EventToTransform(Transform): input_type = None diff --git a/src/MISP_maltego/transforms/galaxytoevent.py b/src/MISP_maltego/transforms/galaxytoevent.py index 4882d0b..a5f6755 100644 --- a/src/MISP_maltego/transforms/galaxytoevent.py +++ b/src/MISP_maltego/transforms/galaxytoevent.py @@ -16,6 +16,16 @@ __email__ = 'christophe@vandeplas.com' __status__ = 'Development' +class GalaxyTo(Transform): + input_type = None + + def __init__(self): + self.request = None + self.response = None + self.config = None + self.misp = None + + # @EnableDebugWindow class GalaxyToEvents(Transform): """Expands a Galaxy to multiple MISP Events."""