@dbx-tools/cli-tunnel 0.6.51 → 0.6.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -26
- package/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/src/cli.js +3 -3
- package/lib/src/env.d.ts +4 -3
- package/lib/src/env.js +8 -4
- package/lib/src/otp.d.ts +2 -2
- package/lib/src/otp.js +9 -9
- package/lib/src/plugin.d.ts +7 -6
- package/lib/src/plugin.js +6 -6
- package/lib/src/signing-key.d.ts +15 -12
- package/lib/src/signing-key.js +37 -48
- package/package.json +6 -6
- package/src/cli.ts +4 -4
- package/src/env.ts +7 -3
- package/src/otp.ts +8 -8
- package/src/plugin.ts +12 -11
- package/src/signing-key.ts +38 -49
package/lib/src/signing-key.d.ts
CHANGED
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
*
|
|
32
32
|
* ## Forcing every session to end
|
|
33
33
|
*
|
|
34
|
-
* {@link
|
|
35
|
-
* `--session-
|
|
34
|
+
* {@link resolveSessionCutoff} reads a date from `TUNNEL_AUTH_SESSION_CUTOFF` (or
|
|
35
|
+
* `--session-cutoff`), and that date is part of the cache KEY. Moving it forward
|
|
36
36
|
* makes every prior key unreachable, so every cookie signed against it stops
|
|
37
37
|
* verifying - the log-everyone-out switch, without having to find and flush a
|
|
38
|
-
* cache entry. The
|
|
38
|
+
* cache entry. The cutoff is also asserted against each token's `iat`, so a
|
|
39
39
|
* cookie that predates it is refused even if it was signed with the key that is
|
|
40
40
|
* somehow still current.
|
|
41
41
|
*
|
|
@@ -50,25 +50,28 @@
|
|
|
50
50
|
*/
|
|
51
51
|
export declare const KEY_TTL_SECONDS: number;
|
|
52
52
|
/**
|
|
53
|
-
* Resolve the force-clear
|
|
53
|
+
* Resolve the force-clear cutoff as epoch MILLISECONDS, or `0` when unset.
|
|
54
|
+
*
|
|
55
|
+
* Accepts whatever `object.toDate` accepts - a `Date`, `2026-08-02`, an ISO
|
|
56
|
+
* instant, epoch seconds or millis from `date +%s`, or a relative duration
|
|
57
|
+
* (`-30d`, `7 days ago`), which is the spelling an operator reaching for this
|
|
58
|
+
* usually wants: sign out everyone who signed in more than a month ago.
|
|
54
59
|
*
|
|
55
|
-
* Accepts anything `Date` parses (`2026-08-02`, an ISO timestamp) plus a bare
|
|
56
|
-
* epoch-seconds / epoch-millis number, so a value pasted from `date +%s` works.
|
|
57
60
|
* An UNPARSEABLE value is ignored with a warning rather than throwing: this is
|
|
58
61
|
* the switch that logs a fleet back in, and failing to boot over a typo is worse
|
|
59
62
|
* than not rotating.
|
|
60
63
|
*/
|
|
61
|
-
export declare function
|
|
62
|
-
/** A resolved key plus the
|
|
64
|
+
export declare function resolveSessionCutoff(configured?: string | number | Date): number;
|
|
65
|
+
/** A resolved key plus the cutoff it is scoped to. */
|
|
63
66
|
export interface SigningKey {
|
|
64
67
|
key: Uint8Array;
|
|
65
|
-
/** Force-clear
|
|
66
|
-
|
|
68
|
+
/** Force-clear cutoff in ms; `0` when unset. Tokens older than this are refused. */
|
|
69
|
+
cutoffMs: number;
|
|
67
70
|
}
|
|
68
71
|
/**
|
|
69
72
|
* The signing key for this gate, resolved once per process.
|
|
70
73
|
*
|
|
71
|
-
* Resolved ONCE, so `
|
|
74
|
+
* Resolved ONCE, so `configuredCutoff` is honoured only on the first call - the
|
|
72
75
|
* plugin's `setup()` passes its resolved value there, before any request can
|
|
73
76
|
* reach the lazy path.
|
|
74
77
|
*
|
|
@@ -78,6 +81,6 @@ export interface SigningKey {
|
|
|
78
81
|
* so losing it costs sessions, never admission - a caller still needs a code
|
|
79
82
|
* delivered to an allow-listed address.
|
|
80
83
|
*/
|
|
81
|
-
export declare function signingKey(
|
|
84
|
+
export declare function signingKey(configuredCutoff?: string | number | Date): Promise<SigningKey>;
|
|
82
85
|
/** Reset the per-process key (tests, or after changing the env in-process). */
|
|
83
86
|
export declare function resetSigningKey(): void;
|
package/lib/src/signing-key.js
CHANGED
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
*
|
|
32
32
|
* ## Forcing every session to end
|
|
33
33
|
*
|
|
34
|
-
* {@link
|
|
35
|
-
* `--session-
|
|
34
|
+
* {@link resolveSessionCutoff} reads a date from `TUNNEL_AUTH_SESSION_CUTOFF` (or
|
|
35
|
+
* `--session-cutoff`), and that date is part of the cache KEY. Moving it forward
|
|
36
36
|
* makes every prior key unreachable, so every cookie signed against it stops
|
|
37
37
|
* verifying - the log-everyone-out switch, without having to find and flush a
|
|
38
|
-
* cache entry. The
|
|
38
|
+
* cache entry. The cutoff is also asserted against each token's `iat`, so a
|
|
39
39
|
* cookie that predates it is refused even if it was signed with the key that is
|
|
40
40
|
* somehow still current.
|
|
41
41
|
*
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
*/
|
|
44
44
|
import { randomBytes } from "node:crypto";
|
|
45
45
|
import { CacheManager } from "@databricks/appkit";
|
|
46
|
-
import { env, log } from "@dbx-tools/shared-core";
|
|
47
|
-
import { JWT_SECRET_ENV,
|
|
46
|
+
import { env, log, object } from "@dbx-tools/shared-core";
|
|
47
|
+
import { JWT_SECRET_ENV, SESSION_CUTOFF_ENV } from "./env.js";
|
|
48
48
|
const logger = log.logger("tunnel:signing-key");
|
|
49
49
|
/**
|
|
50
50
|
* How long a cached signing key lives: 30 days.
|
|
@@ -59,69 +59,58 @@ const KEY_PREFIX = "tunnel:auth:signing-key:";
|
|
|
59
59
|
/** Bytes of entropy in a generated key (256-bit, matching HS256's hash width). */
|
|
60
60
|
const KEY_BYTES = 32;
|
|
61
61
|
/**
|
|
62
|
-
* Resolve the force-clear
|
|
62
|
+
* Resolve the force-clear cutoff as epoch MILLISECONDS, or `0` when unset.
|
|
63
|
+
*
|
|
64
|
+
* Accepts whatever `object.toDate` accepts - a `Date`, `2026-08-02`, an ISO
|
|
65
|
+
* instant, epoch seconds or millis from `date +%s`, or a relative duration
|
|
66
|
+
* (`-30d`, `7 days ago`), which is the spelling an operator reaching for this
|
|
67
|
+
* usually wants: sign out everyone who signed in more than a month ago.
|
|
63
68
|
*
|
|
64
|
-
* Accepts anything `Date` parses (`2026-08-02`, an ISO timestamp) plus a bare
|
|
65
|
-
* epoch-seconds / epoch-millis number, so a value pasted from `date +%s` works.
|
|
66
69
|
* An UNPARSEABLE value is ignored with a warning rather than throwing: this is
|
|
67
70
|
* the switch that logs a fleet back in, and failing to boot over a typo is worse
|
|
68
71
|
* than not rotating.
|
|
69
72
|
*/
|
|
70
|
-
export function
|
|
71
|
-
const raw = configured ?? env.text(
|
|
73
|
+
export function resolveSessionCutoff(configured) {
|
|
74
|
+
const raw = configured ?? env.text(SESSION_CUTOFF_ENV) ?? undefined;
|
|
72
75
|
if (raw === undefined || raw === null || raw === "")
|
|
73
76
|
return 0;
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
function parseEpoch(raw) {
|
|
78
|
-
if (raw instanceof Date)
|
|
79
|
-
return Number.isNaN(raw.getTime()) ? 0 : raw.getTime();
|
|
80
|
-
const text = String(raw).trim();
|
|
81
|
-
// A bare number is a timestamp, not a date string: `Date.parse("1785...")`
|
|
82
|
-
// would read it as a YEAR. Values below ~1e11 are seconds (any millis
|
|
83
|
-
// timestamp since 1973 is larger), which is what `date +%s` prints.
|
|
84
|
-
if (/^\d+$/.test(text)) {
|
|
85
|
-
const numeric = Number(text);
|
|
86
|
-
return numeric < 1e11 ? numeric * 1000 : numeric;
|
|
87
|
-
}
|
|
88
|
-
const parsed = Date.parse(text);
|
|
89
|
-
if (Number.isNaN(parsed)) {
|
|
90
|
-
logger.warn(`ignoring unparseable ${env.name(SESSION_EPOCH_ENV)}`, { value: text });
|
|
77
|
+
const date = object.toDate(raw);
|
|
78
|
+
if (!date) {
|
|
79
|
+
logger.warn(`ignoring unparseable ${env.name(SESSION_CUTOFF_ENV)}`, { value: String(raw) });
|
|
91
80
|
return 0;
|
|
92
81
|
}
|
|
93
|
-
return
|
|
82
|
+
return clampToPast(date.getTime());
|
|
94
83
|
}
|
|
95
84
|
/**
|
|
96
|
-
* Hold the cutoff at "now", because a FUTURE
|
|
85
|
+
* Hold the cutoff at "now", because a FUTURE cutoff would refuse the sessions it
|
|
97
86
|
* is about to mint as well as the old ones - an app nobody can sign in to, from a
|
|
98
87
|
* mistyped year, with the fix hidden behind understanding this flag. Clamped, a
|
|
99
88
|
* future date means what an operator setting it always meant: clear everything
|
|
100
89
|
* outstanding, then carry on.
|
|
101
90
|
*/
|
|
102
|
-
function clampToPast(
|
|
91
|
+
function clampToPast(cutoffMs) {
|
|
103
92
|
const now = Date.now();
|
|
104
|
-
if (
|
|
105
|
-
return
|
|
106
|
-
logger.warn(`${env.name(
|
|
107
|
-
configured: new Date(
|
|
93
|
+
if (cutoffMs <= now)
|
|
94
|
+
return cutoffMs;
|
|
95
|
+
logger.warn(`${env.name(SESSION_CUTOFF_ENV)} is in the future - clamping to now`, {
|
|
96
|
+
configured: new Date(cutoffMs).toISOString(),
|
|
108
97
|
});
|
|
109
98
|
return now;
|
|
110
99
|
}
|
|
111
|
-
/** The cache key for one
|
|
112
|
-
function cacheKey(
|
|
113
|
-
return `${KEY_PREFIX}${
|
|
100
|
+
/** The cache key for one cutoff, so moving the cutoff orphans every earlier key. */
|
|
101
|
+
function cacheKey(cutoffMs) {
|
|
102
|
+
return `${KEY_PREFIX}${cutoffMs}`;
|
|
114
103
|
}
|
|
115
104
|
function decode(stored) {
|
|
116
105
|
return new Uint8Array(Buffer.from(stored.secret, "base64url"));
|
|
117
106
|
}
|
|
118
107
|
/**
|
|
119
|
-
* Load the signing key for `
|
|
120
|
-
* absent. See the module docs for why the write is followed by a re-read.
|
|
108
|
+
* Load the signing key for `cutoffMs` from the cache, minting and storing one
|
|
109
|
+
* when absent. See the module docs for why the write is followed by a re-read.
|
|
121
110
|
*/
|
|
122
|
-
async function loadFromCache(
|
|
111
|
+
async function loadFromCache(cutoffMs) {
|
|
123
112
|
const cache = CacheManager.getInstanceSync();
|
|
124
|
-
const key = cacheKey(
|
|
113
|
+
const key = cacheKey(cutoffMs);
|
|
125
114
|
const existing = await cache.get(key);
|
|
126
115
|
if (existing?.secret) {
|
|
127
116
|
logger.info("reusing cached signing key", { createdAt: existing.createdAt });
|
|
@@ -147,7 +136,7 @@ let pending;
|
|
|
147
136
|
/**
|
|
148
137
|
* The signing key for this gate, resolved once per process.
|
|
149
138
|
*
|
|
150
|
-
* Resolved ONCE, so `
|
|
139
|
+
* Resolved ONCE, so `configuredCutoff` is honoured only on the first call - the
|
|
151
140
|
* plugin's `setup()` passes its resolved value there, before any request can
|
|
152
141
|
* reach the lazy path.
|
|
153
142
|
*
|
|
@@ -157,19 +146,19 @@ let pending;
|
|
|
157
146
|
* so losing it costs sessions, never admission - a caller still needs a code
|
|
158
147
|
* delivered to an allow-listed address.
|
|
159
148
|
*/
|
|
160
|
-
export function signingKey(
|
|
149
|
+
export function signingKey(configuredCutoff) {
|
|
161
150
|
pending ??= (async () => {
|
|
162
|
-
const
|
|
151
|
+
const cutoffMs = resolveSessionCutoff(configuredCutoff);
|
|
163
152
|
const configured = env.text(JWT_SECRET_ENV);
|
|
164
153
|
if (configured) {
|
|
165
|
-
return { key: new TextEncoder().encode(configured),
|
|
154
|
+
return { key: new TextEncoder().encode(configured), cutoffMs };
|
|
166
155
|
}
|
|
167
156
|
try {
|
|
168
|
-
return { key: await loadFromCache(
|
|
157
|
+
return { key: await loadFromCache(cutoffMs), cutoffMs };
|
|
169
158
|
}
|
|
170
159
|
catch (error) {
|
|
171
160
|
logger.warn(`no ${env.name(JWT_SECRET_ENV)} and the cache is unavailable - using an ephemeral per-process key; sessions will not survive a restart`, { error });
|
|
172
|
-
return { key: new Uint8Array(randomBytes(KEY_BYTES)),
|
|
161
|
+
return { key: new Uint8Array(randomBytes(KEY_BYTES)), cutoffMs };
|
|
173
162
|
}
|
|
174
163
|
})();
|
|
175
164
|
return pending;
|
|
@@ -178,4 +167,4 @@ export function signingKey(configuredEpoch) {
|
|
|
178
167
|
export function resetSigningKey() {
|
|
179
168
|
pending = undefined;
|
|
180
169
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"signing-key.js","sourceRoot":"","sources":["../../src/signing-key.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The gate's HS256 session-signing key, persisted in AppKit's cache.\n *\n * The key decides whether a session COOKIE still verifies. Before this module the\n * fallback was `randomBytes(32)` per process, so every restart invalidated every\n * outstanding cookie and each signed-in user had to request a new code - painful\n * for a tunnel, which restarts whenever the app it wraps does. Now the key is\n * stored in the cache AppKit already configured (memory, or Lakebase when the\n * host wires a persistent `CacheStorage`), so with persistent storage a restart\n * keeps sessions alive for {@link KEY_TTL_SECONDS}.\n *\n * An explicitly configured `TUNNEL_AUTH_JWT_SECRET` still wins outright. That is\n * the right answer for a fleet: an operator-held secret needs no shared cache and\n * no convergence, and it survives a cache flush.\n *\n * ## get / generate / get\n *\n * Two instances booting at once both miss, so both would generate - and the loser\n * would sign cookies with a key the winner rejects. Resolution is a re-READ after\n * the write: whatever the cache holds afterwards is the key everyone adopts, so\n * the instances converge on ONE value instead of trusting the one they minted.\n * (`set` is not conditional in the cache API - there is no `setnx` to lean on -\n * and this runs once per process, so the extra round-trip is free.)\n *\n * A pathological interleave can still cost a key: if A writes between B's write\n * and B's re-read, B adopts A's key while A adopts its own. The cost is bounded -\n * a cookie minted in that window fails to verify and the holder signs in again -\n * and it cannot produce a key one instance TRUSTS but another rejects for longer\n * than the window itself. Set `TUNNEL_AUTH_JWT_SECRET` to remove the race\n * entirely.\n *\n * ## Forcing every session to end\n *\n * {@link resolveSessionEpoch} reads a date from `TUNNEL_AUTH_SESSION_EPOCH` (or\n * `--session-epoch`), and that date is part of the cache KEY. Moving it forward\n * makes every prior key unreachable, so every cookie signed against it stops\n * verifying - the log-everyone-out switch, without having to find and flush a\n * cache entry. The epoch is also asserted against each token's `iat`, so a\n * cookie that predates it is refused even if it was signed with the key that is\n * somehow still current.\n *\n * @module\n */\n\nimport { randomBytes } from \"node:crypto\";\nimport { CacheManager } from \"@databricks/appkit\";\nimport { env, log } from \"@dbx-tools/shared-core\";\nimport { JWT_SECRET_ENV, SESSION_EPOCH_ENV } from \"./env.ts\";\n\nconst logger = log.logger(\"tunnel:signing-key\");\n\n/**\n * How long a cached signing key lives: 30 days.\n *\n * This is the ceiling on how long a session cookie can stay valid across\n * restarts, so it is deliberately >= the default session TTL - a key that expired\n * before the cookies it signed would log everyone out for no reason.\n */\nexport const KEY_TTL_SECONDS = 30 * 24 * 60 * 60;\n\n/** Cache-key prefix for the signing key, namespaced away from other cache use. */\nconst KEY_PREFIX = \"tunnel:auth:signing-key:\";\n\n/** Bytes of entropy in a generated key (256-bit, matching HS256's hash width). */\nconst KEY_BYTES = 32;\n\n/** What the cache stores: the key plus when it was minted, for observability. */\ninterface StoredKey {\n  /** Base64url of the raw key bytes. */\n  secret: string;\n  /** When this key was generated, ISO-8601. */\n  createdAt: string;\n}\n\n/**\n * Resolve the force-clear epoch as epoch MILLISECONDS, or `0` when unset.\n *\n * Accepts anything `Date` parses (`2026-08-02`, an ISO timestamp) plus a bare\n * epoch-seconds / epoch-millis number, so a value pasted from `date +%s` works.\n * An UNPARSEABLE value is ignored with a warning rather than throwing: this is\n * the switch that logs a fleet back in, and failing to boot over a typo is worse\n * than not rotating.\n */\nexport function resolveSessionEpoch(configured?: string | number | Date): number {\n  const raw = configured ?? env.text(SESSION_EPOCH_ENV) ?? undefined;\n  if (raw === undefined || raw === null || raw === \"\") return 0;\n  return clampToPast(parseEpoch(raw));\n}\n\n/** Parse the accepted epoch spellings to ms, or `0` when unusable. */\nfunction parseEpoch(raw: string | number | Date): number {\n  if (raw instanceof Date) return Number.isNaN(raw.getTime()) ? 0 : raw.getTime();\n\n  const text = String(raw).trim();\n  // A bare number is a timestamp, not a date string: `Date.parse(\"1785...\")`\n  // would read it as a YEAR. Values below ~1e11 are seconds (any millis\n  // timestamp since 1973 is larger), which is what `date +%s` prints.\n  if (/^\\d+$/.test(text)) {\n    const numeric = Number(text);\n    return numeric < 1e11 ? numeric * 1000 : numeric;\n  }\n  const parsed = Date.parse(text);\n  if (Number.isNaN(parsed)) {\n    logger.warn(`ignoring unparseable ${env.name(SESSION_EPOCH_ENV)}`, { value: text });\n    return 0;\n  }\n  return parsed;\n}\n\n/**\n * Hold the cutoff at \"now\", because a FUTURE epoch would refuse the sessions it\n * is about to mint as well as the old ones - an app nobody can sign in to, from a\n * mistyped year, with the fix hidden behind understanding this flag. Clamped, a\n * future date means what an operator setting it always meant: clear everything\n * outstanding, then carry on.\n */\nfunction clampToPast(epochMs: number): number {\n  const now = Date.now();\n  if (epochMs <= now) return epochMs;\n  logger.warn(`${env.name(SESSION_EPOCH_ENV)} is in the future - clamping to now`, {\n    configured: new Date(epochMs).toISOString(),\n  });\n  return now;\n}\n\n/** The cache key for one epoch, so moving the epoch orphans every earlier key. */\nfunction cacheKey(epochMs: number): string {\n  return `${KEY_PREFIX}${epochMs}`;\n}\n\nfunction decode(stored: StoredKey): Uint8Array {\n  return new Uint8Array(Buffer.from(stored.secret, \"base64url\"));\n}\n\n/**\n * Load the signing key for `epochMs` from the cache, minting and storing one when\n * absent. See the module docs for why the write is followed by a re-read.\n */\nasync function loadFromCache(epochMs: number): Promise<Uint8Array> {\n  const cache = CacheManager.getInstanceSync();\n  const key = cacheKey(epochMs);\n\n  const existing = await cache.get<StoredKey>(key);\n  if (existing?.secret) {\n    logger.info(\"reusing cached signing key\", { createdAt: existing.createdAt });\n    return decode(existing);\n  }\n\n  const minted: StoredKey = {\n    secret: Buffer.from(randomBytes(KEY_BYTES)).toString(\"base64url\"),\n    createdAt: new Date().toISOString(),\n  };\n  await cache.set(key, minted, { ttl: KEY_TTL_SECONDS });\n\n  // Re-read rather than trusting `minted`: another instance that raced this boot\n  // may have written first, and adopting whatever is stored is what makes the two\n  // converge on one key.\n  const settled = (await cache.get<StoredKey>(key)) ?? minted;\n  logger.info(\"stored a new signing key\", {\n    createdAt: settled.createdAt,\n    ttlSeconds: KEY_TTL_SECONDS,\n    adopted: settled.createdAt === minted.createdAt ? \"own\" : \"concurrent-instance\",\n  });\n  return decode(settled);\n}\n\n/** A resolved key plus the epoch it is scoped to. */\nexport interface SigningKey {\n  key: Uint8Array;\n  /** Force-clear epoch in ms; `0` when unset. Tokens older than this are refused. */\n  epochMs: number;\n}\n\nlet pending: Promise<SigningKey> | undefined;\n\n/**\n * The signing key for this gate, resolved once per process.\n *\n * Resolved ONCE, so `configuredEpoch` is honoured only on the first call - the\n * plugin's `setup()` passes its resolved value there, before any request can\n * reach the lazy path.\n *\n * `TUNNEL_AUTH_JWT_SECRET` when set, else the cache-backed key. A cache that is\n * unavailable degrades to an ephemeral per-process key (the previous behaviour)\n * rather than refusing to sign: the key only validates an ALREADY-issued session,\n * so losing it costs sessions, never admission - a caller still needs a code\n * delivered to an allow-listed address.\n */\nexport function signingKey(configuredEpoch?: string | number | Date): Promise<SigningKey> {\n  pending ??= (async () => {\n    const epochMs = resolveSessionEpoch(configuredEpoch);\n    const configured = env.text(JWT_SECRET_ENV);\n    if (configured) {\n      return { key: new TextEncoder().encode(configured), epochMs };\n    }\n    try {\n      return { key: await loadFromCache(epochMs), epochMs };\n    } catch (error) {\n      logger.warn(\n        `no ${env.name(JWT_SECRET_ENV)} and the cache is unavailable - using an ephemeral per-process key; sessions will not survive a restart`,\n        { error },\n      );\n      return { key: new Uint8Array(randomBytes(KEY_BYTES)), epochMs };\n    }\n  })();\n  return pending;\n}\n\n/** Reset the per-process key (tests, or after changing the env in-process). */\nexport function resetSigningKey(): void {\n  pending = undefined;\n}\n"]}
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"signing-key.js","sourceRoot":"","sources":["../../src/signing-key.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The gate's HS256 session-signing key, persisted in AppKit's cache.\n *\n * The key decides whether a session COOKIE still verifies. Before this module the\n * fallback was `randomBytes(32)` per process, so every restart invalidated every\n * outstanding cookie and each signed-in user had to request a new code - painful\n * for a tunnel, which restarts whenever the app it wraps does. Now the key is\n * stored in the cache AppKit already configured (memory, or Lakebase when the\n * host wires a persistent `CacheStorage`), so with persistent storage a restart\n * keeps sessions alive for {@link KEY_TTL_SECONDS}.\n *\n * An explicitly configured `TUNNEL_AUTH_JWT_SECRET` still wins outright. That is\n * the right answer for a fleet: an operator-held secret needs no shared cache and\n * no convergence, and it survives a cache flush.\n *\n * ## get / generate / get\n *\n * Two instances booting at once both miss, so both would generate - and the loser\n * would sign cookies with a key the winner rejects. Resolution is a re-READ after\n * the write: whatever the cache holds afterwards is the key everyone adopts, so\n * the instances converge on ONE value instead of trusting the one they minted.\n * (`set` is not conditional in the cache API - there is no `setnx` to lean on -\n * and this runs once per process, so the extra round-trip is free.)\n *\n * A pathological interleave can still cost a key: if A writes between B's write\n * and B's re-read, B adopts A's key while A adopts its own. The cost is bounded -\n * a cookie minted in that window fails to verify and the holder signs in again -\n * and it cannot produce a key one instance TRUSTS but another rejects for longer\n * than the window itself. Set `TUNNEL_AUTH_JWT_SECRET` to remove the race\n * entirely.\n *\n * ## Forcing every session to end\n *\n * {@link resolveSessionCutoff} reads a date from `TUNNEL_AUTH_SESSION_CUTOFF` (or\n * `--session-cutoff`), and that date is part of the cache KEY. Moving it forward\n * makes every prior key unreachable, so every cookie signed against it stops\n * verifying - the log-everyone-out switch, without having to find and flush a\n * cache entry. The cutoff is also asserted against each token's `iat`, so a\n * cookie that predates it is refused even if it was signed with the key that is\n * somehow still current.\n *\n * @module\n */\n\nimport { randomBytes } from \"node:crypto\";\nimport { CacheManager } from \"@databricks/appkit\";\nimport { env, log, object } from \"@dbx-tools/shared-core\";\nimport { JWT_SECRET_ENV, SESSION_CUTOFF_ENV } from \"./env.ts\";\n\nconst logger = log.logger(\"tunnel:signing-key\");\n\n/**\n * How long a cached signing key lives: 30 days.\n *\n * This is the ceiling on how long a session cookie can stay valid across\n * restarts, so it is deliberately >= the default session TTL - a key that expired\n * before the cookies it signed would log everyone out for no reason.\n */\nexport const KEY_TTL_SECONDS = 30 * 24 * 60 * 60;\n\n/** Cache-key prefix for the signing key, namespaced away from other cache use. */\nconst KEY_PREFIX = \"tunnel:auth:signing-key:\";\n\n/** Bytes of entropy in a generated key (256-bit, matching HS256's hash width). */\nconst KEY_BYTES = 32;\n\n/** What the cache stores: the key plus when it was minted, for observability. */\ninterface StoredKey {\n  /** Base64url of the raw key bytes. */\n  secret: string;\n  /** When this key was generated, ISO-8601. */\n  createdAt: string;\n}\n\n/**\n * Resolve the force-clear cutoff as epoch MILLISECONDS, or `0` when unset.\n *\n * Accepts whatever `object.toDate` accepts - a `Date`, `2026-08-02`, an ISO\n * instant, epoch seconds or millis from `date +%s`, or a relative duration\n * (`-30d`, `7 days ago`), which is the spelling an operator reaching for this\n * usually wants: sign out everyone who signed in more than a month ago.\n *\n * An UNPARSEABLE value is ignored with a warning rather than throwing: this is\n * the switch that logs a fleet back in, and failing to boot over a typo is worse\n * than not rotating.\n */\nexport function resolveSessionCutoff(configured?: string | number | Date): number {\n  const raw = configured ?? env.text(SESSION_CUTOFF_ENV) ?? undefined;\n  if (raw === undefined || raw === null || raw === \"\") return 0;\n\n  const date = object.toDate(raw);\n  if (!date) {\n    logger.warn(`ignoring unparseable ${env.name(SESSION_CUTOFF_ENV)}`, { value: String(raw) });\n    return 0;\n  }\n  return clampToPast(date.getTime());\n}\n\n/**\n * Hold the cutoff at \"now\", because a FUTURE cutoff would refuse the sessions it\n * is about to mint as well as the old ones - an app nobody can sign in to, from a\n * mistyped year, with the fix hidden behind understanding this flag. Clamped, a\n * future date means what an operator setting it always meant: clear everything\n * outstanding, then carry on.\n */\nfunction clampToPast(cutoffMs: number): number {\n  const now = Date.now();\n  if (cutoffMs <= now) return cutoffMs;\n  logger.warn(`${env.name(SESSION_CUTOFF_ENV)} is in the future - clamping to now`, {\n    configured: new Date(cutoffMs).toISOString(),\n  });\n  return now;\n}\n\n/** The cache key for one cutoff, so moving the cutoff orphans every earlier key. */\nfunction cacheKey(cutoffMs: number): string {\n  return `${KEY_PREFIX}${cutoffMs}`;\n}\n\nfunction decode(stored: StoredKey): Uint8Array {\n  return new Uint8Array(Buffer.from(stored.secret, \"base64url\"));\n}\n\n/**\n * Load the signing key for `cutoffMs` from the cache, minting and storing one\n * when absent. See the module docs for why the write is followed by a re-read.\n */\nasync function loadFromCache(cutoffMs: number): Promise<Uint8Array> {\n  const cache = CacheManager.getInstanceSync();\n  const key = cacheKey(cutoffMs);\n\n  const existing = await cache.get<StoredKey>(key);\n  if (existing?.secret) {\n    logger.info(\"reusing cached signing key\", { createdAt: existing.createdAt });\n    return decode(existing);\n  }\n\n  const minted: StoredKey = {\n    secret: Buffer.from(randomBytes(KEY_BYTES)).toString(\"base64url\"),\n    createdAt: new Date().toISOString(),\n  };\n  await cache.set(key, minted, { ttl: KEY_TTL_SECONDS });\n\n  // Re-read rather than trusting `minted`: another instance that raced this boot\n  // may have written first, and adopting whatever is stored is what makes the two\n  // converge on one key.\n  const settled = (await cache.get<StoredKey>(key)) ?? minted;\n  logger.info(\"stored a new signing key\", {\n    createdAt: settled.createdAt,\n    ttlSeconds: KEY_TTL_SECONDS,\n    adopted: settled.createdAt === minted.createdAt ? \"own\" : \"concurrent-instance\",\n  });\n  return decode(settled);\n}\n\n/** A resolved key plus the cutoff it is scoped to. */\nexport interface SigningKey {\n  key: Uint8Array;\n  /** Force-clear cutoff in ms; `0` when unset. Tokens older than this are refused. */\n  cutoffMs: number;\n}\n\nlet pending: Promise<SigningKey> | undefined;\n\n/**\n * The signing key for this gate, resolved once per process.\n *\n * Resolved ONCE, so `configuredCutoff` is honoured only on the first call - the\n * plugin's `setup()` passes its resolved value there, before any request can\n * reach the lazy path.\n *\n * `TUNNEL_AUTH_JWT_SECRET` when set, else the cache-backed key. A cache that is\n * unavailable degrades to an ephemeral per-process key (the previous behaviour)\n * rather than refusing to sign: the key only validates an ALREADY-issued session,\n * so losing it costs sessions, never admission - a caller still needs a code\n * delivered to an allow-listed address.\n */\nexport function signingKey(configuredCutoff?: string | number | Date): Promise<SigningKey> {\n  pending ??= (async () => {\n    const cutoffMs = resolveSessionCutoff(configuredCutoff);\n    const configured = env.text(JWT_SECRET_ENV);\n    if (configured) {\n      return { key: new TextEncoder().encode(configured), cutoffMs };\n    }\n    try {\n      return { key: await loadFromCache(cutoffMs), cutoffMs };\n    } catch (error) {\n      logger.warn(\n        `no ${env.name(JWT_SECRET_ENV)} and the cache is unavailable - using an ephemeral per-process key; sessions will not survive a restart`,\n        { error },\n      );\n      return { key: new Uint8Array(randomBytes(KEY_BYTES)), cutoffMs };\n    }\n  })();\n  return pending;\n}\n\n/** Reset the per-process key (tests, or after changing the env in-process). */\nexport function resetSigningKey(): void {\n  pending = undefined;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@clack/prompts": "^1.7.0",
|
|
31
31
|
"@databricks/appkit": "^0.43.0",
|
|
32
|
-
"@dbx-tools/appkit": "0.6.
|
|
33
|
-
"@dbx-tools/core": "0.6.
|
|
34
|
-
"@dbx-tools/email": "0.6.
|
|
35
|
-
"@dbx-tools/shared-core": "0.6.
|
|
36
|
-
"@dbx-tools/shared-email": "0.6.
|
|
32
|
+
"@dbx-tools/appkit": "0.6.52",
|
|
33
|
+
"@dbx-tools/core": "0.6.52",
|
|
34
|
+
"@dbx-tools/email": "0.6.52",
|
|
35
|
+
"@dbx-tools/shared-core": "0.6.52",
|
|
36
|
+
"@dbx-tools/shared-email": "0.6.52",
|
|
37
37
|
"commander": "^15.0.0",
|
|
38
38
|
"http-proxy-3": "^1.23.3",
|
|
39
39
|
"jose": "^6.2.3"
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"./package.json": "./package.json"
|
|
101
101
|
}
|
|
102
102
|
},
|
|
103
|
-
"version": "0.6.
|
|
103
|
+
"version": "0.6.52",
|
|
104
104
|
"types": "./lib/index.d.ts",
|
|
105
105
|
"type": "module",
|
|
106
106
|
"exports": {
|
package/src/cli.ts
CHANGED
|
@@ -52,7 +52,7 @@ interface TunnelOpts {
|
|
|
52
52
|
message?: string;
|
|
53
53
|
sessionTtl?: string;
|
|
54
54
|
codeTtl?: string;
|
|
55
|
-
|
|
55
|
+
sessionCutoff?: string;
|
|
56
56
|
insecure?: boolean;
|
|
57
57
|
forwardHeaders?: string;
|
|
58
58
|
}
|
|
@@ -77,8 +77,8 @@ function program(): Command {
|
|
|
77
77
|
.option("--session-ttl <seconds>", "Session lifetime (env TUNNEL_AUTH_SESSION_TTL)")
|
|
78
78
|
.option("--code-ttl <seconds>", "One-time-code lifetime (env TUNNEL_AUTH_CODE_TTL)")
|
|
79
79
|
.option(
|
|
80
|
-
"--session-
|
|
81
|
-
"Invalidate sessions issued before this
|
|
80
|
+
"--session-cutoff <when>",
|
|
81
|
+
"Invalidate sessions issued before this point, signing everyone out: a date, ISO instant, epoch seconds, or relative duration like -30d (env TUNNEL_AUTH_SESSION_CUTOFF)",
|
|
82
82
|
)
|
|
83
83
|
.option(
|
|
84
84
|
"--forward-headers <patterns>",
|
|
@@ -140,7 +140,7 @@ export async function runCli(argv: string[]): Promise<void> {
|
|
|
140
140
|
message: opts.message,
|
|
141
141
|
sessionTtlSeconds: opts.sessionTtl ? Number(opts.sessionTtl) : undefined,
|
|
142
142
|
codeTtlSeconds: opts.codeTtl ? Number(opts.codeTtl) : undefined,
|
|
143
|
-
|
|
143
|
+
sessionCutoff: opts.sessionCutoff,
|
|
144
144
|
};
|
|
145
145
|
|
|
146
146
|
// 1. Spawn the wrapped app with the PRIVATE port. It binds loopback; only the
|
package/src/env.ts
CHANGED
|
@@ -53,10 +53,14 @@ export const CODE_TTL_ENV: EnvKey = ["TUNNEL_AUTH_CODE_TTL", "AUTH_CODE_TTL"];
|
|
|
53
53
|
export const JWT_SECRET_ENV: EnvKey = ["TUNNEL_AUTH_JWT_SECRET", "AUTH_JWT_SECRET"];
|
|
54
54
|
|
|
55
55
|
/**
|
|
56
|
-
* Force-clear
|
|
57
|
-
*
|
|
56
|
+
* Force-clear cutoff: every session issued BEFORE it stops verifying. Anything
|
|
57
|
+
* `object.toDate` accepts - a date, an ISO instant, epoch seconds/millis, or a
|
|
58
|
+
* relative duration (`-30d`, `7 days ago`).
|
|
58
59
|
*/
|
|
59
|
-
export const
|
|
60
|
+
export const SESSION_CUTOFF_ENV: EnvKey = [
|
|
61
|
+
"TUNNEL_AUTH_SESSION_CUTOFF",
|
|
62
|
+
"TUNNEL_AUTH_SESSION_EPOCH",
|
|
63
|
+
];
|
|
60
64
|
|
|
61
65
|
/** The public `<subdomain>.<server>` portr should serve on. */
|
|
62
66
|
export const PUBLIC_DOMAIN_ENV: EnvKey = ["TUNNEL_PUBLIC_DOMAIN", "PUBLIC_DOMAIN"];
|
package/src/otp.ts
CHANGED
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
* signing key is resolved by `./signing-key.ts`: `TUNNEL_AUTH_JWT_SECRET` when
|
|
13
13
|
* set, else a key persisted in the cache for 30 days so cookies survive the
|
|
14
14
|
* restarts a tunnel sees whenever the app it wraps reloads. A cookie signed
|
|
15
|
-
* before `
|
|
16
|
-
* the cache key, so the force-clear switch holds even for a still-current key.
|
|
15
|
+
* before `TUNNEL_AUTH_SESSION_CUTOFF` is refused here as well as being orphaned
|
|
16
|
+
* by the cache key, so the force-clear switch holds even for a still-current key.
|
|
17
17
|
*
|
|
18
18
|
* @module
|
|
19
19
|
*/
|
|
@@ -118,16 +118,16 @@ export async function signSession(email: string, ttlSeconds: number): Promise<st
|
|
|
118
118
|
export async function verifySession(token: string | undefined): Promise<string | undefined> {
|
|
119
119
|
if (!token) return undefined;
|
|
120
120
|
try {
|
|
121
|
-
const { key,
|
|
121
|
+
const { key, cutoffMs } = await signingKey();
|
|
122
122
|
const { payload } = await jwtVerify(token, key, { audience: JWT_AUD });
|
|
123
|
-
// Belt and braces with the
|
|
124
|
-
// orphans older keys, but an operator who moved the
|
|
123
|
+
// Belt and braces with the cutoff-scoped cache key: that alone already
|
|
124
|
+
// orphans older keys, but an operator who moved the cutoff while
|
|
125
125
|
// TUNNEL_AUTH_JWT_SECRET is set has no key rotation to rely on, and this
|
|
126
126
|
// check is what makes the switch work in that case too.
|
|
127
127
|
// Compared in whole SECONDS because `iat` has no finer resolution: against a
|
|
128
|
-
// millisecond
|
|
129
|
-
//
|
|
130
|
-
if (
|
|
128
|
+
// millisecond cutoff, a cookie minted in the same second as it would be
|
|
129
|
+
// refused depending on sub-second rounding.
|
|
130
|
+
if (cutoffMs > 0 && (payload.iat === undefined || payload.iat < Math.floor(cutoffMs / 1000))) {
|
|
131
131
|
return undefined;
|
|
132
132
|
}
|
|
133
133
|
return typeof payload.email === "string" ? payload.email : undefined;
|
package/src/plugin.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
19
|
import { Plugin, toPlugin, type BasePluginConfig, type PluginManifest } from "@databricks/appkit";
|
|
20
|
-
import { brand, env, log, string } from "@dbx-tools/shared-core";
|
|
20
|
+
import { brand, env, log, object, string } from "@dbx-tools/shared-core";
|
|
21
21
|
import type { AuthStatus } from "@dbx-tools/shared-email";
|
|
22
22
|
import { looksLikeEmail, matchesAllowlist } from "./allowlist.ts";
|
|
23
23
|
import {
|
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
} from "./env.ts";
|
|
31
31
|
import { CodeStore, signSession, verifySession } from "./otp.ts";
|
|
32
32
|
import { RateLimiter } from "./rate-limit.ts";
|
|
33
|
-
import { KEY_TTL_SECONDS,
|
|
33
|
+
import { KEY_TTL_SECONDS, resolveSessionCutoff, signingKey } from "./signing-key.ts";
|
|
34
34
|
|
|
35
35
|
const logger = log.logger("tunnel:auth");
|
|
36
36
|
|
|
@@ -76,13 +76,14 @@ export interface AuthGateConfig extends BasePluginConfig {
|
|
|
76
76
|
/** Max verify attempts per issued code. Default 5. */
|
|
77
77
|
maxAttempts?: number;
|
|
78
78
|
/**
|
|
79
|
-
* Force-clear
|
|
80
|
-
* it forward signs everyone out. Env
|
|
79
|
+
* Force-clear cutoff: every session issued BEFORE it stops verifying, so moving
|
|
80
|
+
* it forward signs everyone out. Env TUNNEL_AUTH_SESSION_CUTOFF.
|
|
81
81
|
*
|
|
82
|
-
*
|
|
83
|
-
* seconds
|
|
82
|
+
* Anything `object.toDate` accepts: a `Date`, `2026-08-02`, an ISO instant,
|
|
83
|
+
* epoch seconds/millis, or a relative duration (`-30d`, `7 days ago`). Unset
|
|
84
|
+
* means no cutoff.
|
|
84
85
|
*/
|
|
85
|
-
|
|
86
|
+
sessionCutoff?: string | number | Date;
|
|
86
87
|
/** Deliver a code to an address. Wired by the app to the email plugin. */
|
|
87
88
|
sendCode?: (email: string, code: string, opts: SendCodeOptions) => Promise<void>;
|
|
88
89
|
}
|
|
@@ -111,7 +112,7 @@ export interface ResolvedAuthGateConfig {
|
|
|
111
112
|
codeTtlSeconds: number;
|
|
112
113
|
maxAttempts: number;
|
|
113
114
|
/** Force-clear cutoff in epoch ms; `0` when unset. */
|
|
114
|
-
|
|
115
|
+
sessionCutoffMs: number;
|
|
115
116
|
}
|
|
116
117
|
|
|
117
118
|
const DEFAULTS = {
|
|
@@ -148,7 +149,7 @@ export function resolveAuthGateConfig(config: AuthGateConfig): ResolvedAuthGateC
|
|
|
148
149
|
),
|
|
149
150
|
codeTtlSeconds: env.positiveInt(config.codeTtlSeconds, CODE_TTL_ENV, DEFAULTS.codeTtlSeconds),
|
|
150
151
|
maxAttempts: config.maxAttempts ?? DEFAULTS.maxAttempts,
|
|
151
|
-
|
|
152
|
+
sessionCutoffMs: resolveSessionCutoff(config.sessionCutoff),
|
|
152
153
|
};
|
|
153
154
|
}
|
|
154
155
|
|
|
@@ -193,11 +194,11 @@ export class AuthGatePlugin extends Plugin<AuthGateConfig> {
|
|
|
193
194
|
// Resolve the signing key HERE rather than lazily on the first sign-in, so a
|
|
194
195
|
// cache that cannot hold it (and the resulting "sessions won't survive a
|
|
195
196
|
// restart" warning) shows up in the startup log, not hours later.
|
|
196
|
-
const {
|
|
197
|
+
const { cutoffMs } = await signingKey(this.resolved.sessionCutoffMs);
|
|
197
198
|
logger.info("ready", {
|
|
198
199
|
patterns: this.resolved.allow.length,
|
|
199
200
|
sessionTtlSeconds: this.resolved.sessionTtlSeconds,
|
|
200
|
-
...(
|
|
201
|
+
...object.optional("sessionCutoff", cutoffMs > 0 ? new Date(cutoffMs).toISOString() : null),
|
|
201
202
|
});
|
|
202
203
|
}
|
|
203
204
|
|