@oneuptime/common 12.0.11 → 12.0.12

package/Tests/Server/Types/Workflow/Components/CustomCodeScriptError.test.ts

@@ -0,0 +1,121 @@
+import JavaScriptCode from "../../../../../Server/Types/Workflow/Components/JavaScript";
+import IfElse from "../../../../../Server/Types/Workflow/Components/Conditions/IfElse";
+import {
+  RunOptions,
+  RunReturnType,
+} from "../../../../../Server/Types/Workflow/ComponentCode";
+import VMUtil from "../../../../../Server/Utils/VM/VMAPI";
+import ReturnResult from "../../../../../Types/IsolatedVM/ReturnResult";
+import Exception from "../../../../../Types/Exception/Exception";
+import ObjectID from "../../../../../Types/ObjectID";
+import { describe, expect, test, afterEach } from "@jest/globals";
+
+interface OptionsFixture {
+  options: RunOptions;
+  log: jest.Mock;
+  onError: jest.Mock;
+}
+
+function makeOptions(): OptionsFixture {
+  const log: jest.Mock = jest.fn();
+  const onError: jest.Mock = jest.fn((exception: Exception): Exception => {
+    return exception;
+  });
+
+  return {
+    log,
+    onError,
+    options: {
+      log: log as RunOptions["log"],
+      workflowLogId: ObjectID.generate(),
+      workflowId: ObjectID.generate(),
+      projectId: ObjectID.generate(),
+      onError: onError as RunOptions["onError"],
+      executeWorkflow: async (): Promise<void> => {},
+    } as RunOptions,
+  };
+}
+
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe("Custom JavaScript component scriptError routing", () => {
+  test("routes to the error port when the sandbox resolves with scriptError", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: undefined,
+      logMessages: ["before failure"],
+      capturedMetrics: [],
+      scriptError: new Error("script exploded"),
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const { options, log }: OptionsFixture = makeOptions();
+    const result: RunReturnType = await new JavaScriptCode().run(
+      { code: "throw new Error('script exploded');" },
+      options,
+    );
+
+    expect(result.executePort?.id).toBe("error");
+    expect(log).toHaveBeenCalledWith("before failure");
+    expect(log).toHaveBeenCalledWith("Error running script");
+    expect(log).toHaveBeenCalledWith("script exploded");
+  });
+
+  test("routes to the success port with the return value on success", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: { answer: 42 },
+      logMessages: [],
+      capturedMetrics: [],
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const { options }: OptionsFixture = makeOptions();
+    const result: RunReturnType = await new JavaScriptCode().run(
+      { code: "return { answer: 42 };" },
+      options,
+    );
+
+    expect(result.executePort?.id).toBe("success");
+    expect(result.returnValues).toEqual({ returnValue: { answer: 42 } });
+  });
+});
+
+describe("If/Else component scriptError handling", () => {
+  test("fails the run instead of silently taking a branch when the expression errors", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: undefined,
+      logMessages: [],
+      capturedMetrics: [],
+      scriptError: new Error("expression exploded"),
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const { options, onError }: OptionsFixture = makeOptions();
+
+    await expect(
+      new IfElse().run(
+        { "input-1": "a", "input-2": "b", operator: "==" },
+        options,
+      ),
+    ).rejects.toThrow("expression exploded");
+    expect(onError).toHaveBeenCalled();
+  });
+
+  test("takes the Yes branch when the expression evaluates truthy", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: true,
+      logMessages: [],
+      capturedMetrics: [],
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const { options }: OptionsFixture = makeOptions();
+    const result: RunReturnType = await new IfElse().run(
+      { "input-1": "a", "input-2": "a", operator: "==" },
+      options,
+    );
+
+    expect(result.executePort?.id).toBe("yes");
+  });
+});

package/Tests/Server/Utils/Monitor/MonitorCriteriaEvaluatorJavascriptExpression.test.ts

