@revenexx/integrations-node-sdk 1.8.0 → 1.9.0

package/dist/index.cjs

@@ -496,6 +496,43 @@ var CROSS_ORIGIN_SAFE_HEADERS = /* @__PURE__ */ new Set([
 function headerCrossesOrigin(name) {
   return CROSS_ORIGIN_SAFE_HEADERS.has(name.trim().toLowerCase());
 }
+var UNSENDABLE_IN_HEADER_VALUE = /[\0-\x08\x0a-\x1f\x7f\u0100-\uffff]/;
+var HEADER_NAME_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+function isHttpWhitespace(code) {
+  return code === 9 || code === 10 || code === 13 || code === 32;
+}
+function trimHttpWhitespace(value) {
+  let start = 0;
+  let end = value.length;
+  while (start < end && isHttpWhitespace(value.charCodeAt(start))) start++;
+  while (end > start && isHttpWhitespace(value.charCodeAt(end - 1))) end--;
+  return value.slice(start, end);
+}
+function invalidHeader(detail) {
+  return new NodeError("INVALID_HEADER", detail, { status: 0 });
+}
+function sendableHeaders(headers) {
+  if (typeof headers !== "object" || headers === null) {
+    throw invalidHeader("Headers must be an object or a list of pairs");
+  }
+  if (!(Symbol.iterator in headers) && Object.getOwnPropertySymbols(headers).length > 0) {
+    throw invalidHeader("A header name must be a string, not a symbol");
+  }
+  const entries = Symbol.iterator in headers ? Array.from(headers) : Object.entries(headers);
+  return entries.map((entry, i) => {
+    const pair = typeof entry === "object" && entry !== null && Symbol.iterator in entry ? Array.from(entry) : [];
+    if (pair.length !== 2) throw invalidHeader(`Header entry ${i} is not a name/value pair`);
+    const name = String(pair[0]);
+    const value = String(pair[1]);
+    if (!HEADER_NAME_TOKEN.test(name)) {
+      throw invalidHeader(`Header name ${JSON.stringify(name)} cannot be sent`);
+    }
+    if (UNSENDABLE_IN_HEADER_VALUE.test(trimHttpWhitespace(value))) {
+      throw invalidHeader(`Header ${JSON.stringify(name)} has a character in its value that cannot be sent`);
+    }
+    return [name, value];
+  });
+}
 var DEFAULT_RETRY_ATTEMPTS = 0;
 var MAX_RETRY_ATTEMPTS = 5;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
@@ -535,6 +572,15 @@ async function guardUrl(url, ctxSignal, effectiveMs) {
     clearTimeout(timer);
   }
 }
+function hasContent(body) {
+  if (body == null) return false;
+  if (typeof body === "string") return body.length > 0;
+  if (body instanceof ArrayBuffer) return body.byteLength > 0;
+  if (ArrayBuffer.isView(body)) return body.byteLength > 0;
+  if (body instanceof Blob) return body.size > 0;
+  if (body instanceof URLSearchParams) return body.toString().length > 0;
+  return true;
+}
 async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
   let currentUrl = url;
   let currentInit = { ...fetchOptions, redirect: "manual" };
@@ -567,8 +613,7 @@ async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
     if (base.protocol === "https:" && nextUrl.protocol !== "https:") {
       throw new NodeError("BLOCKED_ADDRESS", "Blocked https\u2192http downgrade on redirect", { status: 0 });
     }
-    await guardUrl(nextUrl, ctxSignal, effectiveMs);
-    const headers = new Headers(currentInit.headers ?? void 0);
+    const headers = new Headers(currentInit.headers);
     let method = (currentInit.method ?? "GET").toUpperCase();
     let body = currentInit.body;
     if (redirectStatus === 303 || (redirectStatus === 301 || redirectStatus === 302) && method === "POST") {
@@ -577,6 +622,14 @@ async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
       headers.delete("content-type");
       headers.delete("content-length");
     }
+    if (hasContent(body) && nextUrl.origin !== base.origin) {
+      throw new NodeError(
+        "BLOCKED_ADDRESS",
+        `Blocked ${redirectStatus} redirect to another origin: it would resend the request body to ${nextUrl.origin}`,
+        { status: 0 }
+      );
+    }
+    await guardUrl(nextUrl, ctxSignal, effectiveMs);
     if (nextUrl.origin !== base.origin) {
       for (const name of [...headers.keys()]) {
         if (!headerCrossesOrigin(name)) headers.delete(name);
@@ -593,6 +646,8 @@ async function safeFetch(url, options = {}) {
   const safeAttempts = Number.isFinite(rawAttempts) ? Math.min(Math.max(0, rawAttempts), MAX_RETRY_ATTEMPTS) : DEFAULT_RETRY_ATTEMPTS;
   const maxAttempts = safeAttempts + 1;
   const retryDelayMs = retry?.delayMs ?? DEFAULT_RETRY_DELAY_MS;
+  if (ctxSignal?.aborted) throw ctxSignal.reason;
+  if (fetchOptions.headers !== void 0) fetchOptions.headers = sendableHeaders(fetchOptions.headers);
   let lastError;
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     if (ctxSignal?.aborted) throw ctxSignal.reason;

package/dist/index.js

@@ -404,6 +404,43 @@ var CROSS_ORIGIN_SAFE_HEADERS = /* @__PURE__ */ new Set([
 function headerCrossesOrigin(name) {
   return CROSS_ORIGIN_SAFE_HEADERS.has(name.trim().toLowerCase());
 }
+var UNSENDABLE_IN_HEADER_VALUE = /[\0-\x08\x0a-\x1f\x7f\u0100-\uffff]/;
+var HEADER_NAME_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+function isHttpWhitespace(code) {
+  return code === 9 || code === 10 || code === 13 || code === 32;
+}
+function trimHttpWhitespace(value) {
+  let start = 0;
+  let end = value.length;
+  while (start < end && isHttpWhitespace(value.charCodeAt(start))) start++;
+  while (end > start && isHttpWhitespace(value.charCodeAt(end - 1))) end--;
+  return value.slice(start, end);
+}
+function invalidHeader(detail) {
+  return new NodeError("INVALID_HEADER", detail, { status: 0 });
+}
+function sendableHeaders(headers) {
+  if (typeof headers !== "object" || headers === null) {
+    throw invalidHeader("Headers must be an object or a list of pairs");
+  }
+  if (!(Symbol.iterator in headers) && Object.getOwnPropertySymbols(headers).length > 0) {
+    throw invalidHeader("A header name must be a string, not a symbol");
+  }
+  const entries = Symbol.iterator in headers ? Array.from(headers) : Object.entries(headers);
+  return entries.map((entry, i) => {
+    const pair = typeof entry === "object" && entry !== null && Symbol.iterator in entry ? Array.from(entry) : [];
+    if (pair.length !== 2) throw invalidHeader(`Header entry ${i} is not a name/value pair`);
+    const name = String(pair[0]);
+    const value = String(pair[1]);
+    if (!HEADER_NAME_TOKEN.test(name)) {
+      throw invalidHeader(`Header name ${JSON.stringify(name)} cannot be sent`);
+    }
+    if (UNSENDABLE_IN_HEADER_VALUE.test(trimHttpWhitespace(value))) {
+      throw invalidHeader(`Header ${JSON.stringify(name)} has a character in its value that cannot be sent`);
+    }
+    return [name, value];
+  });
+}
 var DEFAULT_RETRY_ATTEMPTS = 0;
 var MAX_RETRY_ATTEMPTS = 5;
 var DEFAULT_RETRY_DELAY_MS = 1e3;
@@ -443,6 +480,15 @@ async function guardUrl(url, ctxSignal, effectiveMs) {
     clearTimeout(timer);
   }
 }
+function hasContent(body) {
+  if (body == null) return false;
+  if (typeof body === "string") return body.length > 0;
+  if (body instanceof ArrayBuffer) return body.byteLength > 0;
+  if (ArrayBuffer.isView(body)) return body.byteLength > 0;
+  if (body instanceof Blob) return body.size > 0;
+  if (body instanceof URLSearchParams) return body.toString().length > 0;
+  return true;
+}
 async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
   let currentUrl = url;
   let currentInit = { ...fetchOptions, redirect: "manual" };
@@ -475,8 +521,7 @@ async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
     if (base.protocol === "https:" && nextUrl.protocol !== "https:") {
       throw new NodeError("BLOCKED_ADDRESS", "Blocked https\u2192http downgrade on redirect", { status: 0 });
     }
-    await guardUrl(nextUrl, ctxSignal, effectiveMs);
-    const headers = new Headers(currentInit.headers ?? void 0);
+    const headers = new Headers(currentInit.headers);
     let method = (currentInit.method ?? "GET").toUpperCase();
     let body = currentInit.body;
     if (redirectStatus === 303 || (redirectStatus === 301 || redirectStatus === 302) && method === "POST") {
@@ -485,6 +530,14 @@ async function guardedFetch(url, fetchOptions, ctxSignal, effectiveMs) {
       headers.delete("content-type");
       headers.delete("content-length");
     }
+    if (hasContent(body) && nextUrl.origin !== base.origin) {
+      throw new NodeError(
+        "BLOCKED_ADDRESS",
+        `Blocked ${redirectStatus} redirect to another origin: it would resend the request body to ${nextUrl.origin}`,
+        { status: 0 }
+      );
+    }
+    await guardUrl(nextUrl, ctxSignal, effectiveMs);
     if (nextUrl.origin !== base.origin) {
       for (const name of [...headers.keys()]) {
         if (!headerCrossesOrigin(name)) headers.delete(name);
@@ -501,6 +554,8 @@ async function safeFetch(url, options = {}) {
   const safeAttempts = Number.isFinite(rawAttempts) ? Math.min(Math.max(0, rawAttempts), MAX_RETRY_ATTEMPTS) : DEFAULT_RETRY_ATTEMPTS;
   const maxAttempts = safeAttempts + 1;
   const retryDelayMs = retry?.delayMs ?? DEFAULT_RETRY_DELAY_MS;
+  if (ctxSignal?.aborted) throw ctxSignal.reason;
+  if (fetchOptions.headers !== void 0) fetchOptions.headers = sendableHeaders(fetchOptions.headers);
   let lastError;
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     if (ctxSignal?.aborted) throw ctxSignal.reason;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revenexx/integrations-node-sdk",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "TypeScript interfaces and utilities for Revenexx integration nodes",
   "license": "MIT",
   "author": "revenexx GmbH",