From 609e7394dbaba85ab284e77f133b3a27455b43d1 Mon Sep 17 00:00:00 2001
From: Paul Agbabian <pagbabian@splunk.com>
Date: Thu, 3 Oct 2024 08:16:35 -0700
Subject: [PATCH] Added vendor_name and model to the device object.   (#1188)

#### Related Issue:

#### Description of changes:
The `Device` object was missing the vendor and model of the device,
which is not the same as the vendor of the embedded hardware information
(usually BIOS vendor etc.).

Adjusted the descriptions in dictionary to be See specific usage for
model to not be only for peripheral device.

---------

Signed-off-by: Paul Agbabian <pagbabian@splunk.com>
---
 CHANGELOG.md                   | 1 +
 dictionary.json                | 2 +-
 objects/device.json            | 8 ++++++++
 objects/peripheral_device.json | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dbaa3923..0370e916a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ Thankyou! -->
     7. Added `src_url` to the `cvss` object. #1176
     8. Added `advisory`, `exploit_last_seen_time` to the `vulnerability` object. #1176
     9. Added `related_cwes` to the `cve` object. #1176
+    10. Added `vendor_name` and `model` to `device` object.
 
 ### Bugfixes
 1. Added sibling definition to `confidence_id` in dictionary, accurately associating `confidence` as its sibling. #1180
diff --git a/dictionary.json b/dictionary.json
index 03f7abcdc..db475eda3 100644
--- a/dictionary.json
+++ b/dictionary.json
@@ -2944,7 +2944,7 @@
     },
     "model": {
       "caption": "Model",
-      "description": "The peripheral device model.",
+      "description": "The model name of an entity. See specific usage.",
       "type": "string_t"
     },
     "modified_time": {
diff --git a/objects/device.json b/objects/device.json
index 7bf056392..6b85a2431 100644
--- a/objects/device.json
+++ b/objects/device.json
@@ -74,6 +74,10 @@
       "description": "The time when the device was last known to have been modified.",
       "requirement": "optional"
     },
+    "model": {
+      "description": "The model of the device. For example <code>ThinkPad X1 Carbon</code>.",
+      "requirement": "optional"
+    },
     "name": {
       "description": "The alternate device name, ordinarily as assigned by an administrator. <p><b>Note:</b> The <b>Name</b> could be any other string that helps to identify the device, such as a phone number; for example <code>310-555-1234</code>.</p>",
       "requirement": "optional"
@@ -116,6 +120,10 @@
     "uid_alt": {
       "description": "An alternate unique identifier of the device if any. For example the ActiveDirectory DN.",
       "requirement": "optional"
+    },
+    "vendor_name": {
+      "description": "The vendor for the device. For example <code>Dell</code> or <code>Lenovo</code>.",
+      "requirement": "recommended"
     }
   }
 }
diff --git a/objects/peripheral_device.json b/objects/peripheral_device.json
index 5a350ebce..17135948a 100644
--- a/objects/peripheral_device.json
+++ b/objects/peripheral_device.json
@@ -9,6 +9,7 @@
       "requirement": "required"
     },
     "model": {
+      "description": "The peripheral device model.",
       "requirement": "recommended"
     },
     "name": {