@@ -0,0 +1,92 @@
+import MonitorCriteriaEvaluator from "../../../../Server/Utils/Monitor/MonitorCriteriaEvaluator";
+import VMUtil from "../../../../Server/Utils/VM/VMAPI";
+import Monitor from "../../../../Models/DatabaseModels/Monitor";
+import MonitorStep from "../../../../Types/Monitor/MonitorStep";
+import {
+  CheckOn,
+  CriteriaFilter,
+} from "../../../../Types/Monitor/CriteriaFilter";
+import MonitorType from "../../../../Types/Monitor/MonitorType";
+import ReturnResult from "../../../../Types/IsolatedVM/ReturnResult";
+import ObjectID from "../../../../Types/ObjectID";
+import { describe, expect, test, afterEach } from "@jest/globals";
+
+type EvaluatorPrivate = {
+  isMonitorInstanceCriteriaFilterMet: (input: {
+    dataToProcess: unknown;
+    monitorStep: MonitorStep;
+    monitor: Monitor;
+    probeApiIngestResponse: unknown;
+    criteriaInstance: unknown;
+    criteriaFilter: CriteriaFilter;
+  }) => Promise<string | null>;
+};
+
+const Evaluator: EvaluatorPrivate =
+  MonitorCriteriaEvaluator as unknown as EvaluatorPrivate;
+
+function makeInput(): Parameters<
+  EvaluatorPrivate["isMonitorInstanceCriteriaFilterMet"]
+>[0] {
+  const monitor: Monitor = new Monitor();
+  monitor.projectId = ObjectID.generate();
+  monitor.monitorType = MonitorType.Ping;
+
+  return {
+    dataToProcess: { isOnline: true },
+    monitorStep: new MonitorStep(),
+    monitor,
+    probeApiIngestResponse: {},
+    criteriaInstance: {},
+    criteriaFilter: {
+      checkOn: CheckOn.JavaScriptExpression,
+      value: "1 === 1",
+    } as CriteriaFilter,
+  };
+}
+
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe("MonitorCriteriaEvaluator JavaScript expression criteria", () => {
+  test("treats a sandbox scriptError as criteria not met", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: undefined,
+      logMessages: [],
+      capturedMetrics: [],
+      scriptError: new Error("expression exploded"),
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const result: string | null =
+      await Evaluator.isMonitorInstanceCriteriaFilterMet(makeInput());
+
+    expect(result).toBeNull();
+  });
+
+  test("reports the criteria as met when the expression evaluates truthy", async () => {
+    const sandboxResult: ReturnResult = {
+      returnValue: true,
+      logMessages: [],
+      capturedMetrics: [],
+    };
+    jest.spyOn(VMUtil, "runCodeInSandbox").mockResolvedValue(sandboxResult);
+
+    const result: string | null =
+      await Evaluator.isMonitorInstanceCriteriaFilterMet(makeInput());
+
+    expect(result).toContain("evaluated to true");
+  });
+
+  test("treats a sandbox rejection as criteria not met", async () => {
+    jest
+      .spyOn(VMUtil, "runCodeInSandbox")
+      .mockRejectedValue(new Error("isolate crashed"));
+
+    const result: string | null =
+      await Evaluator.isMonitorInstanceCriteriaFilterMet(makeInput());
+
+    expect(result).toBeNull();
+  });
+});

package/Tests/Server/Utils/VM/VMRunnerIsolation.test.ts

