Merge pull request #1 from MISP/master

merge
pull/181/head
ater49 2018-04-27 16:39:49 +02:00 committed by GitHub
commit 39f85cc743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 3 deletions

View File

@ -3,7 +3,7 @@
"uuid": "a0c666e0-fc65-4be8-b48f-3423d788b552", "uuid": "a0c666e0-fc65-4be8-b48f-3423d788b552",
"meta-category": "network", "meta-category": "network",
"description": "Email object describing an email with meta-information", "description": "Email object describing an email with meta-information",
"version": 8, "version": 10,
"attributes": { "attributes": {
"reply-to": { "reply-to": {
"description": "Email address the reply will be sent to", "description": "Email address the reply will be sent to",
@ -146,6 +146,11 @@
"categories": [ "categories": [
"Payload delivery" "Payload delivery"
] ]
},
"eml": {
"description": "Full EML",
"misp-attribute": "attachment",
"ui-priority": 1
} }
}, },
"requiredOneOf": [ "requiredOneOf": [
@ -163,6 +168,8 @@
"thread-index", "thread-index",
"header", "header",
"x-mailer", "x-mailer",
"return-path" "return-path",
"email-body",
"eml"
] ]
} }

View File

@ -74,6 +74,7 @@
"External analysis" "External analysis"
], ],
"ui-priority": 0, "ui-priority": 0,
"multiple": true,
"misp-attribute": "domain" "misp-attribute": "domain"
}, },
"comment": { "comment": {
@ -84,10 +85,11 @@
"ip-address": { "ip-address": {
"description": "IP address of the whois entry", "description": "IP address of the whois entry",
"ui-priority": 0, "ui-priority": 0,
"multiple": true,
"misp-attribute": "ip-src" "misp-attribute": "ip-src"
} }
}, },
"version": 9, "version": 10,
"description": "Whois records information for a domain name or an IP address.", "description": "Whois records information for a domain name or an IP address.",
"meta-category": "network", "meta-category": "network",
"uuid": "429faea1-34ff-47af-8a00-7c62d3be5a6a", "uuid": "429faea1-34ff-47af-8a00-7c62d3be5a6a",

View File

@ -33,6 +33,22 @@
"stix-1.1" "stix-1.1"
] ]
}, },
{
"name": "contains",
"description": "The references source is containing the target object.",
"format": [
"misp",
"stix-1.1"
]
},
{
"name": "resolved-to",
"description": "The referenced source is resolved to the target object.",
"format": [
"misp",
"stix-1.1"
]
},
{ {
"name": "attributed-to", "name": "attributed-to",
"description": "This referenced source is attributed to the target object.", "description": "This referenced source is attributed to the target object.",