@blamejs/blamejs-shop 0.5.19 → 0.5.21

package/lib/storefront-forms.js

@@ -74,6 +74,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var MAX_SLUG_LEN              = 80;
 var MAX_TITLE_LEN              = 200;
@@ -144,14 +145,9 @@ var WEBHOOK_EVENT_RE = /^[a-z][a-z0-9_]*(?:\.[a-z][a-z0-9_]*)*$/;
 // Refuse C0 control bytes + DEL in single-line strings. Textarea
 // values permit LF (the customer's free-text response is line-
 // oriented).
-var CONTROL_BYTE_LINE_RE  = /[\x00-\x1f\x7f]/;
-var CONTROL_BYTE_BLOCK_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
 
 // Zero-width / direction-override family. Spelled with \u-escapes
 // so ESLint's no-irregular-whitespace stays happy.
-var ZERO_WIDTH_RE = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- validators ---------------------------------------------------------
 
@@ -170,10 +166,10 @@ function _line(s, label, maxLen, optional) {
   if (typeof s !== "string" || !s.length || s.length > maxLen) {
     throw new TypeError("storefrontForms: " + label + " must be a non-empty string ≤ " + maxLen + " chars");
   }
-  if (CONTROL_BYTE_LINE_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s, { singleLine: "reject" })) {
     throw new TypeError("storefrontForms: " + label + " contains control bytes (incl. CR/LF)");
   }
-  if (ZERO_WIDTH_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s, { zeroWidth: "reject" })) {
     throw new TypeError("storefrontForms: " + label + " contains zero-width / direction-override characters");
   }
   return s;