@@ -0,0 +1,385 @@
+import VMRunner from "../../../../Server/Utils/VM/VMRunner";
+import ReturnResult from "../../../../Types/IsolatedVM/ReturnResult";
+import { JSONObject } from "../../../../Types/JSON";
+import { describe, expect, jest, test } from "@jest/globals";
+import axios from "axios";
+
+jest.setTimeout(60000);
+
+async function runInSandbox(data: {
+  code: string;
+  args?: JSONObject | undefined;
+  timeout?: number | undefined;
+}): Promise<ReturnResult> {
+  return VMRunner.runCodeInSandbox({
+    code: data.code,
+    options: {
+      args: data.args,
+      timeout: data.timeout || 5000,
+    },
+  });
+}
+
+describe("VMRunner isolated-vm boundary", () => {
+  test("does not expose the legacy Node vm runner", () => {
+    const runnerApi: Record<string, unknown> = VMRunner as unknown as Record<
+      string,
+      unknown
+    >;
+
+    expect(runnerApi["runCodeInNodeVM"]).toBeUndefined();
+  });
+
+  test("does not expose Reference methods or temporary host globals", async () => {
+    const result: ReturnResult = await runInSandbox({
+      code: `
+        const privateNames = [
+          '_log',
+          '_captureMetric',
+          '_args',
+          '_axiosRef',
+          '_cryptoRef',
+          '_sleepRef',
+          '__oneuptimeHostLogCallback',
+          '__oneuptimeHostMetricCallback',
+          '__oneuptimeCopiedArgs',
+          '__oneuptimeHostAxiosCallback',
+          '__oneuptimeHostAxiosStartCallback',
+          '__oneuptimeHostAxiosPollCallback',
+          '__oneuptimeHostCryptoCallback',
+          '__oneuptimeHostSleepCallback',
+          '__oneuptimeHostSleepStartCallback',
+          '__oneuptimeHostSleepPollCallback',
+        ];
+        const referenceMethods = [
+          'applySync',
+          'applySyncPromise',
+          'copy',
+          'copySync',
+          'deref',
+          'derefInto',
+          'getSync',
+          'release',
+          'setSync',
+        ];
+        const publicValues = [
+          console,
+          console.log,
+          oneuptime,
+          oneuptime.captureMetric,
+          args,
+          axios,
+          axios.get,
+          crypto,
+          crypto.randomUUID,
+          setTimeout,
+          sleep,
+        ];
+
+        return {
+          privateNamesPresent: privateNames.filter(name => name in globalThis),
+          valuesWithReferenceMethods: publicValues.map((value, index) => ({
+            index,
+            methods: referenceMethods.filter(method => {
+              try { return typeof value[method] !== 'undefined'; }
+              catch (_) { return true; }
+            }),
+          })).filter(entry => entry.methods.length > 0),
+        };
+      `,
+    });
+
+    expect(result.scriptError).toBeUndefined();
+    expect(result.returnValue).toEqual({
+      privateNamesPresent: [],
+      valuesWithReferenceMethods: [],
+    });
+  });
+
+  test("keeps every public function constructor in the isolate realm", async () => {
+    const result: ReturnResult = await runInSandbox({
+      code: `
+        const functions = [
+          console.log,
+          oneuptime.captureMetric,
+          axios,
+          axios.get,
+          crypto.randomUUID,
+          setTimeout,
+          sleep,
+          http.Agent,
+          https.Agent,
+        ];
+
+        return {
+          directFunction: Function('return typeof process')(),
+          constructors: functions.map(fn =>
+            fn.constructor.constructor('return typeof process')()
+          ),
+        };
+      `,
+    });
+
+    expect(result.scriptError).toBeUndefined();
+    expect(result.returnValue).toEqual({
+      directFunction: "undefined",
+      constructors: Array(9).fill("undefined"),
+    });
+  });
+
+  test("keeps promises returned by async shims in the isolate realm", async () => {
+    const result: ReturnResult = await runInSandbox({
+      code: `
+        const sleepPromise = sleep(0);
+        const axiosPromise = axios.get('http://127.0.0.1:8080/');
+        const promiseRealms = [sleepPromise, axiosPromise].map(promise =>
+          promise.constructor.constructor('return typeof process')()
+        );
+
+        await sleepPromise;
+        try { await axiosPromise; } catch (_) {}
+        return promiseRealms;
+      `,
+    });
+
+    expect(result.scriptError).toBeUndefined();
+    expect(result.returnValue).toEqual(["undefined", "undefined"]);
+  });
+
+  test("deep-copies args into the isolate realm", async () => {
+    const args: JSONObject = {
+      nested: {
+        value: "host value",
+      },
+      items: [1, 2, 3],
+    };
+
+    const result: ReturnResult = await runInSandbox({
+      args,
+      code: `
+        args.nested.value = 'isolate value';
+        args.items.push(4);
+
+        return {
+          nestedValue: args.nested.value,
+          itemCount: args.items.length,
+          objectPrototypeIsLocal: Object.getPrototypeOf(args) === Object.prototype,
+          constructorRealm: args.constructor.constructor('return typeof process')(),
+        };
+      `,
+    });
+
+    expect(result.scriptError).toBeUndefined();
+    expect(result.returnValue).toEqual({
+      nestedValue: "isolate value",
+      itemCount: 4,
+      objectPrototypeIsLocal: true,
+      constructorRealm: "undefined",
+    });
+    expect(args).toEqual({
+      nested: {
+        value: "host value",
+      },
+      items: [1, 2, 3],
+    });
+  });
+
+  test("retains logs and metrics when user code throws", async () => {
+    const result: ReturnResult = await runInSandbox({
+      code: `
+        console.log('before throw', { safe: true });
+        oneuptime.captureMetric('sandbox_metric', 42, { region: 'test' });
+        const error = new Error('expected isolate failure');
+        error.untrustedProperty = 'must not cross';
+        throw error;
+      `,
+    });
+
+    expect(result.returnValue).toBeUndefined();
+    expect(result.logMessages).toEqual(['before throw {"safe":true}']);
+    expect(result.capturedMetrics).toEqual([
+      {
+        name: "sandbox_metric",
+        value: 42,
+        attributes: { region: "test" },
+      },
+    ]);
+    expect(result.scriptError).toBeInstanceOf(Error);
+    expect(result.scriptError?.message).toBe("expected isolate failure");
+    expect(
+      (result.scriptError as Error & { untrustedProperty?: string })
+        .untrustedProperty,
+    ).toBeUndefined();
+    expect(result.scriptError?.stack).not.toContain("untrustedProperty");
+  });
+
+  test("retains logs and metrics when user code times out", async () => {
+    const result: ReturnResult = await runInSandbox({
+      timeout: 50,
+      code: `
+        console.log('before timeout');
+        oneuptime.captureMetric('timeout_metric', 7);
+        while (true) {}
+      `,
+    });
+
+    expect(result.returnValue).toBeUndefined();
+    expect(result.logMessages).toEqual(["before timeout"]);
+    expect(result.capturedMetrics).toEqual([
+      {
+        name: "timeout_metric",
+        value: 7,
+      },
+    ]);
+    expect(result.scriptError?.message).toMatch(/timed out/i);
+  });
+
+  test("bounds log count and aggregate UTF-8 bytes", async () => {
+    const countResult: ReturnResult = await runInSandbox({
+      code: `
+        for (let index = 0; index < 1100; index++) {
+          console.log('entry-' + index);
+        }
+        return 'done';
+      `,
+    });
+
+    expect(countResult.scriptError).toBeUndefined();
+    expect(countResult.returnValue).toBe("done");
+    expect(countResult.logMessages).toHaveLength(1000);
+
+    const byteResult: ReturnResult = await runInSandbox({
+      code: `
+        const message = '\u00e9'.repeat(70000);
+        for (let index = 0; index < 10; index++) {
+          console.log(message);
+        }
+        return 'done';
+      `,
+    });
+    const totalBytes: number = byteResult.logMessages.reduce(
+      (bytes: number, message: string): number => {
+        return bytes + Buffer.byteLength(message, "utf8");
+      },
+      0,
+    );
+
+    expect(byteResult.scriptError).toBeUndefined();
+    expect(totalBytes).toBeLessThanOrEqual(1_000_000);
+    expect(byteResult.logMessages).toHaveLength(7);
+  });
+
+  test("preserves timer behavior and clears pending host timers", async () => {
+    jest.spyOn(global, "clearTimeout");
+
+    try {
+      const result: ReturnResult = await runInSandbox({
+        timeout: 250,
+        code: `
+          let cancelledTimerFired = false;
+          const cancelledTimer = setTimeout(() => {
+            cancelledTimerFired = true;
+          }, 5);
+          clearTimeout(cancelledTimer);
+
+          const startedAt = Date.now();
+          await new Promise(resolve => setTimeout(resolve, 10));
+          const elapsed = Date.now() - startedAt;
+
+          setTimeout(() => console.log('late timer'), 60000);
+          await sleep(5);
+
+          return {
+            cancelledTimerFired,
+            elapsed,
+          };
+        `,
+      });
+
+      expect(result.scriptError).toBeUndefined();
+      expect(result.returnValue.cancelledTimerFired).toBe(false);
+      expect(result.returnValue.elapsed).toBeGreaterThanOrEqual(5);
+      expect(result.logMessages).not.toContain("late timer");
+      expect(
+        jest.mocked(global.clearTimeout).mock.calls.length,
+      ).toBeGreaterThanOrEqual(2);
+    } finally {
+      jest.restoreAllMocks();
+    }
+  });
+
+  test("copies a fulfilled axios response back into the isolate", async () => {
+    jest.spyOn(axios, "get").mockResolvedValue({
+      status: 200,
+      headers: { "x-test": "copied" },
+      data: { ok: true },
+    } as never);
+
+    try {
+      const result: ReturnResult = await runInSandbox({
+        code: `
+          const response = await axios.get('https://8.8.8.8/health');
+          return {
+            status: response.status,
+            header: response.headers['x-test'],
+            data: response.data,
+            promiseRealm: axios.get('https://8.8.8.8/second')
+              .constructor.constructor('return typeof process')(),
+          };
+        `,
+      });
+
+      expect(result.scriptError).toBeUndefined();
+      expect(result.returnValue).toEqual({
+        status: 200,
+        header: "copied",
+        data: { ok: true },
+        promiseRealm: "undefined",
+      });
+      expect(axios.get).toHaveBeenCalledWith(
+        "https://8.8.8.8/health",
+        expect.objectContaining({
+          maxRedirects: 0,
+          signal: expect.any(AbortSignal),
+        }),
+      );
+    } finally {
+      jest.restoreAllMocks();
+    }
+  });
+
+  test("keeps the documented crypto and Agent shims compatible", async () => {
+    const result: ReturnResult = await runInSandbox({
+      code: `
+        const httpAgent = new http.Agent({ keepAlive: true });
+        const httpsAgent = new https.Agent({ rejectUnauthorized: false });
+
+        return {
+          hash: crypto.createHash('sha256').update('oneuptime').digest('hex'),
+          uuidLooksValid: /^[0-9a-f-]{36}$/.test(crypto.randomUUID()),
+          randomIntInRange: (() => {
+            const value = crypto.randomInt(2, 5);
+            return value >= 2 && value < 5;
+          })(),
+          httpAgent,
+          httpsAgent,
+        };
+      `,
+    });
+
+    expect(result.scriptError).toBeUndefined();
+    expect(result.returnValue).toEqual({
+      hash: "35a18a92a1ae8387b173763364c1497950fa0bfe2589e545c0bf1f4d0f01f94e",
+      uuidLooksValid: true,
+      randomIntInRange: true,
+      httpAgent: {
+        __agentType: "__http_agent__",
+        options: { keepAlive: true },
+      },
+      httpsAgent: {
+        __agentType: "__https_agent__",
+        options: { rejectUnauthorized: false },
+      },
+    });
+  });
+});

