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

fixed av-signature merge conflicts with upstream

pull/40/head
Thomas Gardner 2017-10-24 10:26:24 -04:00
parent 1c4933c1ce bbf3e45649
commit 6e36c162a4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
objects/file/definition.json
View File

@ -130,9 +130,22 @@
"disable_correlation": true, "disable_correlation": true,
"ui-priority": 0, "ui-priority": 0,
"misp-attribute": "text" "misp-attribute": "text"
},
"state": {
"misp-attribute": "text",
"ui-priority": 0,
"description": "State of the file",
"multiple": true,
"values_list": [
"Harmless",
"Signed",
"Revoked",
"Expired",
"Trusted"
]
} }
}, },
"version": 3, "version": 4,
"description": "File object describing a file with meta-information", "description": "File object describing a file with meta-information",
"meta-category": "file", "meta-category": "file",
"uuid": "688c46fb-5edb-40a3-8273-1af7923e2215", "uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",

2
tools/adoc_objects.py
View File

@ -87,7 +87,7 @@ def asciidoc(content=False, adoc=None, t='title',title=''):
disableCorrelation = 'icon:check[] ' disableCorrelation = 'icon:check[] '
if 'description' in content['attributes'][v]: if 'description' in content['attributes'][v]:
if content['attributes'][v]['description']: if content['attributes'][v]['description']:
values = '' description = '{}'.format(content['attributes'][v]['description'])
if 'values_list' in content['attributes'][v]: if 'values_list' in content['attributes'][v]:
values = content['attributes'][v]['values_list'] values = content['attributes'][v]['values_list']
description = '{} {}'.format(content['attributes'][v]['description'],values) description = '{} {}'.format(content['attributes'][v]['description'],values)