@patchstack/connect 0.3.21 → 0.3.23

package/dist/protect.cjs

@@ -155,8 +155,10 @@ async function resolveConfig(options) {
       "CONFIG_MISSING"
     );
   }
+  const apiKeyRaw = fromEnv.apiKey ?? fromFile.apiKey ?? null;
   return {
     siteUuid: siteUuid === null || siteUuid.length === 0 ? null : siteUuid,
+    apiKey: apiKeyRaw === null || apiKeyRaw.length === 0 ? null : apiKeyRaw,
     endpoint,
     timeoutMs,
     environment,
@@ -204,6 +206,7 @@ function readEnv() {
   const environmentRaw = process.env.PATCHSTACK_ENVIRONMENT;
   return {
     siteUuid: process.env.PATCHSTACK_SITE_UUID ?? void 0,
+    apiKey: process.env.PATCHSTACK_API_KEY ?? void 0,
     endpoint: process.env.PATCHSTACK_ENDPOINT ?? void 0,
     timeoutMs,
     environment: environmentRaw !== void 0 && environmentRaw.length > 0 ? environmentRaw : void 0
@@ -2243,7 +2246,8 @@ var PulseRuleClient = class {
         etag: response.headers?.get?.("etag") ?? null,
         firewall: data.firewall,
         whitelists: Array.isArray(data.whitelists) ? data.whitelists : [],
-        whitelist_keys: data.whitelist_keys ?? {}
+        whitelist_keys: data.whitelist_keys ?? {},
+        ...enforcementField(data)
       };
       this.#cache = result;
       this.#etag = result.etag;
@@ -2269,6 +2273,11 @@ var PulseRuleClient = class {
     this.#etag = null;
   }
 };
+function enforcementField(data) {
+  if (!data || typeof data !== "object") return {};
+  const v = data.enforcement ?? data.mode;
+  return v === "block" || v === "dry-run" ? { enforcement: v } : {};
+}
 
 // src/protect/engine/fetch.js
 var MAX_BODY_BYTES = 1024 * 1024;
@@ -2996,10 +3005,12 @@ async function resolveRules(options, store) {
   return emptyBundle();
 }
 function normalizeBundle(b) {
+  const enforcement = b?.enforcement ?? b?.mode;
   return {
     firewall: Array.isArray(b.firewall) ? b.firewall : [],
     whitelists: Array.isArray(b.whitelists) ? b.whitelists : [],
-    whitelist_keys: b.whitelist_keys ?? {}
+    whitelist_keys: b.whitelist_keys ?? {},
+    ...enforcement === "block" || enforcement === "dry-run" ? { enforcement } : {}
   };
 }
 function emptyBundle() {
@@ -3060,6 +3071,169 @@ function makeRefreshHandler(tick, secret) {
   };
 }
 
+// src/protect/firewall-log.js
+var DEFAULT_API_BASE = "https://api.patchstack.com";
+var DEFAULT_FLUSH_MS = 1e3;
+var MAX_BATCH = 50;
+var TOKEN_SKEW_MS = 6e4;
+function parseApiKey(apiKey) {
+  if (typeof apiKey !== "string" || apiKey.length === 0) return null;
+  const idx = apiKey.lastIndexOf("-");
+  if (idx <= 0 || idx === apiKey.length - 1) return null;
+  const clientSecret = apiKey.slice(0, idx);
+  const clientId = apiKey.slice(idx + 1);
+  if (!/^\d+$/.test(clientId) || clientSecret.length === 0) return null;
+  return { clientId, clientSecret };
+}
+function resolveApiBase(pulseOrManifestUrl) {
+  const fromEnv = typeof process !== "undefined" ? process.env?.PATCHSTACK_API_BASE : void 0;
+  if (typeof fromEnv === "string" && fromEnv.length > 0) {
+    return fromEnv.replace(/\/$/, "");
+  }
+  if (typeof pulseOrManifestUrl === "string" && pulseOrManifestUrl.length > 0) {
+    try {
+      return new URL(pulseOrManifestUrl).origin;
+    } catch {
+    }
+  }
+  const endpoint = typeof process !== "undefined" ? process.env?.PATCHSTACK_ENDPOINT : void 0;
+  if (typeof endpoint === "string" && endpoint.length > 0) {
+    try {
+      return new URL(endpoint).origin;
+    } catch {
+    }
+  }
+  return DEFAULT_API_BASE;
+}
+function createFirewallLogReporter(opts) {
+  const creds = parseApiKey(opts.apiKey);
+  if (!creds) {
+    return { record() {
+    }, flush() {
+    }, stop() {
+    } };
+  }
+  const apiBase = (opts.apiBase ?? DEFAULT_API_BASE).replace(/\/$/, "");
+  const fetchImpl = opts.fetchImpl ?? globalThis.fetch;
+  const flushMs = Number.isFinite(opts.flushMs) ? opts.flushMs : DEFAULT_FLUSH_MS;
+  const sourceHost = typeof opts.sourceHost === "string" ? opts.sourceHost : "";
+  let queue = [];
+  let timer = null;
+  let stopped = false;
+  let cachedToken = null;
+  let tokenInflight = null;
+  const fetchAccessToken = async () => {
+    if (cachedToken && Date.now() < cachedToken.expiresAt - TOKEN_SKEW_MS) {
+      return cachedToken.token;
+    }
+    if (tokenInflight) return tokenInflight;
+    tokenInflight = (async () => {
+      try {
+        const res = await fetchImpl(`${apiBase}/oauth/token`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            "User-Agent": "@patchstack/connect"
+          },
+          body: JSON.stringify({
+            grant_type: "client_credentials",
+            client_id: creds.clientId,
+            client_secret: creds.clientSecret
+          })
+        });
+        if (!res || !res.ok) return null;
+        const body = await res.json();
+        const token = body?.access_token;
+        if (typeof token !== "string" || token.length === 0) return null;
+        const expiresIn = Number(body?.expires_in);
+        const ttlMs = Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn * 1e3 : 36e5;
+        cachedToken = { token, expiresAt: Date.now() + ttlMs };
+        return token;
+      } catch {
+        return null;
+      } finally {
+        tokenInflight = null;
+      }
+    })();
+    return tokenInflight;
+  };
+  const flush = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    if (queue.length === 0 || typeof fetchImpl !== "function") return;
+    const batch = queue.splice(0, MAX_BATCH);
+    void (async () => {
+      const token = await fetchAccessToken();
+      if (!token) return;
+      const body = new URLSearchParams();
+      body.set("type", "firewall");
+      body.set("logs", JSON.stringify(batch));
+      try {
+        const p = fetchImpl(`${apiBase}/api/logs/log`, {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            Accept: "application/json",
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": "@patchstack/connect",
+            ...sourceHost ? { "Source-Host": sourceHost } : {}
+          },
+          body
+        });
+        if (p && typeof p.then === "function") p.catch(() => {
+        });
+      } catch {
+      }
+    })();
+  };
+  return {
+    /**
+     * @param {{
+     *   rule?: { id?: string | number },
+     *   method?: string | null,
+     *   path?: string | null,
+     *   ip?: string | null,
+     *   userAgent?: string | null,
+     * }} event
+     */
+    record(event) {
+      if (stopped) return;
+      const fid = event?.rule?.id;
+      if (fid === void 0 || fid === null || fid === "") return;
+      queue.push({
+        fid,
+        method: event.method ?? null,
+        request_uri: event.path ?? null,
+        ip: event.ip ?? null,
+        user_agent: event.userAgent ?? null,
+        log_date: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      if (queue.length >= MAX_BATCH) {
+        flush();
+        return;
+      }
+      if (!timer) timer = setTimeout(flush, flushMs);
+    },
+    flush,
+    stop() {
+      stopped = true;
+      flush();
+    }
+  };
+}
+function telemetryEnabled() {
+  const v = typeof process !== "undefined" ? process.env?.PATCHSTACK_TELEMETRY : void 0;
+  if (v === void 0 || v === "") return true;
+  return !/^(0|false|off|no)$/i.test(String(v));
+}
+
+// src/protect/runtime.js
+var import_node_fs2 = require("fs");
+var import_node_path8 = require("path");
+
 // src/protect/supabase-guard.js
 var GUARD_PATH = "/_patchstack/guard";
 var HOP_BY_HOP = /* @__PURE__ */ new Set(["content-encoding", "content-length", "transfer-encoding", "connection"]);
@@ -3131,11 +3305,30 @@ function createServerFnGuard({ protection }) {
   };
 }
 async function createProtection(options = {}) {
-  const mode = options.mode === "block" ? "block" : "dry-run";
   const onError = options.onError;
-  const onDetect = options.onDetect ?? defaultOnDetect;
+  const userOnDetect = options.onDetect ?? defaultOnDetect;
+  const apiKey = resolveApiKey(options);
+  const firewallLog = apiKey && telemetryEnabled() && options.reportFirewallLog !== false ? createFirewallLogReporter({
+    apiKey,
+    apiBase: resolveApiBase(options.pulseRulesUrl ?? options.baseUrl),
+    sourceHost: options.sourceHost,
+    fetchImpl: options.fetchImpl
+  }) : null;
+  const onDetect = (detection) => {
+    userOnDetect(detection);
+    if (firewallLog && detection?.mode === "block") {
+      firewallLog.record({
+        rule: detection.rule,
+        method: detection.method,
+        path: detection.path,
+        ip: detection.ip,
+        userAgent: detection.userAgent
+      });
+    }
+  };
   const store = makeStore(options);
   const bundle = await resolveRules(options, store);
+  let mode = resolveMode(options, bundle);
   let requestRules;
   let responseRules;
   let egressRules;
@@ -3164,9 +3357,19 @@ async function createProtection(options = {}) {
   };
   applyBundle(bundle);
   const maskFn = typeof options.maskWith === "function" ? options.maskWith : () => typeof options.maskWith === "string" ? options.maskWith : "[REDACTED]";
-  const decide = (phase, result, block, allow2) => {
+  const decide = (phase, result, block, allow2, ctx = {}) => {
     if (!result || !result.blocked) return allow2();
-    onDetect({ phase, mode, category: result.rule?.category, rule: result.rule, message: result.message });
+    onDetect({
+      phase,
+      mode,
+      category: result.rule?.category,
+      rule: result.rule,
+      message: result.message,
+      method: ctx.method,
+      path: ctx.path,
+      ip: ctx.ip,
+      userAgent: ctx.userAgent
+    });
     return mode === "block" ? block() : allow2();
   };
   const isTextCT = (ct) => {
@@ -3330,7 +3533,9 @@ async function createProtection(options = {}) {
     return mode === "block";
   };
   const protection = {
-    mode,
+    get mode() {
+      return mode;
+    },
     get rules() {
       return { request: requestRules, response: responseRules, egress: egressRules };
     },
@@ -3347,7 +3552,7 @@ async function createProtection(options = {}) {
           onError?.(err);
           return null;
         }
-        return decide("request", result, () => blockResponse(result, request), () => null);
+        return decide("request", result, () => blockResponse(result, request), () => null, fetchRequestMeta(request));
       };
     },
     // Wrap a fetch handler: screens the request, then the response (redact/block).
@@ -3385,7 +3590,8 @@ async function createProtection(options = {}) {
           () => {
             if (exprOptions.screenResponses) wrapNodeResponse(res);
             next();
-          }
+          },
+          nodeRequestMeta(req)
         );
       };
     },
