From 5e7152714b6be98560ba567d08f2e2d5c17f685c Mon Sep 17 00:00:00 2001 From: Pauline Bourmeau Date: Thu, 3 Sep 2020 09:41:12 +0200 Subject: [PATCH 1/8] first addition of keybase object --- objects/keybase-account/definition.json | 50 +++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 objects/keybase-account/definition.json diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json new file mode 100644 index 0000000..390770e --- /dev/null +++ b/objects/keybase-account/definition.json @@ -0,0 +1,50 @@ +{ + "name": "keybase-account", + "meta-category": "", + "description": "Information related to a keybase account, from API Users Object", + "version": 1, + "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", + "attributes" : + { + "uid": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "username": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "full_name": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "location": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "bio": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "emails": { + "misp-attribute": "text", + "multiple": true, + "ui-priority" : 1 + }, + "public_keys": { + "misp-attribute": "text", + "multiple": true, ##fingerprint, bundle + "ui-priority": 1 + }, + "private_keys": { + "misp-attribute": "text", + "multiple": true, ##fingerprint, bundle + "ui-priority": 1 + }, + "cryptocurrency_addresses": { + "misp-attribute": "btc", + "multiple": true, + "ui-priority": 1 + } + } +} From a3fd21d39d40d109131e57c8810e6f41e03b4fc5 Mon Sep 17 00:00:00 2001 From: Pauline Bourmeau Date: Thu, 3 Sep 2020 10:02:30 +0200 Subject: [PATCH 2/8] fixed comments --- objects/keybase-account/definition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index 390770e..298ecdc 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -33,12 +33,12 @@ }, "public_keys": { "misp-attribute": "text", - "multiple": true, ##fingerprint, bundle + "multiple": true, "ui-priority": 1 }, "private_keys": { "misp-attribute": "text", - "multiple": true, ##fingerprint, bundle + "multiple": true, "ui-priority": 1 }, "cryptocurrency_addresses": { From 3224f78d4ff6b40bd34fe25f4f7f6b2d2d12eed6 Mon Sep 17 00:00:00 2001 From: Pauline Bourmeau Date: Thu, 3 Sep 2020 11:00:38 +0200 Subject: [PATCH 3/8] added description field in attributes --- objects/keybase-account/definition.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index 298ecdc..b23ff62 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -1,47 +1,56 @@ { "name": "keybase-account", - "meta-category": "", - "description": "Information related to a keybase account, from API Users Object", - "version": 1, - "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", - "attributes" : + "meta-category": "", + "description": "Information related to a keybase account, from API Users Object", + "version": 1, + "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", + "attributes" : { "uid": { + "description": "uid", "misp-attribute": "text", "ui-priority": 1 }, "username": { + "description": "Username", "misp-attribute": "text", "ui-priority": 1 }, "full_name": { + "description": "Full name", "misp-attribute": "text", "ui-priority": 1 }, "location": { + "description": "Location", "misp-attribute": "text", "ui-priority": 1 }, "bio": { + "description": "Biography", "misp-attribute": "text", "ui-priority": 1 }, "emails": { + "description": "Verified emails", "misp-attribute": "text", "multiple": true, "ui-priority" : 1 }, "public_keys": { + "description": "OpenPGP public keys", "misp-attribute": "text", "multiple": true, "ui-priority": 1 }, "private_keys": { + "description": "OpenPGP private keys", "misp-attribute": "text", "multiple": true, "ui-priority": 1 }, "cryptocurrency_addresses": { + "description": "Cryptocurrency addresses", "misp-attribute": "btc", "multiple": true, "ui-priority": 1 From 496f4bd03063b012bf29c268568608fd7b9a43a4 Mon Sep 17 00:00:00 2001 From: Pauline Bourmeau Date: Thu, 3 Sep 2020 11:05:21 +0200 Subject: [PATCH 4/8] jq-ed file --- objects/keybase-account/definition.json | 59 ------------------------- 1 file changed, 59 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index b23ff62..e69de29 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -1,59 +0,0 @@ -{ - "name": "keybase-account", - "meta-category": "", - "description": "Information related to a keybase account, from API Users Object", - "version": 1, - "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", - "attributes" : - { - "uid": { - "description": "uid", - "misp-attribute": "text", - "ui-priority": 1 - }, - "username": { - "description": "Username", - "misp-attribute": "text", - "ui-priority": 1 - }, - "full_name": { - "description": "Full name", - "misp-attribute": "text", - "ui-priority": 1 - }, - "location": { - "description": "Location", - "misp-attribute": "text", - "ui-priority": 1 - }, - "bio": { - "description": "Biography", - "misp-attribute": "text", - "ui-priority": 1 - }, - "emails": { - "description": "Verified emails", - "misp-attribute": "text", - "multiple": true, - "ui-priority" : 1 - }, - "public_keys": { - "description": "OpenPGP public keys", - "misp-attribute": "text", - "multiple": true, - "ui-priority": 1 - }, - "private_keys": { - "description": "OpenPGP private keys", - "misp-attribute": "text", - "multiple": true, - "ui-priority": 1 - }, - "cryptocurrency_addresses": { - "description": "Cryptocurrency addresses", - "misp-attribute": "btc", - "multiple": true, - "ui-priority": 1 - } - } -} From 2e5d994deb0b62c4434021f55066c99477b48991 Mon Sep 17 00:00:00 2001 From: Pauline Bourmeau Date: Thu, 3 Sep 2020 11:55:31 +0200 Subject: [PATCH 5/8] Revert "added description field in attributes" This reverts commit 3224f78d4ff6b40bd34fe25f4f7f6b2d2d12eed6. --- objects/keybase-account/definition.json | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index e69de29..ce9f1fb 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -0,0 +1,53 @@ +<<<<<<< HEAD +======= +{ + "name": "keybase-account", + "meta-category": "", + "description": "Information related to a keybase account, from API Users Object", + "version": 1, + "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", + "attributes" : + { + "uid": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "username": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "full_name": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "location": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "bio": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "emails": { + "misp-attribute": "text", + "multiple": true, + "ui-priority" : 1 + }, + "public_keys": { + "misp-attribute": "text", + "multiple": true, + "ui-priority": 1 + }, + "private_keys": { + "misp-attribute": "text", + "multiple": true, + "ui-priority": 1 + }, + "cryptocurrency_addresses": { + "misp-attribute": "btc", + "multiple": true, + "ui-priority": 1 + } + } +} +>>>>>>> parent of 3224f78... added description field in attributes From 1d870bf2385d97ba5e277d0726a20bb2013b5862 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Thu, 3 Sep 2020 12:01:26 +0200 Subject: [PATCH 6/8] chg: [restore] file --- objects/keybase-account/definition.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index ce9f1fb..298ecdc 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= { "name": "keybase-account", "meta-category": "", @@ -50,4 +48,3 @@ } } } ->>>>>>> parent of 3224f78... added description field in attributes From ae3158e3fa0bb05fcb8b7634875fb3a927451dcc Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Thu, 3 Sep 2020 12:02:37 +0200 Subject: [PATCH 7/8] chg: [keybase] updated --- objects/keybase-account/definition.json | 97 ++++++++++++------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index 298ecdc..68818f7 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -1,50 +1,49 @@ { - "name": "keybase-account", - "meta-category": "", - "description": "Information related to a keybase account, from API Users Object", - "version": 1, - "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", - "attributes" : - { - "uid": { - "misp-attribute": "text", - "ui-priority": 1 - }, - "username": { - "misp-attribute": "text", - "ui-priority": 1 - }, - "full_name": { - "misp-attribute": "text", - "ui-priority": 1 - }, - "location": { - "misp-attribute": "text", - "ui-priority": 1 - }, - "bio": { - "misp-attribute": "text", - "ui-priority": 1 - }, - "emails": { - "misp-attribute": "text", - "multiple": true, - "ui-priority" : 1 - }, - "public_keys": { - "misp-attribute": "text", - "multiple": true, - "ui-priority": 1 - }, - "private_keys": { - "misp-attribute": "text", - "multiple": true, - "ui-priority": 1 - }, - "cryptocurrency_addresses": { - "misp-attribute": "btc", - "multiple": true, - "ui-priority": 1 - } - } -} + "attributes": { + "bio": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "cryptocurrency_addresses": { + "misp-attribute": "btc", + "multiple": true, + "ui-priority": 1 + }, + "emails": { + "misp-attribute": "text", + "multiple": true, + "ui-priority": 1 + }, + "full_name": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "location": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "private_keys": { + "misp-attribute": "text", + "multiple": true, + "ui-priority": 1 + }, + "public_keys": { + "misp-attribute": "text", + "multiple": true, + "ui-priority": 1 + }, + "uid": { + "misp-attribute": "text", + "ui-priority": 1 + }, + "username": { + "misp-attribute": "text", + "ui-priority": 1 + } + }, + "description": "Information related to a keybase account, from API Users Object", + "meta-category": "", + "name": "keybase-account", + "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", + "version": 1 +} \ No newline at end of file From 46b6f79cfd346709d8b137471d82d1c07ad92769 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Thu, 3 Sep 2020 12:08:13 +0200 Subject: [PATCH 8/8] chg: [keybase] description updated --- objects/keybase-account/definition.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json index 68818f7..5d4c8b9 100644 --- a/objects/keybase-account/definition.json +++ b/objects/keybase-account/definition.json @@ -2,42 +2,51 @@ "attributes": { "bio": { "misp-attribute": "text", - "ui-priority": 1 + "ui-priority": 1, + "description": "Bio of the keybase user" }, "cryptocurrency_addresses": { "misp-attribute": "btc", "multiple": true, + "description": "Associated cryptocurrency address with the keybase user", "ui-priority": 1 }, "emails": { "misp-attribute": "text", "multiple": true, + "description": "Emails associated with the keybase user", "ui-priority": 1 }, "full_name": { "misp-attribute": "text", + "description": "Full name", "ui-priority": 1 }, "location": { "misp-attribute": "text", + "description": "Location", "ui-priority": 1 }, "private_keys": { "misp-attribute": "text", "multiple": true, + "description": "OpenPGP private keys associated with the keybase user", "ui-priority": 1 }, "public_keys": { "misp-attribute": "text", + "description": "OpenPGP public keys associated with the keybase user", "multiple": true, "ui-priority": 1 }, "uid": { "misp-attribute": "text", + "description": "Keybase user identifier", "ui-priority": 1 }, "username": { "misp-attribute": "text", + "description": "Keybase username", "ui-priority": 1 } }, @@ -46,4 +55,4 @@ "name": "keybase-account", "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd", "version": 1 -} \ No newline at end of file +}