@oomol-lab/open-connector 1.9.2 → 1.9.3

package/src/server/connector-runtime.d.ts

@@ -1,5 +1,6 @@
 import type { ActionPolicyConfig } from "../core/action-policy.ts";
 import type { ProviderHttpDispatchOptions } from "../core/provider-http-dispatch.ts";
+import type { ProviderNetworkPolicy } from "../core/provider-network-policy.ts";
 import type { RuntimeLogger } from "../core/types.ts";
 import type { RuntimeJwtConfig } from "./api/runtime-jwt.ts";
 import type { S3TransitClientOptions } from "./files/s3-transit-files.ts";
@@ -20,13 +21,6 @@ export interface ConnectorPostgresOptions {
     /** Time allowed to establish one connection. */
     connectionTimeoutMs?: number;
 }
-/** Provider egress policy. It is process-wide, which is why one runtime may be active per process. */
-export interface ConnectorNetworkOptions {
-    /** Let self-hosted providers reach instance hosts on private networks; loopback, link-local and cloud metadata stay blocked. */
-    allowPrivateNetwork?: boolean;
-    /** Hosts exempt from resolved-address validation, for domains a corporate VPN resolves to placeholder addresses. */
-    trustedHosts?: readonly string[];
-}
 export interface ConnectorS3Options extends S3TransitClientOptions {
     bucket: string;
 }
