@north-light/crouter 0.3.283 → 0.3.284

package/dist/api/client.d.ts

@@ -28,7 +28,9 @@ export interface CrtrClientOptions {
     socketPath?: string;
     /** `http(s)://host:port` for TCP/remote transport. */
     baseUrl?: string;
-    /** Extra headers (e.g. an edge auth token on TCP; crtrd ignores it). */
+    /** Extra headers, e.g. `{ authorization: 'Bearer <token>' }` when the target
+     *  crtrd's TCP listener has `CRTRD_TOKEN` set (unix-socket transport is
+     *  never checked, and a TCP daemon with no token set ignores this too). */
     headers?: Record<string, string>;
     /** Autostart on a cold socket (default true for socketPath, false for baseUrl). */
     autostart?: boolean;

package/dist/daemon/api/server.js

@@ -3,10 +3,14 @@
 // Two `http.Server` listeners share one logical API (a Node server can bind one
 // handle only):
 //   - the unix socket at `apiSocketPath()` — ALWAYS bound, owner-only (mode
-//     0600 = the fs-perms-are-auth model);
+//     0600 = the fs-perms-are-auth model); NEVER token-checked, token set or
+//     not;
 //   - an opt-in TCP listener, bound only when `--tcp <host:port>` / `CRTRD_TCP`
-//     is set (a fronting edge owns auth there).
-// crtrd applies NO auth to either listener (hard constraint, §1).
+//     is set. When `CRTRD_TOKEN` is ALSO set, every TCP request and WS upgrade
+//     must carry `Authorization: Bearer <token>` or the daemon answers 401
+//     with the standard `ErrorBody` (errors.ts) — otherwise (the default) TCP
+//     gets no auth check at all, unchanged from before this guard existed (a
+//     fronting edge owns auth there instead).
 //
 // Non-upgrade requests flow through the hand-rolled `Router` (A-6) loaded with
 // every handler route table (A-7). `GET /v1/nodes/:id/attach` upgrades are
@@ -17,7 +21,7 @@ import { createServer } from 'node:http';
 import { chmodSync, existsSync, unlinkSync } from 'node:fs';
 import { apiSocketPath } from '../../core/canvas/paths.js';
 import { emitEvent } from '../../core/events/emit.js';
-import { envCrtrdTcp } from '../../shared/env.js';
+import { envCrtrdTcp, envCrtrdToken } from '../../shared/env.js';
 import { Router } from './router.js';
 import { handleAttachUpgrade } from './bridge.js';
 import { attachRoutes } from './handlers/attach.js';
@@ -114,6 +118,46 @@ function parseTcp(spec) {
         return null;
     return { host: host === '' ? '0.0.0.0' : host, port };
 }
+/** The standard `ErrorBody` (errors.ts) for a TCP request/upgrade missing or
+ *  carrying a wrong `Authorization: Bearer <token>` header. Only ever written
+ *  when `CRTRD_TOKEN` is set — an unset token never reaches this path. */
+const UNAUTHORIZED_BODY = {
+    error: { code: 'unauthorized', message: 'missing or invalid bearer token' },
+};
+/** Does `req` carry the exact `Authorization: Bearer <token>` this TCP
+ *  listener requires? */
+function isAuthorized(req, token) {
+    return req.headers['authorization'] === `Bearer ${token}`;
+}
+/** Reject an unauthorized non-upgrade TCP request with the standard 401 body. */
+function writeUnauthorized(res) {
+    const payload = JSON.stringify(UNAUTHORIZED_BODY);
+    res.writeHead(401, { 'content-type': 'application/json; charset=utf-8' });
+    res.end(payload);
+}
+/** Reject an unauthorized TCP WS-upgrade attempt: this is a raw pre-upgrade
+ *  socket (no `ServerResponse`), so the 401 is written as a literal HTTP
+ *  response — mirroring `bridge.ts`'s `refuseUpgrade` (`end()`, not
+ *  `write()`+`destroy()`, so a slow peer can't truncate the body) — before the
+ *  socket closes. */
+function destroyUpgradeUnauthorized(socket) {
+    const payload = JSON.stringify(UNAUTHORIZED_BODY);
+    const response = `HTTP/1.1 401 Unauthorized\r\n` +
+        `content-type: application/json; charset=utf-8\r\n` +
+        `content-length: ${Buffer.byteLength(payload)}\r\n` +
+        `connection: close\r\n\r\n${payload}`;
+    try {
+        socket.end(response);
+    }
+    catch {
+        try {
+            socket.destroy();
+        }
+        catch {
+            /* already gone */
+        }
+    }
+}
 /** Close one http.Server, dropping idle keep-alives so the callback fires. */
 function closeServer(server) {
     return new Promise((resolve) => {
@@ -244,7 +288,9 @@ export function createApiServer(opts = {}) {
             });
         }
     });
