From 200ac19bad9f107f707195159c51d125ef456108 Mon Sep 17 00:00:00 2001 From: VVX7 Date: Sun, 31 May 2020 09:52:49 -0400 Subject: [PATCH 1/3] chg: [dev] add object properties from #257 --- objects/twitter-account/definition.json | 60 +++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/objects/twitter-account/definition.json b/objects/twitter-account/definition.json index f17a6b6..2a05e48 100644 --- a/objects/twitter-account/definition.json +++ b/objects/twitter-account/definition.json @@ -13,6 +13,31 @@ "multiple": true, "ui-priority": 1 }, + "avatar": { + "description": "A screenshot or exported user avatar.", + "misp-attribute": "attachment", + "ui-priority": 1 + }, + "avatar-url": { + "description": "A link to the user's avatar.", + "misp-attribute": "url", + "ui-priority": 1 + }, + "background-image": { + "description": "A screenshot or exported user avatar.", + "misp-attribute": "attachment", + "ui-priority": 1 + }, + "background-image-url": { + "description": "A link to the user's background image.", + "misp-attribute": "url", + "ui-priority": 1 + }, + "bio": { + "description": "Displayed name.", + "misp-attribute": "text", + "ui-priority": 1 + }, "description": { "description": "A description of the user.", "disable_correlation": true, @@ -37,13 +62,13 @@ "ui-priority": 0 }, "followers": { - "description": "number of followers.", + "description": "Number of followers.", "disable_correlation": true, "misp-attribute": "text", "ui-priority": 1 }, - "friends": { - "description": "Number of friends.", + "following": { + "description": "Number of accounts this accounts is following.", "disable_correlation": true, "misp-attribute": "text", "ui-priority": 1 @@ -59,6 +84,12 @@ "misp-attribute": "text", "ui-priority": 1 }, + "likes": { + "description": "Number of likes this account has.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "link": { "description": "Original link to the user (supposed harmless).", "misp-attribute": "link", @@ -76,11 +107,32 @@ "misp-attribute": "text", "ui-priority": 1 }, + "media": { + "description": "Number of images and videos posted.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "name": { "description": "User's screen name (without the @).", "misp-attribute": "text", "ui-priority": 1 }, + "private": { + "description": "User verified.", + "misp-attribute": "text", + "sane_default": [ + "True", + "False" + ], + "ui-priority": 1 + }, + "tweets": { + "description": "Number of tweets posted.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "url": { "description": "Original URL location of the user (potentially malicious).", "misp-attribute": "url", @@ -107,5 +159,5 @@ "link" ], "uuid": "8066563f-881e-4f6a-9d6c-a9d15b8658bb", - "version": 1 + "version": 2 } \ No newline at end of file From 56bd29d829b15a852cd17bdc3c04ee38ec6e37cb Mon Sep 17 00:00:00 2001 From: VVX7 Date: Tue, 2 Jun 2020 11:08:30 -0400 Subject: [PATCH 2/3] chg: [dev] make twitter object attributes more consistent with twitter api --- objects/twitter-account/definition.json | 10 ++++---- objects/twitter-list/definition.json | 13 +++++++--- objects/twitter-post/definition.json | 34 +++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/objects/twitter-account/definition.json b/objects/twitter-account/definition.json index 2a05e48..0d15019 100644 --- a/objects/twitter-account/definition.json +++ b/objects/twitter-account/definition.json @@ -13,22 +13,22 @@ "multiple": true, "ui-priority": 1 }, - "avatar": { + "profile_image": { "description": "A screenshot or exported user avatar.", "misp-attribute": "attachment", "ui-priority": 1 }, - "avatar-url": { + "profile-image-url": { "description": "A link to the user's avatar.", "misp-attribute": "url", "ui-priority": 1 }, - "background-image": { + "profile-banner": { "description": "A screenshot or exported user avatar.", "misp-attribute": "attachment", "ui-priority": 1 }, - "background-image-url": { + "profile-banner-url": { "description": "A link to the user's background image.", "misp-attribute": "url", "ui-priority": 1 @@ -159,5 +159,5 @@ "link" ], "uuid": "8066563f-881e-4f6a-9d6c-a9d15b8658bb", - "version": 2 + "version": 3 } \ No newline at end of file diff --git a/objects/twitter-list/definition.json b/objects/twitter-list/definition.json index f264302..77d65a7 100644 --- a/objects/twitter-list/definition.json +++ b/objects/twitter-list/definition.json @@ -18,8 +18,15 @@ "misp-attribute": "text", "ui-priority": 1 }, - "displayed-name": { - "description": "Displayed name.", + "member-count": { + "description": "Number of accounts following this list.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "subscriber-count": { + "description": "Number of accounts subscribing to this list.", + "disable_correlation": true, "misp-attribute": "text", "ui-priority": 1 }, @@ -84,5 +91,5 @@ "link" ], "uuid": "7ae81d5c-d9d8-4812-88a7-5f14fba241da", - "version": 1 + "version": 2 } \ No newline at end of file diff --git a/objects/twitter-post/definition.json b/objects/twitter-post/definition.json index 80b04d8..f1eb4df 100644 --- a/objects/twitter-post/definition.json +++ b/objects/twitter-post/definition.json @@ -48,6 +48,12 @@ "multiple": true, "ui-priority": 0 }, + "geo": { + "description": "Geolocation data.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "language": { "description": "The language of the post.", "disable_correlation": true, @@ -76,6 +82,30 @@ "misp-attribute": "datetime", "ui-priority": 0 }, + "retweet-count": { + "description": "Number of retweets.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "favorite-count": { + "description": "Number of favorites.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "possibly-sensitive": { + "description": "Does this post contain sensitive content?", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "possibly-sensitive-appealable": { + "description": "Is the sensitive content of this post appealable?", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "source": { "description": "Source of tweet (android, web etc).", "misp-attribute": "text", @@ -92,7 +122,7 @@ "misp-attribute": "text", "ui-priority": 0 }, - "user-name": { + "name": { "description": "Name of the account that posted this tweet.", "misp-attribute": "text", "ui-priority": 0 @@ -116,5 +146,5 @@ "attachment" ], "uuid": "d1214031-ce1b-4a35-bd33-644c707bda2e", - "version": 1 + "version": 2 } \ No newline at end of file From 53d2a1881125ec08665257c7d91897b531ad6a10 Mon Sep 17 00:00:00 2001 From: VVX7 Date: Tue, 2 Jun 2020 11:11:43 -0400 Subject: [PATCH 3/3] chg: [dev] run validate_all/jq --- objects/twitter-account/definition.json | 40 ++++++++--------- objects/twitter-list/definition.json | 24 +++++----- objects/twitter-post/definition.json | 58 ++++++++++++------------- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/objects/twitter-account/definition.json b/objects/twitter-account/definition.json index 0d15019..a0bf654 100644 --- a/objects/twitter-account/definition.json +++ b/objects/twitter-account/definition.json @@ -13,26 +13,6 @@ "multiple": true, "ui-priority": 1 }, - "profile_image": { - "description": "A screenshot or exported user avatar.", - "misp-attribute": "attachment", - "ui-priority": 1 - }, - "profile-image-url": { - "description": "A link to the user's avatar.", - "misp-attribute": "url", - "ui-priority": 1 - }, - "profile-banner": { - "description": "A screenshot or exported user avatar.", - "misp-attribute": "attachment", - "ui-priority": 1 - }, - "profile-banner-url": { - "description": "A link to the user's background image.", - "misp-attribute": "url", - "ui-priority": 1 - }, "bio": { "description": "Displayed name.", "misp-attribute": "text", @@ -127,6 +107,26 @@ ], "ui-priority": 1 }, + "profile-banner": { + "description": "A screenshot or exported user avatar.", + "misp-attribute": "attachment", + "ui-priority": 1 + }, + "profile-banner-url": { + "description": "A link to the user's background image.", + "misp-attribute": "url", + "ui-priority": 1 + }, + "profile-image-url": { + "description": "A link to the user's avatar.", + "misp-attribute": "url", + "ui-priority": 1 + }, + "profile_image": { + "description": "A screenshot or exported user avatar.", + "misp-attribute": "attachment", + "ui-priority": 1 + }, "tweets": { "description": "Number of tweets posted.", "disable_correlation": true, diff --git a/objects/twitter-list/definition.json b/objects/twitter-list/definition.json index 77d65a7..2a33f0a 100644 --- a/objects/twitter-list/definition.json +++ b/objects/twitter-list/definition.json @@ -18,18 +18,6 @@ "misp-attribute": "text", "ui-priority": 1 }, - "member-count": { - "description": "Number of accounts following this list.", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, - "subscriber-count": { - "description": "Number of accounts subscribing to this list.", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, "embedded-link": { "description": "Link embedded in the description (potentially malicious).", "misp-attribute": "url", @@ -59,11 +47,23 @@ "misp-attribute": "link", "ui-priority": 1 }, + "member-count": { + "description": "Number of accounts following this list.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "name": { "description": "List's screen name (without the @).", "misp-attribute": "text", "ui-priority": 1 }, + "subscriber-count": { + "description": "Number of accounts subscribing to this list.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "url": { "description": "Original URL location of the list (potentially malicious).", "misp-attribute": "url", diff --git a/objects/twitter-post/definition.json b/objects/twitter-post/definition.json index f1eb4df..7e52081 100644 --- a/objects/twitter-post/definition.json +++ b/objects/twitter-post/definition.json @@ -24,6 +24,18 @@ "multiple": true, "ui-priority": 0 }, + "favorite-count": { + "description": "Number of favorites.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "geo": { + "description": "Geolocation data.", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "hashtag": { "description": "Hashtag embedded in the tweet", "misp-attribute": "text", @@ -48,12 +60,6 @@ "multiple": true, "ui-priority": 0 }, - "geo": { - "description": "Geolocation data.", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, "language": { "description": "The language of the post.", "disable_correlation": true, @@ -67,6 +73,23 @@ "multiple": true, "ui-priority": 1 }, + "name": { + "description": "Name of the account that posted this tweet.", + "misp-attribute": "text", + "ui-priority": 0 + }, + "possibly-sensitive": { + "description": "Does this post contain sensitive content?", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, + "possibly-sensitive-appealable": { + "description": "Is the sensitive content of this post appealable?", + "disable_correlation": true, + "misp-attribute": "text", + "ui-priority": 1 + }, "post": { "description": "Raw text of the post.", "misp-attribute": "text", @@ -88,24 +111,6 @@ "misp-attribute": "text", "ui-priority": 1 }, - "favorite-count": { - "description": "Number of favorites.", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, - "possibly-sensitive": { - "description": "Does this post contain sensitive content?", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, - "possibly-sensitive-appealable": { - "description": "Is the sensitive content of this post appealable?", - "disable_correlation": true, - "misp-attribute": "text", - "ui-priority": 1 - }, "source": { "description": "Source of tweet (android, web etc).", "misp-attribute": "text", @@ -122,11 +127,6 @@ "misp-attribute": "text", "ui-priority": 0 }, - "name": { - "description": "Name of the account that posted this tweet.", - "misp-attribute": "text", - "ui-priority": 0 - }, "username-quoted": { "description": "Username who is quoted in the tweet.", "misp-attribute": "text",