diff --git a/setup.py b/setup.py index d8b4730..1a72b40 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='MISP_maltego', author='Christophe Vandeplas', # also update version in util.py - version='1.4.5', + version='1.4.6', author_email='christophe@vandeplas.com', maintainer='Christophe Vandeplas', url='https://github.com/MISP/MISP-maltego', diff --git a/src/MISP_maltego/transforms/attributetoevent.py b/src/MISP_maltego/transforms/attributetoevent.py index 2bbf629..daa507e 100644 --- a/src/MISP_maltego/transforms/attributetoevent.py +++ b/src/MISP_maltego/transforms/attributetoevent.py @@ -85,6 +85,7 @@ class SearchInMISP(Transform): # we need to do really rebuild the Entity from scratch as request.entity is of type Unknown # TODO First try to build the object, then only attributes (for those that are not in object, or for all?) + # TODO check for the right version of MISP before, it needs to be 2.4.127 or higher. # obj_json = conn.misp.search(controller='objects', value=request.entity.value, with_attachments=False) # for o in obj_json: # for item in attribute_to_entity(attr, only_self=True, link_label=link_label): diff --git a/src/MISP_maltego/transforms/common/util.py b/src/MISP_maltego/transforms/common/util.py index b49886b..9ae73aa 100644 --- a/src/MISP_maltego/transforms/common/util.py +++ b/src/MISP_maltego/transforms/common/util.py @@ -12,7 +12,7 @@ import requests import tempfile import time -__version__ = '1.4.5' # also update version in setup.py +__version__ = '1.4.6' # also update version in setup.py tag_note_prefixes = ['tlp:', 'PAP:', 'de-vs:', 'euci:', 'fr-classif:', 'nato:'] @@ -445,9 +445,9 @@ def galaxycluster_to_entity(c, link_label=None, link_direction=LinkDirection.Inp # LATER this uses the galaxies from github as the MISP web UI does not fully support the Galaxies in the webui. # See https://github.com/MISP/MISP/issues/3801 -galaxy_archive_url = 'https://github.com/MISP/misp-galaxy/archive/master.zip' +galaxy_archive_url = 'https://github.com/MISP/misp-galaxy/archive/main.zip' local_path_uuid_mapping = os.path.join(local_path_root, 'MISP_maltego_galaxy_mapping.json') -local_path_clusters = os.path.join(local_path_root, 'misp-galaxy-master', 'clusters') +local_path_clusters = os.path.join(local_path_root, 'misp-galaxy-main', 'clusters') galaxy_cluster_uuids = None @@ -480,6 +480,8 @@ def galaxy_update_local_copy(force=False): zf.extractall(local_path_root) zf.close() except Exception: + # remove the lock + os.remove(lockfile) raise(MaltegoException("ERROR: Could not download Galaxy data from htts://github.com/MISP/MISP-galaxy/. Please check internet connectivity.")) # generate the uuid mapping and save it to a file