diff --git a/objects/email/definition.json b/objects/email/definition.json index 770850f..7551d0c 100644 --- a/objects/email/definition.json +++ b/objects/email/definition.json @@ -3,7 +3,7 @@ "uuid": "a0c666e0-fc65-4be8-b48f-3423d788b552", "meta-category": "network", "description": "Email object describing an email with meta-information", - "version": 8, + "version": 10, "attributes": { "reply-to": { "description": "Email address the reply will be sent to", @@ -146,6 +146,11 @@ "categories": [ "Payload delivery" ] + }, + "eml": { + "description": "Full EML", + "misp-attribute": "attachment", + "ui-priority": 1 } }, "requiredOneOf": [ @@ -163,6 +168,8 @@ "thread-index", "header", "x-mailer", - "return-path" + "return-path", + "email-body", + "eml" ] } diff --git a/objects/whois/definition.json b/objects/whois/definition.json index 0c4d5b0..ed91c86 100644 --- a/objects/whois/definition.json +++ b/objects/whois/definition.json @@ -74,6 +74,7 @@ "External analysis" ], "ui-priority": 0, + "multiple": true, "misp-attribute": "domain" }, "comment": { @@ -84,10 +85,11 @@ "ip-address": { "description": "IP address of the whois entry", "ui-priority": 0, + "multiple": true, "misp-attribute": "ip-src" } }, - "version": 9, + "version": 10, "description": "Whois records information for a domain name or an IP address.", "meta-category": "network", "uuid": "429faea1-34ff-47af-8a00-7c62d3be5a6a", diff --git a/relationships/definition.json b/relationships/definition.json index ae5f3db..d238116 100644 --- a/relationships/definition.json +++ b/relationships/definition.json @@ -33,6 +33,22 @@ "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", "description": "This referenced source is attributed to the target object.",