@@ -3437,7 +3643,8 @@ async function createProtection(options = {}) {
               if (req.body === void 0) req.body = shaped.body;
               if (nodeOptions.screenResponses) wrapNodeResponse(res);
               next();
-            }
+            },
+            nodeRequestMeta(req)
           );
         });
       };
@@ -3471,7 +3678,9 @@ async function createProtection(options = {}) {
         onError?.(err);
       }
     }
-    applyBundle(await resolveRules(options, store));
+    const next = await resolveRules(options, store);
+    mode = resolveMode(options, next);
+    applyBundle(next);
   };
   if (live) {
     protection.refresh = () => runRefreshTick();
@@ -3479,10 +3688,39 @@ async function createProtection(options = {}) {
   }
   if (options.refreshMs > 0 && live) {
     const loop = startRefresh(runRefreshTick, { refreshMs: options.refreshMs, onError });
-    protection.stopRefresh = loop.stop;
+    protection.stopRefresh = () => {
+      loop.stop();
+      firewallLog?.stop();
+    };
+  } else if (firewallLog) {
+    protection.stopRefresh = () => firewallLog.stop();
   }
   return protection;
 }
+function resolveMode(options, bundle) {
+  const env = typeof process !== "undefined" ? process.env?.PATCHSTACK_MODE : void 0;
+  if (env === "block" || env === "dry-run") return env;
+  if (bundle?.enforcement === "block" || bundle?.enforcement === "dry-run") return bundle.enforcement;
+  if (options?.mode === "block") return "block";
+  if (options?.mode === "dry-run") return "dry-run";
+  return "dry-run";
+}
+function resolveApiKey(options) {
+  if (typeof options?.apiKey === "string" && options.apiKey.length > 0) return options.apiKey;
+  if (typeof process !== "undefined") {
+    const fromEnv = process.env?.PATCHSTACK_API_KEY;
+    if (typeof fromEnv === "string" && fromEnv.length > 0) return fromEnv;
+  }
+  try {
+    if (typeof process === "undefined" || typeof process.cwd !== "function") return void 0;
+    const cwd = options?.cwd ?? process.cwd();
+    const raw = (0, import_node_fs2.readFileSync)((0, import_node_path8.join)(cwd, ".patchstackrc.json"), "utf8");
+    const key = JSON.parse(raw)?.apiKey;
+    if (typeof key === "string" && key.length > 0) return key;
+  } catch {
+  }
+  return void 0;
+}
 function byPhase(rules, phase) {
   return (rules ?? []).filter((r) => (r.phase ?? "request") === phase);
 }
