MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

fix date formatting in mispevent.py + some PEP8 cleaning

pull/34/head
Déborah Servili 2016-10-12 15:40:49 +02:00
parent bc5df41179
commit 9cc55341f0
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/events/tools.py
View File

@ -5,22 +5,27 @@ import random
from random import randint from random import randint
import string import string
def randomStringGenerator(size, chars=string.ascii_lowercase + string.digits): def randomStringGenerator(size, chars=string.ascii_lowercase + string.digits):
return ''.join(random.choice(chars) for _ in range(size)) return ''.join(random.choice(chars) for _ in range(size))
def randomIpGenerator(): def randomIpGenerator():
return str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255)) return str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255))
def floodtxt(misp, event, maxlength=255): def floodtxt(misp, event, maxlength=255):
text = randomStringGenerator(randint(1, maxlength)) text = randomStringGenerator(randint(1, maxlength))
textfunctions = [misp.add_internal_comment, misp.add_internal_text, misp.add_internal_other, misp.add_email_subject, misp.add_mutex, misp.add_filename] textfunctions = [misp.add_internal_comment, misp.add_internal_text, misp.add_internal_other, misp.add_email_subject, misp.add_mutex, misp.add_filename]
textfunctions[randint(0, 5)](event, text) textfunctions[randint(0, 5)](event, text)
def floodip(misp, event): def floodip(misp, event):
ip = randomIpGenerator() ip = randomIpGenerator()
ipfunctions = [misp.add_ipsrc, misp.add_ipdst] ipfunctions = [misp.add_ipsrc, misp.add_ipdst]
ipfunctions[randint(0, 1)](event, ip) ipfunctions[randint(0, 1)](event, ip)
def flooddomain(misp, event, maxlength=25): def flooddomain(misp, event, maxlength=25):
a = randomStringGenerator(randint(1, maxlength)) a = randomStringGenerator(randint(1, maxlength))
b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase) b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase)
@ -28,6 +33,7 @@ def flooddomain(misp, event, maxlength = 25):
domainfunctions = [misp.add_hostname, misp.add_domain] domainfunctions = [misp.add_hostname, misp.add_domain]
domainfunctions[randint(0, 1)](event, domain) domainfunctions[randint(0, 1)](event, domain)
def flooddomainip(misp, event, maxlength=25): def flooddomainip(misp, event, maxlength=25):
a = randomStringGenerator(randint(1, maxlength)) a = randomStringGenerator(randint(1, maxlength))
b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase) b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase)
@ -35,6 +41,7 @@ def flooddomainip(misp, event, maxlength = 25):
ip = randomIpGenerator() ip = randomIpGenerator()
misp.add_domain_ip(event, domain, ip) misp.add_domain_ip(event, domain, ip)
def floodemail(misp, event, maxlength=25): def floodemail(misp, event, maxlength=25):
a = randomStringGenerator(randint(1, maxlength)) a = randomStringGenerator(randint(1, maxlength))
b = randomStringGenerator(randint(1, maxlength)) b = randomStringGenerator(randint(1, maxlength))
@ -43,14 +50,17 @@ def floodemail(misp, event, maxlength = 25):
emailfunctions = [misp.add_email_src, misp.add_email_dst] emailfunctions = [misp.add_email_src, misp.add_email_dst]
emailfunctions[randint(0, 1)](event, email) emailfunctions[randint(0, 1)](event, email)
def floodattachment(misp, eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id): def floodattachment(misp, eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id):
filename = randomStringGenerator(randint(1, 128)) filename = randomStringGenerator(randint(1, 128))
misp.upload_sample(filename, 'dummy', eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id) misp.upload_sample(filename, 'dummy', eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id)
def create_dummy_event(misp): def create_dummy_event(misp):
event = misp.new_event(0, 4, 0, 'dummy event') event = misp.new_event(0, 4, 0, 'dummy event')
flooddomainip(misp, event) flooddomainip(misp, event)
floodattachment(misp, event['Event']['id'], event['Event']['id'], event['Event']['distribution'], False, 'Payload delivery', '', event['Event']['info'], event['Event']['analysis'], event['Event']['threat_level_id']) floodattachment(misp, event['Event']['id'], event['Event']['distribution'], False, 'Payload delivery', '', event['Event']['info'], event['Event']['analysis'], event['Event']['threat_level_id'])
def create_massive_dummy_events(misp, nbattribute): def create_massive_dummy_events(misp, nbattribute):
event = misp.new_event(0, 4, 0, 'massive dummy event') event = misp.new_event(0, 4, 0, 'massive dummy event')

2
pymisp/mispevent.py
View File

@ -254,7 +254,7 @@ class MISPEvent(object):
self.publish() self.publish()
if kwargs.get('date'): if kwargs.get('date'):
if isinstance(kwargs['date'], basestring): if isinstance(kwargs['date'], basestring):
self.date = parse(kwargs['date']) self.date = parse(kwargs['date']).date()
elif isinstance(kwargs['date'], datetime.datetime): elif isinstance(kwargs['date'], datetime.datetime):
self.date = kwargs['date'].date() self.date = kwargs['date'].date()
elif isinstance(kwargs['date'], datetime.date): elif isinstance(kwargs['date'], datetime.date):