Merge pull request #122 from truckydev/master

Add tags on import with ioc import module
pull/124/head
Alexandre Dulaunoy 2017-05-11 10:27:42 +02:00 committed by GitHub
commit a510098b10
1 changed files with 27 additions and 14 deletions

View File

@ -5,17 +5,22 @@ from pymisp.tools import openioc
misperrors = {'error': 'Error'} misperrors = {'error': 'Error'}
userConfig = { userConfig = {
'not save ioc': { 'not save ioc': {
'type': 'Boolean', 'type': 'Boolean',
'message': 'If you check this box, IOC file will not save as an attachment in MISP' 'message': 'If you check this box, IOC file will not save as an attachment in MISP'
} },
} 'default tag': {
'type': 'String',
'message': 'Add tags spaced by a comma (tlp:white,misp:threat-level="no-risk")',
'validation' : '0'
}
}
inputSource = ['file'] inputSource = ['file']
moduleinfo = {'version': '0.1', 'author': 'Raphaël Vinot', moduleinfo = {'version': '0.1', 'author': 'Raphaël Vinot',
'description': 'Import OpenIOC package', 'description': 'Import OpenIOC package',
'module-type': ['import']} 'module-type': ['import']}
moduleconfig = [] moduleconfig = []
@ -42,24 +47,32 @@ def handler(q=False):
if q.get('config'): if q.get('config'):
if q['config'].get('not save ioc') == "0": if q['config'].get('not save ioc') == "0":
addFile = {
# add origin file as attachment
if q.get("filename"):
r["results"].append({
"values": [q.get('filename')], "values": [q.get('filename')],
"types": ['attachment'], "types": ['attachment'],
"categories": ['Support Tool'], "categories": ['Support Tool'],
"data" : q.get('data'), "data" : q.get('data'),
}) }
# add tag
if q['config'].get('default tag') is not None:
addFile["tags"] = q['config']['default tag'].split(",")
# add file as attachment
r["results"].append(addFile)
# return all attributes # return all attributes
for attrib in pkg.attributes: for attrib in pkg.attributes:
r["results"].append({ toAppend = {
"values": [attrib.value], "values": [attrib.value],
"types": [attrib.type], "types": [attrib.type],
"categories": [attrib.category], "categories": [attrib.category],
"comment":attrib.comment}) "comment":attrib.comment
}
# add tag
if q['config'].get('default tag') is not None:
toAppend["tags"] = q['config']['default tag'].split(",")
r["results"].append(toAppend)
return r return r