@budibase/backend-core 3.23.38 → 3.23.48

package/dist/src/utils/fetch.js

@@ -1,80 +1,155 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyDispatcher = getProxyDispatcher;
-exports.resetProxyDispatcherCache = resetProxyDispatcherCache;
+exports.getDispatcher = getDispatcher;
 const undici_1 = require("undici");
 /**
- * Creates a fetch dispatcher (ProxyAgent) that respects global-agent environment variables.
- * This is necessary because Node.js's native fetch uses undici which doesn't respect
- * the global-agent proxy configuration.
+ * Check if a URL matches any pattern in the NO_PROXY list.
+ * Supports patterns like: *.foo.com, baz.com, .example.com
  *
- * @param options Optional configuration for the ProxyAgent
- * @returns ProxyAgent if proxy is configured, undefined otherwise
+ * @param url The URL to check
+ * @param noProxy Comma or space separated list of NO_PROXY patterns
+ * @returns true if the URL should bypass the proxy
  */
-function createProxyDispatcher(options) {
+function isUrlMatchingNoProxy(url, noProxy) {
+    let hostname;
+    let port = null;
+    try {
+        const parsed = new URL(url);
+        hostname = parsed.hostname;
+        port = parsed.port || null;
+    }
+    catch (_a) {
+        return false;
+    }
+    const rules = noProxy.split(/[\s,]+/).filter(r => r.length > 0);
+    for (const rule of rules) {
+        // Handle leading dot (e.g., .foo.com) by converting to wildcard
+        const normalizedRule = rule.replace(/^\./, "*");
+        // Parse rule into hostname and optional port
+        // Match: hostname optionally followed by :port
+        const ruleMatch = normalizedRule.match(/^(.+?)(?::(\d+))?$/);
+        if (!ruleMatch || !ruleMatch[1]) {
+            continue;
+        }
+        const ruleHostname = ruleMatch[1].toLowerCase();
+        const rulePort = ruleMatch[2] || null;
+        // Check hostname match (supports wildcards like *.foo.com)
+        let hostnameMatches = false;
+        if (ruleHostname === "*") {
+            hostnameMatches = true;
+        }
+        else if (ruleHostname.startsWith("*")) {
+            // Wildcard pattern like *.foo.com
+            const suffix = ruleHostname.slice(1); // .foo.com
+            hostnameMatches =
+                hostname === suffix.slice(1) || hostname.endsWith(suffix);
+        }
+        else {
+            hostnameMatches = hostname === ruleHostname;
+        }
+        // Check port match (if rule specifies a port)
+        const portMatches = !rulePort || port === rulePort;
+        if (hostnameMatches && portMatches) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Determines if the request should bypass the proxy.
+ *
+ * @param url The target URL
+ * @returns true if the request should go direct (no proxy)
+ */
+function shouldBypassProxy(url) {
     const httpProxy = process.env.GLOBAL_AGENT_HTTP_PROXY || process.env.HTTP_PROXY;
     const httpsProxy = process.env.GLOBAL_AGENT_HTTPS_PROXY || process.env.HTTPS_PROXY;
     const proxyUrl = httpsProxy || httpProxy;
+    // No proxy configured
     if (!proxyUrl || !proxyUrl.trim()) {
-        return false;
+        return true;
     }
-    const trimmedProxyUrl = proxyUrl.trim();
-    // Validate URL format
+    // Validate proxy URL format
     try {
-        new URL(trimmedProxyUrl);
+        new URL(proxyUrl.trim());
     }
-    catch (error) {
+    catch (_a) {
         console.log("[fetch] Invalid proxy URL format:", proxyUrl);
-        return false;
+        return true;
+    }
+    // Check NO_PROXY patterns
+    if (url) {
+        const noProxy = process.env.GLOBAL_AGENT_NO_PROXY || process.env.NO_PROXY || "";
+        if (noProxy && isUrlMatchingNoProxy(url, noProxy)) {
+            console.log("[fetch] URL matches NO_PROXY pattern, bypassing proxy", {
+                url,
+                noProxy,
+            });
+            return true;
+        }
     }
-    const rejectUnauthorized = (options === null || options === void 0 ? void 0 : options.rejectUnauthorized) !== undefined
-        ? options === null || options === void 0 ? void 0 : options.rejectUnauthorized
-        : true;
+    return false;
+}
+/**
+ * Creates a direct Agent (no proxy).
+ */
+function createDirectAgent(rejectUnauthorized) {
+    return new undici_1.Agent({
+        connect: {
+            rejectUnauthorized,
+        },
+    });
+}
+/**
+ * Creates a ProxyAgent for proxied requests.
+ */
+function createProxyAgent(rejectUnauthorized) {
+    const httpProxy = process.env.GLOBAL_AGENT_HTTP_PROXY || process.env.HTTP_PROXY;
+    const httpsProxy = process.env.GLOBAL_AGENT_HTTPS_PROXY || process.env.HTTPS_PROXY;
+    const proxyUrl = (httpsProxy || httpProxy).trim();
     console.log("[fetch] Creating ProxyAgent", {
-        proxyUrl: trimmedProxyUrl,
+        proxyUrl,
         rejectUnauthorized,
     });
     const proxyConfig = {
-        uri: trimmedProxyUrl,
+        uri: proxyUrl,
         requestTls: {
             rejectUnauthorized,
         },
     };
     // Only configure proxyTls if the proxy itself uses HTTPS
-    if (trimmedProxyUrl.startsWith("https://")) {
+    if (proxyUrl.startsWith("https://")) {
         proxyConfig.proxyTls = {
             rejectUnauthorized,
         };
     }
-    try {
-        return new undici_1.ProxyAgent(proxyConfig);
-    }
-    catch (error) {
-        console.log("[fetch] Failed to create ProxyAgent:", error);
-        return false;
-    }
+    return new undici_1.ProxyAgent(proxyConfig);
 }
-let cachedDispatcher = null;
 /**
- * Get or create a cached proxy dispatcher.
- * The dispatcher is cached to avoid creating a new ProxyAgent for every request.
+ * Creates a fetch dispatcher that respects global-agent environment variables.
+ * Always returns a usable Dispatcher - either a ProxyAgent or a direct Agent.
  *
- * @param options Optional configuration for the ProxyAgent
+ * @param options Configuration for the dispatcher
+ * @returns A Dispatcher (ProxyAgent for proxied requests, Agent for direct requests)
  */
-function getProxyDispatcher(options) {
-    // Don't cache if custom options are provided
-    if (options) {
-        return createProxyDispatcher(options) || false;
-    }
-    if (cachedDispatcher === null) {
-        cachedDispatcher = createProxyDispatcher();
+function createDispatcher(options) {
+    var _a;
+    const rejectUnauthorized = (_a = options === null || options === void 0 ? void 0 : options.rejectUnauthorized) !== null && _a !== void 0 ? _a : true;
+    if (shouldBypassProxy(options === null || options === void 0 ? void 0 : options.url)) {
+        return createDirectAgent(rejectUnauthorized);
     }
-    return cachedDispatcher || false;
+    return createProxyAgent(rejectUnauthorized);
 }
 /**
- * Reset the cached proxy dispatcher. Used for testing.
+ * Get a dispatcher for fetch requests.
+ * Always returns a usable Dispatcher - either a ProxyAgent or a direct Agent.
+ * The dispatcher respects GLOBAL_AGENT_HTTP_PROXY, GLOBAL_AGENT_HTTPS_PROXY,
+ * GLOBAL_AGENT_NO_PROXY, and their standard equivalents.
+ *
+ * @param options Configuration for the dispatcher
+ * @returns A Dispatcher ready to use with fetch
  */
-function resetProxyDispatcherCache() {
-    cachedDispatcher = null;
+function getDispatcher(options) {
+    return createDispatcher(options);
 }
 //# sourceMappingURL=fetch.js.map

package/dist/src/utils/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":";;AA8EA,gDAYC;AAKD,8DAEC;AAjGD,mCAAmC;AAEnC;;;;;;;GAOG;AACH,SAAS,qBAAqB,CAAC,OAE9B;IACC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;IAC/D,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEjE,MAAM,QAAQ,GAAG,UAAU,IAAI,SAAS,CAAA;IAExC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QAClC,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;IAEvC,sBAAsB;IACtB,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,eAAe,CAAC,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,QAAQ,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,kBAAkB,GACtB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,MAAK,SAAS;QACvC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB;QAC7B,CAAC,CAAC,IAAI,CAAA;IAEV,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE;QACzC,QAAQ,EAAE,eAAe;QACzB,kBAAkB;KACnB,CAAC,CAAA;IAEF,MAAM,WAAW,GAIb;QACF,GAAG,EAAE,eAAe;QACpB,UAAU,EAAE;YACV,kBAAkB;SACnB;KACF,CAAA;IAED,yDAAyD;IACzD,IAAI,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,WAAW,CAAC,QAAQ,GAAG;YACrB,kBAAkB;SACnB,CAAA;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,mBAAU,CAAC,WAAW,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,IAAI,gBAAgB,GAAgC,IAAI,CAAA;AAExD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,OAElC;IACC,6CAA6C;IAC7C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,qBAAqB,CAAC,OAAO,CAAC,IAAI,KAAK,CAAA;IAChD,CAAC;IAED,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;QAC9B,gBAAgB,GAAG,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IACD,OAAO,gBAAgB,IAAI,KAAK,CAAA;AAClC,CAAC;AAED;;GAEG;AACH,SAAgB,yBAAyB;IACvC,gBAAgB,GAAG,IAAI,CAAA;AACzB,CAAC"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "3.23.38",
+  "version": "3.23.48",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -39,6 +39,7 @@
     "@budibase/shared-core": "*",
     "@budibase/types": "*",
     "@koa/router": "13.1.0",
+    "@smithy/node-http-handler": "^4.1.1",
     "@techpass/passport-openidconnect": "0.3.3",
     "aws-cloudfront-sign": "3.0.2",
     "aws-sdk": "2.1692.0",
@@ -112,5 +113,5 @@
       }
     }
   },
-  "gitHead": "83fecbd6e6b9e5f5d26369ce51d2173801925e3a"
+  "gitHead": "0a78faa2adbb8fb3b81de2b9b00352e60178f12f"
 }