Merge pull request #226 from VVX7/master

chg: [object fields] allow additional requiredOneOf fields
pull/235/head
Alexandre Dulaunoy 2020-02-03 06:36:33 +01:00 committed by GitHub
commit 01ac551cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 12 deletions

View File

@ -1,6 +1,10 @@
{
"requiredOneOf": [
"post"
"post",
"archive",
"url",
"link",
"attachment"
],
"attributes": {
"post": {
@ -94,7 +98,7 @@
"misp-attribute": "text"
}
},
"version": 13,
"version": 14,
"description": "Blog post like Medium or WordPress.",
"meta-category": "misc",
"uuid": "1f165fc0-b158-498f-8bc8-6dc3d2822bb1",

View File

@ -1,6 +1,7 @@
{
"requiredOneOf": [
"attachment",
"archive",
"document-text"
],
"attributes": {
@ -98,7 +99,7 @@
"misp-attribute": "datetime"
}
},
"version": 6,
"version": 7,
"description": "Object describing a meme (image).",
"meta-category": "file",
"uuid": "6f6c3b61-f085-475e-93df-2e2d9c2fb0f6",

View File

@ -1,6 +1,10 @@
{
"requiredOneOf": [
"post"
"post",
"archive",
"url",
"link",
"attachment"
],
"attributes": {
"post": {
@ -124,7 +128,7 @@
"multiple": true
}
},
"version": 17,
"version": 18,
"description": "Microblog post like a Twitter tweet or a post on a Facebook wall.",
"meta-category": "misc",
"uuid": "8ec8c911-ddbe-4f5b-895b-fbff70c42a60",

View File

@ -1,18 +1,23 @@
{
"requiredOneOf": [
"name",
"alias"
"alias",
"archive",
"url",
"link",
"attachment"
],
"attributes": {
"name": {
"description": "Name of the news agency.",
"disable_correlation": false,
"disable_correlation": true,
"ui-priority": 100,
"misp-attribute": "text"
},
"alias": {
"description": "Alias of the news agency.",
"ui-priority": 99,
"disable_correlation": true,
"misp-attribute": "text",
"multiple": true
},
@ -65,7 +70,7 @@
"multiple": true
}
},
"version": 1,
"version": 2,
"description": "News agencies compile news and disseminate news in bulk.",
"meta-category": "misc",
"uuid": "92b3f7fd-c4bc-42af-a73b-033ace439622",

View File

@ -1,21 +1,32 @@
{
"requiredOneOf": [
"source",
"alias"
"alias",
"archive",
"content",
"url",
"link",
"attachment"
],
"attributes": {
"source": {
"description": "Name of the news source.",
"disable_correlation": false,
"disable_correlation": true,
"ui-priority": 100,
"misp-attribute": "text"
},
"alias": {
"description": "Alias of the news source.",
"ui-priority": 99,
"disable_correlation": true,
"misp-attribute": "text",
"multiple": true
},
"username": {
"description": "Username who posted the blog post.",
"ui-priority": 0,
"misp-attribute": "text"
},
"content": {
"description": "Raw content of the news.",
"ui-priority": 1,
@ -112,6 +123,18 @@
"misp-attribute": "text",
"multiple": true
},
"embedded-link": {
"description": "Site linked by the blog post.",
"ui-priority": 0,
"misp-attribute": "url",
"multiple": true
},
"embedded-safe-link": {
"description": "Safe site linked by the blog post.",
"ui-priority": 0,
"misp-attribute": "link",
"multiple": true
},
"e-mail": {
"description": "Email address of the news source.",
"ui-priority": 10,
@ -119,8 +142,8 @@
"multiple": true
}
},
"version": 1,
"description": "News media are forms of mass media deliverings news to the general public.",
"version": 2,
"description": "News media are forms of mass media delivering news to the general public.",
"meta-category": "misc",
"uuid": "691463c5-5302-4847-9bec-4c56ccfec677",
"name": "news-media"