@@ -3746,6 +3984,33 @@ function defaultOnDetect({ phase, mode, category, rule, message }) {
   const tag = mode === "block" ? "BLOCK" : "DETECT (dry-run)";
   console.warn(`[patchstack] ${tag} phase=${phase ?? "request"} category=${category ?? "?"} rule=${rule?.id ?? "?"} ${message ?? ""}`.trim());
 }
+function fetchRequestMeta(request) {
+  if (!request) return {};
+  let path7 = null;
+  try {
+    path7 = new URL(request.url).pathname;
+  } catch {
+    path7 = typeof request.url === "string" ? request.url : null;
+  }
+  return {
+    method: request.method ?? null,
+    path: path7,
+    ip: request.headers?.get?.("x-forwarded-for") ?? null,
+    userAgent: request.headers?.get?.("user-agent") ?? null
+  };
+}
+function nodeRequestMeta(req) {
+  if (!req) return {};
+  const headers = req.headers ?? {};
+  const ua = headers["user-agent"] ?? headers["User-Agent"];
+  const fwd = headers["x-forwarded-for"] ?? headers["X-Forwarded-For"];
+  return {
+    method: req.method ?? null,
+    path: req.originalUrl || req.url || null,
+    ip: req.ip ?? (typeof fwd === "string" ? fwd : null),
+    userAgent: typeof ua === "string" ? ua : Array.isArray(ua) ? ua[0] : null
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   GUARD_PATH,