package/Tests/Server/Utils/VM/VMRunnerSsrf.test.ts

@@ -33,6 +33,9 @@ async function runInSandbox(code: string): Promise<ReturnResult> {
 async function errorFromSandbox(code: string): Promise<string> {
   try {
     const result: ReturnResult = await runInSandbox(code);
+    if (result.scriptError) {
+      return result.scriptError.message;
+    }
     return JSON.stringify(result.returnValue ?? result.logMessages ?? "");
   } catch (err) {
     return (err as Error).message || String(err);

package/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse.ts

@@ -1,5 +1,17 @@
 import CapturedMetric from "./CapturedMetric";
-import { JSONObject } from "../../JSON";
+
+export interface CustomCodeMonitorResultObject {
+  [key: string]: CustomCodeMonitorResult;
+}
+
+/** JSON-safe data returned from a custom or synthetic monitor script. */
+export type CustomCodeMonitorResult =
+  | string
+  | number
+  | boolean
+  | null
+  | CustomCodeMonitorResultObject
+  | Array<CustomCodeMonitorResult>;
 
 export interface RetryAttempt {
   attemptNumber: number;
@@ -8,7 +20,7 @@ export interface RetryAttempt {
 }
 
 export default interface CustomCodeMonitorResponse {
-  result: string | number | boolean | JSONObject | undefined;
+  result: CustomCodeMonitorResult | undefined;
   scriptError?: string | undefined;
   logMessages: string[];
   capturedMetrics: CapturedMetric[];

package/build/dist/Server/Types/Workflow/Components/Conditions/IfElse.js

@@ -121,6 +121,14 @@ export default class IfElse extends ComponentCode {
             logMessages.forEach((msg) => {
                 options.log(msg);
             });
+            /*
+             * runCodeInSandbox resolves with `scriptError` when the expression
+             * threw or timed out — it no longer rejects. Fail the run instead of
+             * silently taking the "No" branch.
+             */
+            if (returnResult.scriptError) {
+                throw returnResult.scriptError;
+            }
             if (returnResult.returnValue) {
                 return {
                     returnValues: {},

package/build/dist/Server/Types/Workflow/Components/Conditions/IfElse.js.map

@@ -1 +1 @@
-{"version":3,"file":"IfElse.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/Conditions/IfElse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IfElse.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/Conditions/IfElse.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Types/Workflow/Components/JavaScript.js

@@ -61,6 +61,14 @@ export default class JavaScriptCode extends ComponentCode {
             logMessages.forEach((msg) => {
                 options.log(msg);
             });
+            /*
+             * runCodeInSandbox resolves with `scriptError` when the user script
+             * threw or timed out — it no longer rejects. Route those runs to the
+             * error port, matching the pre-sandbox behavior.
+             */
+            if (returnResult.scriptError) {
+                throw returnResult.scriptError;
+            }
             const returnVal = returnResult.returnValue;
             return {
                 returnValues: {