Merge pull request #29 from JupiterOne/DEVICE-23-lastSeenOn

DEVICE-23 - Add new properties to `addigy_hostagent`
JupiterOne · May 12, 2023 · 6617504 · 6617504
2 parents 29a615d + 51fa761
commit 6617504
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,17 @@ and this project adheres to
 
 ## [Unreleased]
 
+1.1.0 - 2023-05-12
+
+### Added
+
+- New properties added to entities:
+
+  | Entity             | Properties                                                           |
+  | ------------------ | -------------------------------------------------------------------- |
+  | `addigy_hostagent` | `serialNumber`, `macAddress`, `wifiMacAddress`, `ethernetMacAddress` |
+  | `user_endpoint`    | `macAddress`, `wifiMacAddress`, `ethernetMacAddress`                 |
+
 [1.0.3] - 2023-01-27
 
 ### Fixed
@@ -20,9 +31,9 @@ and this project adheres to
 
 - New properties added to entities:
 
-  | Entity          | Properties                                    |
-  | --------------- | --------------------------------------------- |
-  | `addigy_device` | `totalMemory`, `totalDiskSpace`, `lastOnline` |
+  | Entity             | Properties                                    |
+  | ------------------ | --------------------------------------------- |
+  | `addigy_hostagent` | `totalMemory`, `totalDiskSpace`, `lastOnline` |
 
 [1.0.1] - 2022-01-06
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/graph-addigy",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "A JupiterOne Integration for ingesting data from Addigy",
   "license": "MPL-2.0",
   "main": "src/index.js",

diff --git a/src/steps/devices/converter.test.ts b/src/steps/devices/converter.test.ts
@@ -14,6 +14,8 @@ describe('#createHostAgentEntity', () => {
       'Total Memory (GB)': '23',
       'Total Disk Space (GB)': '150',
       'Last Online': '2021-12-03T19:40:20.551Z',
+      'Wifi MAC Address': '00:1B:44:11:3A:B7',
+      'Ethernet MAC Address': '00:1C:44:11:3A:B7',
     } as any;
 
     const entity = createHostAgentEntity(device as Device);
@@ -26,10 +28,16 @@ describe('#createHostAgentEntity', () => {
         id: 'agent-id',
         name: 'name',
         displayName: 'name',
+        serial: 'SerialNumber',
+        serialNumber: 'SerialNumber',
+        wifiMacAddress: '00:1B:44:11:3A:B7',
+        ethernetMacAddress: '00:1C:44:11:3A:B7',
+        macAddress: ['00:1C:44:11:3A:B7', '00:1B:44:11:3A:B7'],
         policyId: '12334',
         totalMemory: '23',
         totalDiskSpace: '150',
         lastOnline: 1638560420551,
+        lastSeenOn: 1638560420551,
         _rawData: [
           {
             name: 'default',

diff --git a/src/steps/devices/converter.ts b/src/steps/devices/converter.ts
@@ -12,6 +12,11 @@ export function createHostAgentEntityIdentifier(id: string): string {
 }
 
 export function createHostAgentEntity(device: Device): Entity {
+  const serialNumber = device['Serial Number'];
+  const wifiMacAddress = device['Wifi MAC Address'];
+  const ethernetMacAddress = device['Ethernet MAC Address'];
+  const lastSeenOn = parseTimePropertyValue(device['Last Online']);
+
   return createIntegrationEntity({
     entityData: {
       source: device,
@@ -26,7 +31,14 @@ export function createHostAgentEntity(device: Device): Entity {
         category: device['Device Model Name'],
         make: 'Apple',
         model: device['Hardware Model'],
-        serial: device['Serial Number'],
+        serial: serialNumber,
+        serialNumber,
+        ethernetMacAddress,
+        wifiMacAddress,
+        macAddress: getEntityMacAddressValue({
+          ethernetMacAddress,
+          wifiMacAddress,
+        }),
         policyId: device['policy_id'],
         function: ['endpoint-protection'],
         appleSilicon: device['Is Apple Silicon'],
@@ -36,8 +48,24 @@ export function createHostAgentEntity(device: Device): Entity {
         platform: device['OS Platform'] || undefined,
         totalMemory: device['Total Memory (GB)'] || undefined,
         totalDiskSpace: device['Total Disk Space (GB)'] || undefined,
-        lastOnline: parseTimePropertyValue(device['Last Online']),
+        lastOnline: lastSeenOn,
+        lastSeenOn,
       },
     },
   });
 }
+
+function getEntityMacAddressValue({
+  wifiMacAddress,
+  ethernetMacAddress,
+}: {
+  ethernetMacAddress: string | undefined;
+  wifiMacAddress: string | undefined;
+}) {
+  const macAddress: string[] = [];
+
+  if (ethernetMacAddress) macAddress.push(ethernetMacAddress);
+  if (wifiMacAddress) macAddress.push(wifiMacAddress);
+
+  return macAddress.length > 0 ? macAddress : undefined;
+}
diff --git a/src/steps/devices/index.ts b/src/steps/devices/index.ts
@@ -55,6 +55,12 @@ export function createHostAgentProtectsHostRelationship(
         model: device['Hardware Model'],
         serial: device['Serial Number'], // This is needed by Device Schema
         serialNumber: device['Serial Number'],
+
+        ethernetMacAddress: agentEntity.ethernetMacAddress as
+          | string
+          | undefined,
+        wifiMacAddress: agentEntity.ethernetMacAddress as string | undefined,
+        macAddress: agentEntity.macAddress as string[] | undefined,
       },
     },
   });