@@ -53,10 +47,12 @@ export interface ConnectorRuntimeOptions {
     adminToken?: string;
     /** Static bearer token for the /v1 and /mcp execution API. JWT verification and console-issued tokens are the alternatives. */
     runtimeToken?: string;
+    /** Dedicated bearer token for inbound provider event verification. Kept separate from the admin token. */
+    eventVerifyToken?: string;
     /** Verify /v1 bearer tokens as JWTs against a JWKS endpoint. */
     jwt?: RuntimeJwtConfig;
     postgres?: ConnectorPostgresOptions;
-    network?: ConnectorNetworkOptions;
+    network?: ProviderNetworkPolicy;
     /** Opt-in admission and result feedback for every provider HTTP transport attempt. */
     providerHttpDispatch?: ProviderHttpDispatchOptions;
     /** Allow or block actions, proxies and Triggers by name. */
@@ -78,6 +74,8 @@ export interface ConnectorRuntimeOptions {
     apiReference?: boolean;
     /** Seconds the OAuth completion page waits before closing its window. Defaults to 5; `0` closes it as soon as it loads. */
     oauthCloseDelaySeconds?: number;
+    /** Exact origins a provider-refusal callback page may post its result to. Never `*`. */
+    oauthResultOrigins?: string[];
 }
 /** Standard web requests are the host boundary; credentials, databases and framework objects stay private. */
 export interface ConnectorRuntime {

package/src/server/connector-runtime.js

@@ -2,10 +2,9 @@ import { mkdir } from "node:fs/promises";
 import { join, resolve } from "node:path";
 import { loadCatalog } from "../catalog-store.js";
 import { ActionPolicyService } from "../core/action-policy.js";
-import { setEgressTrustedHosts, setPrivateNetworkAccessAllowed } from "../core/request.js";
 import { ProviderLoader } from "../providers/provider-loader.js";
 import { executorModules } from "../providers/registry.generated.js";
-import { DEFAULT_OAUTH_CLOSE_DELAY_SECONDS } from "./api/oauth-completion-page.js";
+import { DEFAULT_OAUTH_CLOSE_DELAY_SECONDS, normalizeOAuthResultOrigins } from "./api/oauth-completion-page.js";
 import { createRuntimeJwtVerifier } from "./api/runtime-jwt.js";
 import { createConnectApp } from "./connect-app.js";
 import { getConnectorAssetDirectory } from "./connector-assets.js";
@@ -15,22 +14,9 @@ import { createSecretCodec } from "./secrets/secret-codec.js";
 import { createDirectoryMigrationSource } from "./storage/migration-source.js";
 import { createNodeRuntimeDatabase } from "./storage/node-runtime-database.js";
 import { DEFAULT_RUN_LIMIT } from "./storage/runtime-store.js";
-let runtimeActive = false;
 export { getConnectorAssetDirectory } from "./connector-assets.js";
 /** Create a headless runtime without opening a listener or installing process signal handlers. */
 export async function createConnectorRuntime(options) {
-    if (runtimeActive)
-        throw new Error("Only one Open Connector runtime may be active per process. Close it before creating another.");
-    runtimeActive = true;
-    try {
-        return await openRuntime(options);
-    }
-    catch (error) {
-        releaseRuntime();
-        throw error;
-    }
-}
-async function openRuntime(options) {
     const publicUrl = new URL(options.publicOrigin);
     if (!["http:", "https:"].includes(publicUrl.protocol) ||
         publicUrl.username ||
@@ -52,14 +38,15 @@ async function openRuntime(options) {
     const oauthCloseDelaySeconds = options.oauthCloseDelaySeconds ?? DEFAULT_OAUTH_CLOSE_DELAY_SECONDS;
     if (!Number.isInteger(oauthCloseDelaySeconds) || oauthCloseDelaySeconds < 0)
         throw new Error("oauthCloseDelaySeconds must be a non-negative integer of seconds.");
+    // The same rules as `OOMOL_CONNECT_OAUTH_RESULT_ORIGINS`: a host passing the option directly must not be able
+    // to make the refusal page post OAuth state to `*` or to a value that is not an origin.
+    const oauthResultOrigins = normalizeOAuthResultOrigins(options.oauthResultOrigins ?? []);
     const assetDirectory = getConnectorAssetDirectory();
     const assets = options.assets ?? {
         catalogDir: join(assetDirectory, "catalog/apps"),
         catalogIndexFile: join(assetDirectory, "catalog/apps-index.json"),
         migrationDirectory: join(assetDirectory, "migrations"),
     };
-    setPrivateNetworkAccessAllowed(options.network?.allowPrivateNetwork ?? false);
-    setEgressTrustedHosts(options.network?.trustedHosts ?? []);
     const secretCodec = createSecretCodec(options.encryptionKey);
     const verifyRuntimeJwt = await createRuntimeJwtVerifier(options.jwt ?? {});
     const lazySchemas = options.lazySchemas ?? true;
@@ -110,6 +97,7 @@ async function openRuntime(options) {
         await cleanupStagedTransitFiles(tempDir, ttlSeconds * 1000);
         const { app, runtimeAuthConfigured, saasCleanup, triggerMaintenance } = await createConnectApp({
             catalog,
+            network: options.network,
             providerLoader: new ProviderLoader(executorModules),
             providerHttpDispatch: options.providerHttpDispatch,
             runtimeDatabase: database,
@@ -120,12 +108,14 @@ async function openRuntime(options) {
             secretCodec,
             adminToken: options.adminToken,
             runtimeToken: options.runtimeToken,
+            eventVerifyToken: options.eventVerifyToken,
             verifyRuntimeJwt,
             actionPolicy: new ActionPolicyService(options.actionPolicy),
             allowedCustomOAuth: options.allowedCustomOAuth,
             logger: options.logger,
             serveDocumentation: options.apiReference ?? false,
             oauthCloseDelaySeconds,
+            oauthResultOrigins,
         });
         saasCleanup.start();
         triggerMaintenance.start();
@@ -156,12 +146,7 @@ async function openRuntime(options) {
                             await database.close();
                         }
                         finally {
-                            try {
-                                closeFiles();
-                            }
-                            finally {
-                                releaseRuntime();
-                            }
+                            closeFiles();
                         }
                     });
                 }
@@ -179,8 +164,3 @@ async function openRuntime(options) {
         throw error;
     }
 }
-function releaseRuntime() {
-    setPrivateNetworkAccessAllowed(false);
-    setEgressTrustedHosts([]);
-    runtimeActive = false;
-}

package/src/server/proxy/proxy-runner.js

@@ -1,4 +1,4 @@
-import { ConnectionError } from "../../connection-service.js";
+import { ConnectionError } from "../../connection-error.js";
 import { optionalInteger, optionalRecord, requiredRecord, requiredString } from "../../core/cast.js";
 import { withProviderHttpDispatch } from "../../core/provider-http-dispatch.js";
 import { ProviderDispatchRequestError, toProviderExecutionError, withProviderHttpDispatchResult, } from "../../providers/provider-runtime.js";

package/src/server/slack-event-verification.d.ts

@@ -0,0 +1,37 @@
+export interface SlackEventVerificationInput {
+    /** Value of the X-Slack-Request-Timestamp header. */
+    timestamp: string;
+    /** Value of the X-Slack-Signature header. */
+    signature: string;
+    /** Raw request body bytes; they must not be re-serialized. */
+    rawBody: Uint8Array;
+    /** App ID of the Slack application configured in this runtime. */
+    configuredAppId: string;
+    /** Signing secret of the Slack application configured in this runtime. */
+    signingSecret: string;
+    /** Request Content-Type. Form-urlencoded Slack interactions are verified without parsing. */
+    contentType?: string;
+    /** Current time in milliseconds; injectable for tests. */
+    now?: number;
+}
+export type SlackEventVerificationResult = {
+    valid: true;
+    appId: string;
+    challenge: string | null;
+} | {
+    valid: false;
+    reason: "signature" | "timestamp" | "payload" | "app" | "body_too_large";
+};
+/**
+ * Reads a request body without buffering more than the Slack event limit.
+ *
+ * Returns undefined when the request exceeds the limit. The actual stream size is
+ * enforced even when Content-Length is absent or understated.
+ */
+export declare function readSlackEventRequestBody(request: Request): Promise<Uint8Array | undefined>;
+/**
+ * Verifies the signature, timestamp window, and App ID of an inbound Slack request.
+ *
+ * Verification only: this function does not persist, deduplicate, or schedule events.
+ */
+export declare function verifySlackEventRequest(input: SlackEventVerificationInput): Promise<SlackEventVerificationResult>;

package/src/server/slack-event-verification.js

@@ -0,0 +1,91 @@
+import { verifySlackSignature } from "../triggers/sources/slack-signature.js";
+/** Maximum request body size, consistent with existing event sources. */
+const slackEventMaximumBodyBytes = 64 * 1024;
+/**
+ * Reads a request body without buffering more than the Slack event limit.
+ *
+ * Returns undefined when the request exceeds the limit. The actual stream size is
+ * enforced even when Content-Length is absent or understated.
+ */
+export async function readSlackEventRequestBody(request) {
+    const declaredLength = request.headers.get("content-length");
+    if (declaredLength && /^\d+$/.test(declaredLength) && Number(declaredLength) > slackEventMaximumBodyBytes) {
+        return undefined;
+    }
+    if (!request.body)
+        return new Uint8Array();
+    const reader = request.body.getReader();
+    const chunks = [];
+    let totalBytes = 0;
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            if (!value)
+                continue;
+            totalBytes += value.byteLength;
+            if (totalBytes > slackEventMaximumBodyBytes) {
+                await reader.cancel().catch(() => undefined);
+                return undefined;
+            }
+            chunks.push(value);
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+    const body = new Uint8Array(totalBytes);
+    let offset = 0;
+    for (const chunk of chunks) {
+        body.set(chunk, offset);
+        offset += chunk.byteLength;
+    }
+    return body;
+}
+/**
+ * Verifies the signature, timestamp window, and App ID of an inbound Slack request.
+ *
+ * Verification only: this function does not persist, deduplicate, or schedule events.
+ */
+export async function verifySlackEventRequest(input) {
+    const now = input.now ?? Date.now();
+    if (input.rawBody.byteLength > slackEventMaximumBodyBytes) {
+        return { valid: false, reason: "body_too_large" };
+    }
+    const reason = await verifySlackSignature({ ...input, now });
+    if (reason)
+        return { valid: false, reason };
+    // Slack interaction callbacks are form-urlencoded and do not contain api_app_id.
+    // The app-scoped signing secret already proves which application sent the request.
+    if (contentType(input.contentType) === "application/x-www-form-urlencoded") {
+        return { valid: true, appId: input.configuredAppId, challenge: null };
+    }
+    // Only parse the body after its signature is trusted.
+    let payload;
+    try {
+        payload = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(input.rawBody));
+    }
+    catch {
+        return { valid: false, reason: "payload" };
+    }
+    if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
+        return { valid: false, reason: "payload" };
+    }
+    const record = payload;
+    const isChallenge = record.type === "url_verification";
+    if (!isChallenge && record.type !== "event_callback")
+        return { valid: false, reason: "payload" };
+    if ((!isChallenge || record.api_app_id !== undefined) && record.api_app_id !== input.configuredAppId)
+        return { valid: false, reason: "app" };
+    if (isChallenge && (typeof record.challenge !== "string" || !record.challenge || record.challenge.length > 1024))
+        return { valid: false, reason: "payload" };
+    return {
+        valid: true,
+        appId: input.configuredAppId,
+        challenge: isChallenge ? record.challenge : null,
+    };
+}
+function contentType(value) {
+    return value?.split(";", 1)[0]?.trim().toLowerCase() ?? "";
+}

package/src/server/storage/connection-request-store.d.ts

@@ -1,4 +1,4 @@
-import type { StoredConnection, StoredSaasConnection } from "../../connection-service.ts";
+import type { StoredConnection, StoredSaasConnection } from "../../connection-store.ts";
 import type { ResolvedCredential } from "../../core/types.ts";
 import type { OAuthAuthorizationState } from "../../oauth/oauth-flow-service.ts";
 import type { ISecretCodec } from "../secrets/secret-codec-core.ts";

package/src/server/storage/connection-store.d.ts

@@ -1,4 +1,4 @@
-import type { IConnectionStore, StoredConnection, StoredLocalConnection } from "../../connection-service.ts";
+import type { IConnectionStore, StoredConnection, StoredLocalConnection } from "../../connection-store.ts";
 import type { ResolvedCredential } from "../../core/types.ts";
 import type { ISecretCodec } from "../secrets/secret-codec-core.ts";
 import type { RequestTransaction } from "./connection-request-store.ts";

package/src/server/storage/postgres/runtime-store.d.ts

@@ -1,4 +1,4 @@
-import type { IConnectionStore } from "../../../connection-service.ts";
+import type { IConnectionStore } from "../../../connection-store.ts";
 import type { RuntimeLogger } from "../../../core/types.ts";
 import type { IMarketplaceStore } from "../../../marketplace/marketplace-service.ts";
 import type { IOAuthClientConfigStore } from "../../../oauth/oauth-client-config-service.ts";

package/src/server/storage/runtime-database.d.ts

@@ -1,4 +1,4 @@
-import type { IConnectionStore } from "../../connection-service.ts";
+import type { IConnectionStore } from "../../connection-store.ts";
 import type { IMarketplaceStore } from "../../marketplace/marketplace-service.ts";
 import type { IOAuthClientConfigStore } from "../../oauth/oauth-client-config-service.ts";
 import type { IOAuthStateStore } from "../../oauth/oauth-flow-service.ts";

package/src/server/storage/saas-project-store.d.ts

@@ -1,4 +1,4 @@
-import type { StoredSaasConnection } from "../../connection-service.ts";
+import type { StoredSaasConnection } from "../../connection-store.ts";
 import type { ISecretCodec } from "../secrets/secret-codec-core.ts";
 import type { RequestStatement, RequestTransaction } from "./connection-request-store.ts";
 import type { RuntimeRow } from "./runtime-sql.ts";

package/src/triggers/maintenance.d.ts

@@ -1,4 +1,5 @@
 import type { ActionPolicyService } from "../core/action-policy.ts";
+import type { ProviderNetworkPolicy } from "../core/provider-network-policy.ts";
 import type { RuntimeLogger } from "../core/types.ts";
 import type { IRuntimePolicyStore } from "../server/storage/runtime-policy-store.ts";
 import type { IRuntimeTokenStore } from "../server/storage/runtime-token-service.ts";
@@ -16,6 +17,7 @@ export interface TriggerSubscriptionSummary {
     reconcileAt: number;
 }
 interface TriggerMaintenanceOptions {
+    network?: ProviderNetworkPolicy;
     store: TriggerStore;
     runner: TriggerRunner;
     tokens: IRuntimeTokenStore;

package/src/triggers/maintenance.js

@@ -1,3 +1,4 @@
+import { withProviderNetworkPolicy } from "../core/provider-network-policy.js";
 import { HttpRequestError } from "../server/api/http-utils.js";
 import { withSubscription } from "./subscriptions.js";
 export class TriggerMaintenance {
@@ -49,7 +50,7 @@ export class TriggerMaintenance {
     run() {
         if (this.shutdown.signal.aborted)
             return Promise.resolve();
-        this.pending ??= this.runBatch()
+        this.pending ??= withProviderNetworkPolicy(this.options.network ?? {}, () => this.runBatch())
             .catch(() => {
             this.options.logger?.warn({ errorCode: "trigger_cleanup_failed" }, "Trigger cleanup batch failed; pending work is retained");
         })

package/src/triggers/sources/slack-signature.d.ts

@@ -0,0 +1,10 @@
+interface SlackSignatureInput {
+    timestamp: string;
+    signature: string;
+    rawBody: Uint8Array;
+    signingSecret: string;
+    now: number;
+}
+/** Verify Slack's timestamp and signature over the original request bytes. */
+export declare function verifySlackSignature(input: SlackSignatureInput): Promise<"timestamp" | "signature" | undefined>;
+export {};

package/src/triggers/sources/slack-signature.js

@@ -0,0 +1,13 @@
+import { verifySourceHmac } from "./signature.js";
+/** Verify Slack's timestamp and signature over the original request bytes. */
+export async function verifySlackSignature(input) {
+    if (!/^\d{10}$/.test(input.timestamp) || Math.abs(input.now - Number(input.timestamp) * 1000) > 300_000)
+        return "timestamp";
+    if (!/^v0=[0-9a-f]{64}$/.test(input.signature) || !input.signingSecret)
+        return "signature";
+    const prefix = new TextEncoder().encode(`v0:${input.timestamp}:`);
+    const signed = new Uint8Array(prefix.length + input.rawBody.byteLength);
+    signed.set(prefix);
+    signed.set(input.rawBody, prefix.length);
+    return (await verifySourceHmac(signed, input.signature.slice(3), input.signingSecret)) ? undefined : "signature";
+}

package/src/triggers/sources/slack.js

@@ -1,8 +1,7 @@
 import { isJsonObject } from "../common/json.js";
 import { SourceIdentityError } from "./definition.js";
-import { verifySourceHmac } from "./signature.js";
+import { verifySlackSignature } from "./slack-signature.js";
 const events = new Set(["app_mention", "message.im"]);
-const encoder = new TextEncoder();
 export const slackApplication = {
     kind: "slack",
     applicationIngress: true,
@@ -47,16 +46,15 @@ export const slackApplication = {
     async receive(source, bytes, headers, now) {
         const timestamp = headers.get("x-slack-request-timestamp") ?? "";
         const signature = headers.get("x-slack-signature") ?? "";
-        if (!/^\d{10}$/.test(timestamp) ||
-            Math.abs(now - Number(timestamp) * 1000) > 300_000 ||
-            !/^v0=[0-9a-f]{64}$/.test(signature))
+        const failure = await verifySlackSignature({
+            timestamp,
+            signature,
+            rawBody: bytes,
+            signingSecret: String(source.secrets.signingSecret),
+            now,
+        });
+        if (failure)
             throw new TypeError("Invalid Slack signature or timestamp.");
-        const prefix = encoder.encode(`v0:${timestamp}:`);
-        const body = new Uint8Array(prefix.length + bytes.length);
-        body.set(prefix);
-        body.set(bytes, prefix.length);
-        if (!(await verifySourceHmac(body, signature.slice(3), String(source.secrets.signingSecret))))
-            throw new TypeError("Invalid Slack signature.");
         const payload = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
         if (!isJsonObject(payload))
             throw new TypeError("Invalid Slack envelope.");

package/src/triggers/trigger-runner.js

@@ -1,4 +1,4 @@
-import { ConnectionError } from "../connection-service.js";
+import { ConnectionError } from "../connection-error.js";
 import { optionalInteger, optionalRecord } from "../core/cast.js";
 import { withProviderHttpDispatch } from "../core/provider-http-dispatch.js";
 import { readOAuthClientConfigMetadata } from "../oauth/oauth-client-config-service.js";