From 3426ad13c5de981bf50dd8c58277e44517ec875e Mon Sep 17 00:00:00 2001 From: Sebdraven Date: Tue, 20 Apr 2021 14:05:51 +0200 Subject: [PATCH] Update yeti.py fix edges --- misp_modules/modules/expansion/yeti.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/misp_modules/modules/expansion/yeti.py b/misp_modules/modules/expansion/yeti.py index 1288838..e7ee859 100644 --- a/misp_modules/modules/expansion/yeti.py +++ b/misp_modules/modules/expansion/yeti.py @@ -39,9 +39,9 @@ class Yeti(): def get_neighboors(self, obs_id): neighboors = self.yeti_client.neighbors_observables(obs_id) if neighboors and 'objs' in neighboors: - links_by_id = {link['dst']['id']: link['description'] for link in neighboors['links'] + links_by_id = {link['dst']['id']: (link['description'],'dst') for link in neighboors['links'] if link['dst']['id'] != obs_id} - links_by_id.update({link['src']['id']: link['description'] for link in neighboors['links'] + links_by_id.update({link['src']['id']: (link['description'], 'src') for link in neighboors['links'] if link['src']['id'] != obs_id}) for n in neighboors['objs']: @@ -85,11 +85,11 @@ class Yeti(): if object_misp_url: self.misp_event.add_object(object_misp_url) continue - if link == 'NS record': + if link[0] == 'NS record' and link[1] == 'dst': object_ns_record = self.__get_object_ns_record(obs_to_add) self.misp_event.add_object(object_ns_record) continue - self.__get_attribute(obs_to_add, link) + self.__get_attribute(obs_to_add, link[0]) def get_result(self): event = json.loads(self.misp_event.to_json()) @@ -115,7 +115,7 @@ class Yeti(): self.misp_event.add_attribute_tag(t['name'], attr['uuid']) def __get_object_domain_ip(self, obj_to_add): - if (obj_to_add['type'] == 'Ip' and self.attribute['type'] in ['hostname','domain']) or\ + if (obj_to_add['type'] == 'Ip' and self.attribute['type'] in ['hostname', 'domain']) or\ (obj_to_add['type'] in ('Hostname', 'Domain') and self.attribute['type'] in ('ip-src', 'ip-dst')): domain_ip_object = MISPObject('domain-ip') domain_ip_object.add_attribute(self.__get_relation(obj_to_add),