@@ -184,12 +180,7 @@ function _description(s) {
   if (typeof s !== "string" || s.length > MAX_DESCRIPTION_LEN) {
     throw new TypeError("storefrontForms: description must be a string ≤ " + MAX_DESCRIPTION_LEN + " chars");
   }
-  if (CONTROL_BYTE_BLOCK_RE.test(s)) {
-    throw new TypeError("storefrontForms: description contains control bytes");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("storefrontForms: description contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "storefrontForms: description", { zeroWidth: "reject" });
   return s;
 }
 
@@ -246,7 +237,7 @@ function _fields(input) {
         if (typeof opt !== "string" || !opt.length || opt.length > MAX_OPTION_LEN) {
           throw new TypeError("storefrontForms: fields[" + i + "].options[" + j + "] must be a non-empty string ≤ " + MAX_OPTION_LEN + " chars");
         }
-        if (CONTROL_BYTE_LINE_RE.test(opt) || ZERO_WIDTH_RE.test(opt)) {
+        if (textGuard.hasCodepointThreat(opt, { singleLine: "reject", zeroWidth: "reject" })) {
           throw new TypeError("storefrontForms: fields[" + i + "].options[" + j + "] contains control / zero-width characters");
         }
         if (Object.prototype.hasOwnProperty.call(seenOpts, opt)) {
@@ -275,9 +266,7 @@ function _submitTo(input) {
   if (typeof input.value !== "string" || !input.value.length || input.value.length > MAX_SUBMIT_TO_VALUE_LEN) {
     throw new TypeError("storefrontForms: submit_to.value must be a non-empty string ≤ " + MAX_SUBMIT_TO_VALUE_LEN + " chars");
   }
-  if (CONTROL_BYTE_LINE_RE.test(input.value) || ZERO_WIDTH_RE.test(input.value)) {
-    throw new TypeError("storefrontForms: submit_to.value contains control / zero-width characters");
-  }
+  textGuard.freeText(input.value, "storefrontForms: submit_to.value", { singleLine: "reject", zeroWidth: "reject" });
   if (input.kind === "email") {
     var v = b.guardEmail.validate(input.value, { profile: "strict" });
     if (!v.ok) {
@@ -329,9 +318,7 @@ function _ipHash(s) {
   if (typeof s !== "string" || !s.length || s.length > 256) {
     throw new TypeError("storefrontForms: ip_hash must be a non-empty string ≤ 256 chars");
   }
-  if (CONTROL_BYTE_LINE_RE.test(s)) {
-    throw new TypeError("storefrontForms: ip_hash contains control bytes");
-  }
+  textGuard.freeText(s, "storefrontForms: ip_hash", { singleLine: "reject" });
   return s;
 }
 
@@ -358,7 +345,7 @@ function _validateValue(field, raw) {
     if (typeof raw !== "string" || raw.length > MAX_TEXT_VALUE_LEN) {
       return { ok: false, error: "text value must be a string ≤ " + MAX_TEXT_VALUE_LEN + " chars" };
     }
-    if (CONTROL_BYTE_LINE_RE.test(raw) || ZERO_WIDTH_RE.test(raw)) {
+    if (textGuard.hasCodepointThreat(raw, { singleLine: "reject", zeroWidth: "reject" })) {
       return { ok: false, error: "text value contains control / zero-width characters" };
     }
     return { ok: true, value: raw };
@@ -387,7 +374,7 @@ function _validateValue(field, raw) {
     if (typeof raw !== "string" || !raw.length || raw.length > MAX_TEXTAREA_VALUE_LEN) {
       return { ok: false, error: "textarea value must be a non-empty string ≤ " + MAX_TEXTAREA_VALUE_LEN + " chars" };
     }
-    if (CONTROL_BYTE_BLOCK_RE.test(raw) || ZERO_WIDTH_RE.test(raw)) {
+    if (textGuard.hasCodepointThreat(raw, { zeroWidth: "reject" })) {
       return { ok: false, error: "textarea value contains control / zero-width characters" };
     }
     return { ok: true, value: raw };

package/lib/storefront-pages.js

@@ -74,6 +74,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var MAX_SLUG_LEN              = 80;
 var MAX_TITLE_LEN             = 200;
@@ -112,15 +113,10 @@ var SLUG_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,79}$/;
 // body permits LF (Markdown is line-oriented); single-line fields
 // refuse LF / CR so they can't smuggle a second line into a page
 // header / meta tag.
-var CONTROL_BYTE_LINE_RE  = /[\x00-\x1f\x7f]/;
-var CONTROL_BYTE_BLOCK_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
 
 // Zero-width / direction-override family — mirrors the promo-banners
 // + gift-options catalogues. Spelled with \u-escapes so ESLint's
 // no-irregular-whitespace stays happy.
-var ZERO_WIDTH_RE = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- validators ---------------------------------------------------------
 
@@ -135,12 +131,7 @@ function _title(s) {
   if (typeof s !== "string" || !s.length || s.length > MAX_TITLE_LEN) {
     throw new TypeError("storefrontPages: title must be a non-empty string ≤ " + MAX_TITLE_LEN + " chars");
   }
-  if (CONTROL_BYTE_LINE_RE.test(s)) {
-    throw new TypeError("storefrontPages: title contains control bytes (incl. CR/LF)");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("storefrontPages: title contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "storefrontPages: title", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }
 
@@ -148,12 +139,7 @@ function _body(s) {
   if (typeof s !== "string" || !s.length || s.length > MAX_BODY_LEN) {
     throw new TypeError("storefrontPages: body must be a non-empty string ≤ " + MAX_BODY_LEN + " chars");
   }
-  if (CONTROL_BYTE_BLOCK_RE.test(s)) {
-    throw new TypeError("storefrontPages: body contains control bytes");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("storefrontPages: body contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "storefrontPages: body", { zeroWidth: "reject" });
   return s;
 }
 
@@ -162,10 +148,10 @@ function _metaLine(s, label, maxLen) {
   if (typeof s !== "string" || s.length > maxLen) {
     throw new TypeError("storefrontPages: " + label + " must be a string ≤ " + maxLen + " chars");
   }
-  if (CONTROL_BYTE_LINE_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s, { singleLine: "reject" })) {
     throw new TypeError("storefrontPages: " + label + " contains control bytes (incl. CR/LF)");
   }
-  if (ZERO_WIDTH_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s, { zeroWidth: "reject" })) {
     throw new TypeError("storefrontPages: " + label + " contains zero-width / direction-override characters");
   }
   return s;
@@ -239,7 +225,7 @@ function _esc(s) {
 // downgrade an inline link.
 function _safeLinkUrl(url) {
   if (typeof url !== "string" || !url.length || url.length > 2048) return null;
-  if (CONTROL_BYTE_LINE_RE.test(url) || ZERO_WIDTH_RE.test(url)) return null;
+  if (textGuard.hasCodepointThreat(url, { singleLine: "reject", zeroWidth: "reject" })) return null;
   if (url.charCodeAt(0) === 47 /* "/" */) {
     if (url.length > 1 && url.charCodeAt(1) === 47) return null;
     if (url.indexOf("..") !== -1) return null;

package/lib/storefront.js

@@ -39,6 +39,7 @@ var REGISTRY_OCCASIONS = giftRegistryModule.OCCASIONS;
 var { AsyncLocalStorage } = require("node:async_hooks");   // allow:non-shop-require — Node-core per-request context (no npm dep); the framework itself composes it in db-role-context / log. No b.* request-context primitive exists to wrap it.
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 // Per-request locale context store. The storefront's locale middleware
 // resolves the request's locale + chrome strings once and seeds this
@@ -2141,7 +2142,6 @@ function _clampPage(page, total, pageSize) {
 var SEARCH_MAX_FACET_KEYS   = 32;
 var SEARCH_MAX_FACET_VALUES = 64;
 var SEARCH_MAX_VALUE_LEN    = 256;
-var SEARCH_CONTROL_BYTE_RE  = /[\x00-\x1f\x7f]/;
 // Global twin for strip-all replaces (the non-global one above is used for
 // presence tests; `.replace` needs the `g` flag to clear every byte).
 var SEARCH_CONTROL_BYTE_RE_G = /[\x00-\x1f\x7f]/g;
@@ -2162,7 +2162,7 @@ function _parseSearchFilters(url, facetDefs) {
     if (!Object.prototype.hasOwnProperty.call(known, rawKey)) return;
     if (typeof rawVal !== "string") return;
     if (!rawVal.length || rawVal.length > SEARCH_MAX_VALUE_LEN) return;
-    if (SEARCH_CONTROL_BYTE_RE.test(rawVal)) return;
+    if (textGuard.hasCodepointThreat(rawVal, { singleLine: "reject" })) return;
     if (!Object.prototype.hasOwnProperty.call(out, rawKey)) {
       if (keyCount >= SEARCH_MAX_FACET_KEYS) return;
       out[rawKey] = [];
@@ -15928,28 +15928,26 @@ function mount(router, deps) {
         // is built from the validated UUID order id alone (hex + hyphens),
         // carrying no quote/CRLF that could break out of the header.
         var safeId = String(o.id).replace(/[^A-Za-z0-9._-]/g, "");
-        res.status(200);
-        if (res.setHeader) {
-          res.setHeader("content-type", "text/html; charset=utf-8");
-          res.setHeader("content-disposition", "attachment; filename=\"receipt-" + safeId + ".html\"");
-          res.setHeader("x-content-type-options", "nosniff");
-          // The receipt carries the buyer's name + address + line items —
-          // keep it out of any shared/proxy cache.
-          res.setHeader("cache-control", "no-store");
-        }
         // One chunk per batch as the source yields it — bounded memory
-        // regardless of document size. A response without an incremental
-        // write() (a JSON test stub) falls back to buffering.
-        if (typeof res.write === "function" && typeof res.end === "function") {
-          for await (var chunk of _streamReceiptDocument(doc)) {
-            if (chunk) res.write(chunk);
-          }
-          res.end();
-        } else {
-          var buffered = "";
-          for await (var c2 of _streamReceiptDocument(doc)) buffered += c2;
-          if (res.end) res.end(buffered); else res.send(buffered);
-        }
+        // regardless of document size. render.stream awaits backpressure so a
+        // slow client cannot queue the whole document in the socket buffer,
+        // stops when the peer disconnects, and signals a mid-stream failure as
+        // a broken transfer rather than ending a truncated body as a clean 200.
+        //
+        // Headers go in the call, not via setHeader beforehand: render.stream
+        // writes its own defaults with the first chunk, and its default
+        // Content-Type would replace one set earlier. Cache-Control is set
+        // explicitly because the receipt carries the buyer's name, address and
+        // line items and must stay out of any shared or proxy cache.
+        await b.render.stream(res, _streamReceiptDocument(doc), {
+          status:  200,
+          headers: {
+            "Content-Type":           "text/html; charset=utf-8",
+            "Content-Disposition":    "attachment; filename=\"receipt-" + safeId + ".html\"",
+            "X-Content-Type-Options": "nosniff",
+            "Cache-Control":          "no-store",
+          },
+        });
       });
     }
 

package/lib/subscription-billing.js

@@ -75,6 +75,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 // ---- constants ----------------------------------------------------------
 
@@ -94,10 +95,6 @@ var DEFAULT_LIST_LIMIT      = 100;
 // sibling subscription-controls primitive — operator-authored prose
 // flows into receipt emails + the operator dashboard, so the same
 // "no direction-override / no invisible glyph" floor applies.
-var CONTROL_BYTE_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
-var ZERO_WIDTH_RE   = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- validators ---------------------------------------------------------
 
@@ -146,9 +143,7 @@ function _reason(s) {
   if (s.length > MAX_REASON_LEN) {
     throw new TypeError("subscriptionBilling: reason must be <= " + MAX_REASON_LEN + " characters");
   }
-  if (CONTROL_BYTE_RE.test(s) || ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("subscriptionBilling: reason contains control / zero-width bytes");
-  }
+  textGuard.freeText(s, "subscriptionBilling: reason", { zeroWidth: "reject" });
   return s;
 }
 
@@ -164,7 +159,7 @@ function _shortText(s, label, max) {
   if (s.length > max) {
     throw new TypeError("subscriptionBilling: " + label + " must be <= " + max + " characters");
   }
-  if (CONTROL_BYTE_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s)) {
     throw new TypeError("subscriptionBilling: " + label + " contains control bytes");
   }
   return s;

package/lib/subscription-controls.js

@@ -51,6 +51,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var C = b.constants;
 
@@ -123,10 +124,6 @@ var MAX_QUANTITY         = 1000000;
 // prose. Refuses C0 / DEL and the LRM/RLM/ZWJ/ZWNJ family so a
 // malicious reason can't smuggle direction-override / invisible
 // content into the operator dashboard.
-var CONTROL_BYTE_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
-var ZERO_WIDTH_RE   = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- validators ---------------------------------------------------------
 
@@ -142,9 +139,7 @@ function _reason(s) {
   if (s.length > MAX_REASON_LEN) {
     throw new TypeError("subscriptionControls: reason must be <= " + MAX_REASON_LEN + " characters");
   }
-  if (CONTROL_BYTE_RE.test(s) || ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("subscriptionControls: reason contains control / zero-width bytes");
-  }
+  textGuard.freeText(s, "subscriptionControls: reason", { zeroWidth: "reject" });
   return s;
 }
 

package/lib/suggestion-box.js

@@ -119,6 +119,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 // ---- constants ----------------------------------------------------------
 
@@ -168,11 +169,6 @@ var ORDER_KEY_NEWEST          = ["created_at:desc", "id:desc"];
 var ORDER_KEY_TOP_VOTED       = ["vote_count:desc", "id:desc"];
 var ORDER_KEY_MOST_DISCUSSED  = ["comment_count:desc", "id:desc"];
 
-var CONTROL_BYTE_BODY_RE   = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
-var CONTROL_BYTE_STRICT_RE = /[\x00-\x1f\x7f]/;
-var ZERO_WIDTH_RE          = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- monotonic clock ----------------------------------------------------
 //
@@ -205,12 +201,7 @@ function _title(s) {
   if (s.length > MAX_TITLE_LEN) {
     throw new TypeError("suggestionBox: title must be <= " + MAX_TITLE_LEN + " characters");
   }
-  if (CONTROL_BYTE_STRICT_RE.test(s)) {
-    throw new TypeError("suggestionBox: title must not contain control bytes");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("suggestionBox: title contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "suggestionBox: title", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }
 
@@ -225,12 +216,10 @@ function _body(s) {
   if (s.length > MAX_BODY_LEN) {
     throw new TypeError("suggestionBox: body must be <= " + MAX_BODY_LEN + " characters");
   }
-  if (CONTROL_BYTE_BODY_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s)) {
     throw new TypeError("suggestionBox: body must not contain control bytes");
   }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("suggestionBox: body contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "suggestionBox: body", { zeroWidth: "reject" });
   return s;
 }
 
@@ -307,9 +296,7 @@ function _sessionIdRaw(s) {
   if (s.length > 256) {
     throw new TypeError("suggestionBox: session_id must be <= 256 characters");
   }
-  if (CONTROL_BYTE_STRICT_RE.test(s) || ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("suggestionBox: session_id contains control / zero-width bytes");
-  }
+  textGuard.freeText(s, "suggestionBox: session_id", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }
 
@@ -320,12 +307,10 @@ function _response(s) {
   if (s.length > MAX_RESPONSE_LEN) {
     throw new TypeError("suggestionBox: response must be <= " + MAX_RESPONSE_LEN + " characters");
   }
-  if (CONTROL_BYTE_BODY_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s)) {
     throw new TypeError("suggestionBox: response must not contain control bytes");
   }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("suggestionBox: response contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "suggestionBox: response", { zeroWidth: "reject" });
   // A status-only transition is allowed with response === "" (no
   // operator-visible reply, just a state change). Trim-then-check
   // for the operator-supplied case below in respondToSuggestion.
@@ -339,9 +324,7 @@ function _responder(s) {
   if (s.length > MAX_RESPONDER_LEN) {
     throw new TypeError("suggestionBox: responder must be <= " + MAX_RESPONDER_LEN + " characters");
   }
-  if (CONTROL_BYTE_STRICT_RE.test(s) || ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("suggestionBox: responder contains control / zero-width characters");
-  }
+  textGuard.freeText(s, "suggestionBox: responder", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }
 
@@ -925,7 +908,7 @@ function create(opts) {
       if (typeof input.email_hash !== "string" || !input.email_hash.length || input.email_hash.length > 256) {
         throw new TypeError("suggestionBox." + method + ": email_hash must be a non-empty string <= 256 chars when provided");
       }
-      if (CONTROL_BYTE_STRICT_RE.test(input.email_hash) || ZERO_WIDTH_RE.test(input.email_hash)) {
+      if (textGuard.hasCodepointThreat(input.email_hash, { singleLine: "reject", zeroWidth: "reject" })) {
         throw new TypeError("suggestionBox." + method + ": email_hash contains control / zero-width bytes");
       }
       emailHash = input.email_hash;

package/lib/support-tickets.js

@@ -62,6 +62,7 @@ var DEFAULT_LIST_LIMIT  = 25;
 var EMAIL_NAMESPACE     = "support-ticket-email";
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var ALLOWED_AUTHORS    = ["customer", "operator", "system"];
 var ALLOWED_CATEGORIES = [
@@ -104,14 +105,9 @@ var LIST_ORDER_KEY = ["opened_at:desc", "id:desc"];
 // Refuse C0 control bytes + DEL. Newlines (LF/CR) + tab are tolerated
 // in body so multi-line customer narratives work; subject is single-
 // line by convention and refuses them.
-var CONTROL_BYTE_RE       = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
-var CONTROL_BYTE_STRICT_RE = /[\x00-\x1f\x7f]/;
 // Zero-width + direction-override family (see orderNotes for the
 // same justification). Spelled via \u escapes so the file stays
 // ESLint no-irregular-whitespace clean.
-var ZERO_WIDTH_RE = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 // ---- validators ---------------------------------------------------------
 
@@ -159,12 +155,7 @@ function _subject(s) {
   if (s.length > MAX_SUBJECT_LEN) {
     throw new TypeError("supportTickets: subject must be <= " + MAX_SUBJECT_LEN + " characters");
   }
-  if (CONTROL_BYTE_STRICT_RE.test(s)) {
-    throw new TypeError("supportTickets: subject contains control bytes");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("supportTickets: subject contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "supportTickets: subject", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }
 
@@ -179,12 +170,7 @@ function _body(s) {
   if (s.length > MAX_BODY_LEN) {
     throw new TypeError("supportTickets: body must be <= " + MAX_BODY_LEN + " characters");
   }
-  if (CONTROL_BYTE_RE.test(s)) {
-    throw new TypeError("supportTickets: body contains control bytes");
-  }
-  if (ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("supportTickets: body contains zero-width / direction-override characters");
-  }
+  textGuard.freeText(s, "supportTickets: body", { zeroWidth: "reject" });
   return s;
 }
 
@@ -205,7 +191,7 @@ function _tags(input) {
     if (t.length > MAX_TAG_LEN) {
       throw new TypeError("supportTickets: tags[" + i + "] must be <= " + MAX_TAG_LEN + " characters");
     }
-    if (CONTROL_BYTE_STRICT_RE.test(t) || ZERO_WIDTH_RE.test(t)) {
+    if (textGuard.hasCodepointThreat(t, { singleLine: "reject", zeroWidth: "reject" })) {
       throw new TypeError("supportTickets: tags[" + i + "] contains control / zero-width bytes");
     }
     out.push(t);
@@ -220,9 +206,7 @@ function _singleTag(t) {
   if (t.length > MAX_TAG_LEN) {
     throw new TypeError("supportTickets: tag must be <= " + MAX_TAG_LEN + " characters");
   }
-  if (CONTROL_BYTE_STRICT_RE.test(t) || ZERO_WIDTH_RE.test(t)) {
-    throw new TypeError("supportTickets: tag contains control / zero-width bytes");
-  }
+  textGuard.freeText(t, "supportTickets: tag", { singleLine: "reject", zeroWidth: "reject" });
   return t;
 }
 
@@ -235,9 +219,7 @@ function _reason(r) {
   if (r.length > MAX_REASON_LEN) {
     throw new TypeError("supportTickets: reason must be <= " + MAX_REASON_LEN + " characters");
   }
-  if (CONTROL_BYTE_RE.test(r) || ZERO_WIDTH_RE.test(r)) {
-    throw new TypeError("supportTickets: reason contains control / zero-width bytes");
-  }
+  textGuard.freeText(r, "supportTickets: reason", { zeroWidth: "reject" });
   return r;
 }
 

package/lib/tax-remittance.js

@@ -86,6 +86,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var C = b.constants;
 
@@ -107,7 +108,6 @@ var DEFAULT_DAYS_LATE_MIN   = 1;
 var MAX_DAYS_LATE_MIN       = 3650;            // ~10 years
 var MS_PER_DAY              = C.TIME.days(1);
 
-var CONTROL_BYTE_RE         = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/;
 
 // ---- monotonic clock ----------------------------------------------------
 //
@@ -182,7 +182,7 @@ function _shortText(s, label, max) {
     throw new TypeError("taxRemittance: " + label +
                         " must be a non-empty string <= " + max + " chars");
   }
-  if (CONTROL_BYTE_RE.test(s)) {
+  if (textGuard.hasCodepointThreat(s)) {
     throw new TypeError("taxRemittance: " + label + " must not contain control bytes");
   }
   return s;

package/lib/tenants.js

@@ -56,6 +56,7 @@
  */
 
 var b = require("./vendor/blamejs");
+var textGuard = require("./text-guard");
 
 var MAX_SLUG_LEN     = 64;
 var MAX_NAME_LEN     = 200;
@@ -95,10 +96,6 @@ var THEME_SLUG_RE = /^[a-z0-9][a-z0-9-]{0,63}$/;
 // renders in operator dashboards; embedded control / direction-
 // override bytes are a slipping-class for visual-spoofing attacks
 // downstream.
-var CONTROL_BYTE_RE = /[\x00-\x1f\x7f]/;
-var ZERO_WIDTH_RE = new RegExp(
-  "[\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u2069\\uFEFF\\u061C]"
-);
 
 var ALLOWED_UPDATE_COLUMNS = Object.freeze([
   "name", "default_currency", "default_locale", "theme_slug",
@@ -131,9 +128,7 @@ function _name(s) {
   if (s.length > MAX_NAME_LEN) {
     throw new TypeError("tenants: name must be <= " + MAX_NAME_LEN + " characters");
   }
-  if (CONTROL_BYTE_RE.test(s) || ZERO_WIDTH_RE.test(s)) {
-    throw new TypeError("tenants: name contains control / zero-width bytes");
-  }
+  textGuard.freeText(s, "tenants: name", { singleLine: "reject", zeroWidth: "reject" });
   return s;
 }