Merge pull request #170 from JupiterOne/INT-9717

Customize sensors max days in past
JupiterOne-Archives · Oct 3, 2023 · 649ad36 · 649ad36
2 parents 6f11cd6 + e5c95bf
commit 649ad36
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 3 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -59,6 +59,11 @@ export const instanceConfigFields: IntegrationInstanceConfigFieldMap = {
     mask: false,
     optional: true,
   },
+  sensorsMaxDaysInPast: {
+    type: 'string',
+    mask: false,
+    optional: true,
+  },
 };
 
 export interface IntegrationConfig extends IntegrationInstanceConfig {
@@ -71,6 +76,17 @@ export interface IntegrationConfig extends IntegrationInstanceConfig {
   vulnerabilitiesLimit?: string;
   devicesLimit?: string;
   vulnerabilitiesMaxDaysInPast?: string;
+  sensorsMaxDaysInPast?: string;
+}
+
+function validateMaxDaysInPastValue(maxDaysInPastValue: number) {
+  if (
+    !isFinite(maxDaysInPastValue) ||
+    isNaN(maxDaysInPastValue) ||
+    maxDaysInPastValue <= 0
+  ) {
+    throw new Error();
+  }
 }
 
 export async function validateInvocation({
@@ -92,14 +108,27 @@ export async function validateInvocation({
   }
 
   if (instance.config.vulnerabilitiesMaxDaysInPast) {
-    const number = Number(instance.config.vulnerabilitiesMaxDaysInPast);
-    if (!isFinite(number) || isNaN(number) || number <= 0) {
+    try {
+      validateMaxDaysInPastValue(
+        Number(instance.config.vulnerabilitiesMaxDaysInPast),
+      );
+    } catch (err) {
       throw new IntegrationValidationError(
         `Invalid vulnerabilitiesMaxDaysInPast: "${instance.config.vulnerabilitiesMaxDaysInPast}"`,
       );
     }
   }
 
+  if (instance.config.sensorsMaxDaysInPast) {
+    try {
+      validateMaxDaysInPastValue(Number(instance.config.sensorsMaxDaysInPast));
+    } catch (err) {
+      throw new IntegrationValidationError(
+        `Invalid sensorsMaxDaysInPast: "${instance.config.sensorsMaxDaysInPast}"`,
+      );
+    }
+  }
+
   const client = getOrCreateFalconAPIClient(instance.config, logger);
   try {
     await client.authenticate();

diff --git a/src/steps/devices/index.ts b/src/steps/devices/index.ts
@@ -24,7 +24,11 @@ async function fetchDevices({
 
   logger.info('Iterating devices...');
 
-  const timestamp = createFQLTimestamp(getDateInPast(50));
+  const maxDaysInPast = instance.config.sensorsMaxDaysInPast
+    ? Number(instance.config.sensorsMaxDaysInPast)
+    : 50;
+
+  const timestamp = createFQLTimestamp(getDateInPast(maxDaysInPast));
 
   await client.iterateDevices({
     query: {

diff --git a/src/validateInvocation.test.ts b/src/validateInvocation.test.ts
@@ -130,4 +130,30 @@ describe('#validateInvocation', () => {
       `Invalid vulnerabilitiesMaxDaysInPast: "I am not a number im just text"`,
     );
   });
+
+  test('fails to validate sensorsMaxDaysInPast contains invalid number', async () => {
+    const executionContext = createMockExecutionContext<IntegrationConfig>({
+      instanceConfig: {
+        ...config,
+        sensorsMaxDaysInPast: '-1',
+      },
+    });
+
+    await expect(validateInvocation(executionContext)).rejects.toThrow(
+      `Invalid sensorsMaxDaysInPast: "-1"`,
+    );
+  });
+
+  test('fails to validate sensorsMaxDaysInPast is not a number', async () => {
+    const executionContext = createMockExecutionContext<IntegrationConfig>({
+      instanceConfig: {
+        ...config,
+        sensorsMaxDaysInPast: 'I am not a number im just text',
+      },
+    });
+
+    await expect(validateInvocation(executionContext)).rejects.toThrow(
+      `Invalid sensorsMaxDaysInPast: "I am not a number im just text"`,
+    );
+  });
 });