@cabane/companion 0.6.238 → 0.6.239

package/README.md

@@ -38,6 +38,8 @@ Enter the code in Cabane, signed in as yourself: from Your settings → Devices
 
 Without a terminal, setup prints the same lines once and waits, so a container's logs carry the code. An expired code is replaced by a fresh one, up to three; Ctrl-C stops cleanly. The link is on the Cabane the device pairs with. There is no default: setup pairs with the Cabane named by `--server <url>`, by `CABANE_BASE_URL`, or by the device's config, and stops if none names one. Once a Cabane has issued a code, setup keeps its address, so after a cancelled or expired pairing a bare `cabane setup` pairs with the same one.
 
+The address must be https, or plain http to this machine (`localhost`, `127.0.0.1`). A Companion that reaches its Cabane across a private network where the server has no certificate, such as a container on a Docker network it shares only with the server, can be allowed plain http to that one host with `CABANE_ALLOW_PLAIN_HTTP_HOST`: for example `CABANE_ALLOW_PLAIN_HTTP_HOST=app` with `CABANE_BASE_URL=http://app:8788`. The value must be a name with no dot, which only the local network's resolver answers, or a private address (`10.x.x.x`, `172.16.x.x`–`172.31.x.x`, `192.168.x.x`, or IPv6 `fc00::/7`); anything else is ignored. A Companion that pairs over plain http to that host keeps that address, instead of the public one Cabane names, since that is the only way it reaches Cabane. Over plain http, anything else on that network can read the device token and the agents' work, so use it only on a network nothing else joins.
+
 From an interactive terminal, setup then starts the Companion in the background, waits for its first check-in and reports the device's state. Without an interactive terminal, setup stays attached to the running Companion.
 
 If no harness is usable, interactive setup asks which one you want to set up. Follow the complete CLI installation and sign-in steps for [Mac setup](https://cabane.ai/docs/mac-setup#2-sign-in), [Windows setup](https://cabane.ai/docs/windows-setup#2-sign-in) or [Server and VPS setup](https://cabane.ai/docs/server-and-vps-setup#2-sign-in-without-a-browser), then check `cabane status`.

package/dist/cli.js

@@ -279,7 +279,7 @@ var init_errors = __esm({
 });
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -289,13 +289,57 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
+function addressToKeep(pairedOver, cabaneNamed, env = process.env) {
+  const allowed = plainHttpHost(env);
+  if (allowed === null) return cabaneNamed;
+  let url;
+  try {
+    url = new URL(pairedOver);
+  } catch {
+    return cabaneNamed;
+  }
+  return url.protocol === "http:" && url.hostname.toLowerCase() === allowed ? pairedOver.replace(/\/+$/, "") : cabaneNamed;
+}
+var ALLOW_PLAIN_HTTP_HOST_ENV;
 var init_pairing = __esm({
   "src/pairing.ts"() {
     "use strict";
+    ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
   }
 });
 
@@ -712,10 +756,10 @@ var init_config = __esm({
     }).strict();
     agentsConfigSchema = z2.record(z2.string(), localAgentConfigSchema);
     companionConfigSchema = z2.object({
-      // https-enforced (loopback exempt), so a hand-edited config can't put the
-      // device token and prompt on a plaintext channel.
-      baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-        message: "baseUrl must be https (loopback http is allowed for local dev only)"
+      // https-enforced (loopback, and the one private host a person names, exempt), so a
+      // hand-edited config can't put the device token and prompt on a plaintext channel.
+      baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+        message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
       }),
       // The `cabdev_` device token plaintext — the companion's one durable credential,
       // presented as `Authorization: Bearer <token>` on the device-facing pull +
@@ -10287,6 +10331,9 @@ function openLink(link) {
   });
 }
 
+// src/commands/setup.ts
+init_pairing();
+
 // src/commands/start.ts
 init_cabane_command();
 init_config();
@@ -10302,7 +10349,7 @@ function resolvePairBaseUrl(server) {
   if (!raw) throw new NoPairAddressError();
   if (!isAllowedBaseUrl(raw)) {
     throw new CompanionError(
-      `invalid server URL "${raw}": must be an https URL (loopback http is allowed for local dev). Pass it as \`${cabane("setup --server https://your-cabane")}\`.`
+      `invalid server URL "${raw}": must be an https URL (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names). Pass it as \`${cabane("setup --server https://your-cabane")}\`.`
     );
   }
   return raw;
@@ -15124,7 +15171,7 @@ async function setupScript(opts, deps) {
       onCode: () => rememberPairAddress(baseUrl)
     });
     if (!device) return;
-    writePairedConfig(device);
+    writePairedConfig({ ...device, baseUrl: addressToKeep(baseUrl, device.baseUrl) });
     justPaired = true;
   }
   const detection = await start(

package/dist/launch.js

@@ -45,7 +45,8 @@ import { dirname as dirname3, isAbsolute, join as join4 } from "path";
 import { z as z2 } from "zod";
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+var ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -55,10 +56,41 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
 
 // src/prepare-hook.ts
 import { spawn } from "child_process";
@@ -121,10 +153,10 @@ function isRootPath(value) {
   return isAbsolute(value) || value === "~" || value.startsWith("~/");
 }
 var companionConfigSchema = z2.object({
-  // https-enforced (loopback exempt), so a hand-edited config can't put the
-  // device token and prompt on a plaintext channel.
-  baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-    message: "baseUrl must be https (loopback http is allowed for local dev only)"
+  // https-enforced (loopback, and the one private host a person names, exempt), so a
+  // hand-edited config can't put the device token and prompt on a plaintext channel.
+  baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+    message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
   }),
   // The `cabdev_` device token plaintext — the companion's one durable credential,
   // presented as `Authorization: Bearer <token>` on the device-facing pull +

package/dist/postinstall.js

@@ -92,7 +92,8 @@ var ConfigError = class extends CompanionError {
 };
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+var ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -102,10 +103,41 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
 
 // src/prepare-hook.ts
 import { spawn } from "child_process";
@@ -171,10 +203,10 @@ function isRootPath(value) {
   return isAbsolute(value) || value === "~" || value.startsWith("~/");
 }
 var companionConfigSchema = z2.object({
-  // https-enforced (loopback exempt), so a hand-edited config can't put the
-  // device token and prompt on a plaintext channel.
-  baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-    message: "baseUrl must be https (loopback http is allowed for local dev only)"
+  // https-enforced (loopback, and the one private host a person names, exempt), so a
+  // hand-edited config can't put the device token and prompt on a plaintext channel.
+  baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+    message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
   }),
   // The `cabdev_` device token plaintext — the companion's one durable credential,
   // presented as `Authorization: Bearer <token>` on the device-facing pull +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.238",
+  "version": "0.6.239",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",