-    // TCP — opt-in only. A SECOND http.Server sharing the same handlers.
+    // TCP — opt-in only. A SECOND http.Server sharing the same handlers, gated
+    // by CRTRD_TOKEN when set (never the unix socket, which shares onRequest/
+    // onUpgrade directly above with no wrapping at all).
     let tcpServer;
     const tcpSpec = opts.tcp ?? envCrtrdTcp();
     if (tcpSpec !== undefined && tcpSpec !== '') {
@@ -257,8 +303,27 @@ export function createApiServer(opts = {}) {
             });
         }
         else {
-            tcpServer = createServer(onRequest);
-            tcpServer.on('upgrade', onUpgrade);
+            const token = envCrtrdToken();
+            const tcpOnRequest = token === undefined
+                ? onRequest
+                : (req, res) => {
+                    if (!isAuthorized(req, token)) {
+                        writeUnauthorized(res);
+                        return;
+                    }
+                    onRequest(req, res);
+                };
+            const tcpOnUpgrade = token === undefined
+                ? onUpgrade
+                : (req, socket, head) => {
+                    if (!isAuthorized(req, token)) {
+                        destroyUpgradeUnauthorized(socket);
+                        return;
+                    }
+                    onUpgrade(req, socket, head);
+                };
+            tcpServer = createServer(tcpOnRequest);
+            tcpServer.on('upgrade', tcpOnUpgrade);
             bindErrorHandler(tcpServer);
             tcpServer.listen(parsed.port, parsed.host);
         }

package/dist/shared/env.d.ts

@@ -56,6 +56,11 @@ export declare function envNoDaemonAutostart(): boolean;
 /** The `--tcp` fallback for crtrd's opt-in TCP listener (`CRTRD_TCP`), raw
  *  (`host:port` or undefined — absent means unix socket only). */
 export declare function envCrtrdTcp(): string | undefined;
+/** The opt-in bearer token guarding crtrd's TCP listener (`CRTRD_TOKEN`).
+ *  Unset (or blank) → undefined, and the TCP listener performs NO auth check
+ *  at all — exactly today's behavior. The unix socket never checks this,
+ *  set or not. */
+export declare function envCrtrdToken(): string | undefined;
 /** Kill switch for the host-exports writer/pruner (`CRTR_NO_EXPORTS=1`). */
 export declare function envNoExports(): boolean;
 /** Verbose-diagnostics gate for otherwise-silent best-effort catches

package/dist/shared/env.js

@@ -137,6 +137,14 @@ export function envNoDaemonAutostart() {
 export function envCrtrdTcp() {
     return process.env['CRTRD_TCP'];
 }
+/** The opt-in bearer token guarding crtrd's TCP listener (`CRTRD_TOKEN`).
+ *  Unset (or blank) → undefined, and the TCP listener performs NO auth check
+ *  at all — exactly today's behavior. The unix socket never checks this,
+ *  set or not. */
+export function envCrtrdToken() {
+    const raw = process.env['CRTRD_TOKEN'];
+    return raw !== undefined && raw !== '' ? raw : undefined;
+}
 /** Kill switch for the host-exports writer/pruner (`CRTR_NO_EXPORTS=1`). */
 export function envNoExports() {
     return process.env['CRTR_NO_EXPORTS'] === '1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.283",
+  "version": "0.3.284",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -73,6 +73,7 @@
     "activate": "npm run build && npm run install-runtime && crtr sys daemon restart",
     "activate:pull": "git pull && npm install && npm run activate",
     "build:api": "tsc -p packages/crouter-api/tsconfig.json",
+    "build:env-docker": "tsc -p packages/crouter-env-docker/tsconfig.json",
     "typecheck:pi-packages": "npx tsc -p src/builtin-pi-packages/pi-crtr-extensions/tsconfig.json",
     "test:build-output": "node scripts/build-concurrency-test.mjs",
     "check:cli-no-canvas": "node scripts/check-cli-no-canvas.mjs",

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.283",
+  "version": "0.3.284",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.283",
+      "version": "0.3.284",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {