some "fixes"

pull/38/head
Sascha Rommelfangen 2019-07-18 12:46:31 +02:00
parent f19006e56d
commit 96594e97ec
2 changed files with 8 additions and 8 deletions

View File

@ -246,7 +246,7 @@ class Mail2MISP():
if self.debug: if self.debug:
syslog.syslog(domainname) syslog.syslog(domainname)
if domainname in self.config.internallist: # Add link to internal reference if domainname.decode('utf-8') in self.config.internallist: # Add link to internal reference
attribute = self.misp_event.add_attribute('link', entry, category='Internal reference', attribute = self.misp_event.add_attribute('link', entry, category='Internal reference',
to_ids=False, enforceWarninglist=False) to_ids=False, enforceWarninglist=False)
if email_object: if email_object:
@ -368,14 +368,15 @@ class Mail2MISP():
self.sighting(value, source) self.sighting(value, source)
return event return event
def update_event(self, event_id=None): def update_event(self, eid=None):
'''Update event on the remote MISP instance.''' '''Update event on the remote MISP instance.'''
if self.offline: if self.offline:
return self.misp_event.to_json() return self.misp_event.to_json()
event = self.misp.update_event(self.misp_event, event_id=event_id) event = self.misp.update_event(eid, self.misp_event)
if self.config.sighting: syslog.syslog(str(event))
for value, source in self.sightings_to_add: #if self.config.sighting:
self.sighting(value, source) # for value, source in self.sightings_to_add:
# self.sighting(value, source)
return event return event

View File

@ -68,8 +68,7 @@ if __name__ == '__main__':
mail2misp.process_body_iocs() mail2misp.process_body_iocs()
if args.event: if args.event:
misp_event = args.event mail2misp.update_event(eid=args.event)
mail2misp.update_event(event_id=misp_event)
else: else:
mail2misp.add_event() mail2misp.add_event()
syslog.syslog("Job finished.") syslog.syslog("Job finished.")