@pipeline-builder/api-core 4.1.2 → 4.1.4

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.
Files changed (81) hide show
  1. package/README.md +3 -3
  2. package/lib/errors/app-errors.d.ts +0 -4
  3. package/lib/errors/app-errors.js +1 -8
  4. package/lib/helpers/restore-helpers.d.ts +3 -3
  5. package/lib/helpers/restore-helpers.js +4 -4
  6. package/lib/helpers/sse-helpers.d.ts +8 -1
  7. package/lib/helpers/sse-helpers.js +11 -3
  8. package/lib/middleware/auth.d.ts +174 -43
  9. package/lib/middleware/auth.js +384 -179
  10. package/lib/middleware/index.d.ts +1 -0
  11. package/lib/middleware/index.js +2 -1
  12. package/lib/middleware/route-table.d.ts +104 -0
  13. package/lib/middleware/route-table.js +230 -0
  14. package/lib/middleware/step-up.d.ts +48 -16
  15. package/lib/middleware/step-up.js +74 -36
  16. package/lib/services/api-key-exchange.d.ts +25 -0
  17. package/lib/services/api-key-exchange.js +219 -0
  18. package/lib/services/audit-spool.d.ts +2 -3
  19. package/lib/services/audit-spool.js +3 -4
  20. package/lib/services/cache-service.d.ts +65 -21
  21. package/lib/services/cache-service.js +173 -78
  22. package/lib/services/compliance-event-subscriber.d.ts +5 -4
  23. package/lib/services/compliance-event-subscriber.js +8 -6
  24. package/lib/services/durable-event-bus.d.ts +22 -39
  25. package/lib/services/durable-event-bus.js +109 -47
  26. package/lib/services/env-redis.d.ts +114 -35
  27. package/lib/services/env-redis.js +215 -73
  28. package/lib/services/http-client.d.ts +10 -15
  29. package/lib/services/http-client.js +32 -27
  30. package/lib/services/index.d.ts +3 -0
  31. package/lib/services/index.js +4 -1
  32. package/lib/services/jwks-cache.d.ts +102 -0
  33. package/lib/services/jwks-cache.js +222 -0
  34. package/lib/services/leader-lock.d.ts +6 -3
  35. package/lib/services/leader-lock.js +20 -5
  36. package/lib/services/quota.d.ts +44 -10
  37. package/lib/services/quota.js +95 -51
  38. package/lib/services/remote-audit-client.d.ts +1 -1
  39. package/lib/services/remote-audit-client.js +32 -1
  40. package/lib/services/scheduler.d.ts +2 -3
  41. package/lib/services/scheduler.js +2 -2
  42. package/lib/services/service-boot.d.ts +4 -2
  43. package/lib/services/service-boot.js +7 -3
  44. package/lib/services/service-keys.d.ts +83 -0
  45. package/lib/services/service-keys.js +354 -0
  46. package/lib/services/sse-ticket-store.d.ts +55 -22
  47. package/lib/services/sse-ticket-store.js +122 -79
  48. package/lib/services/token-revocation.d.ts +1 -1
  49. package/lib/services/token-revocation.js +31 -19
  50. package/lib/testing/route-coverage.d.ts +64 -0
  51. package/lib/testing/route-coverage.js +183 -0
  52. package/lib/testing/service-tokens.d.ts +66 -0
  53. package/lib/testing/service-tokens.js +137 -0
  54. package/lib/testing/tier-mock.d.ts +2 -2
  55. package/lib/testing/tier-mock.js +3 -3
  56. package/lib/testing/user-tokens.d.ts +75 -0
  57. package/lib/testing/user-tokens.js +115 -0
  58. package/lib/types/catalog-metadata.d.ts +0 -2
  59. package/lib/types/catalog-metadata.js +1 -3
  60. package/lib/types/common.d.ts +103 -4
  61. package/lib/types/common.js +11 -1
  62. package/lib/types/error-codes.d.ts +15 -0
  63. package/lib/types/error-codes.js +22 -1
  64. package/lib/types/permissions.d.ts +35 -1
  65. package/lib/types/permissions.js +70 -2
  66. package/lib/utils/api-key.d.ts +34 -0
  67. package/lib/utils/api-key.js +75 -0
  68. package/lib/utils/env.d.ts +0 -2
  69. package/lib/utils/env.js +1 -6
  70. package/lib/utils/index.d.ts +3 -0
  71. package/lib/utils/index.js +4 -1
  72. package/lib/utils/jwk.d.ts +98 -0
  73. package/lib/utils/jwk.js +139 -0
  74. package/lib/utils/logger.d.ts +4 -1
  75. package/lib/utils/logger.js +1 -22
  76. package/lib/utils/secret-encryption.d.ts +7 -2
  77. package/lib/utils/secret-encryption.js +47 -4
  78. package/lib/utils/secret-rotation.d.ts +17 -0
  79. package/lib/utils/secret-rotation.js +54 -0
  80. package/lib/validation/common-schemas.js +5 -4
  81. package/package.json +20 -1
@@ -1,3 +1,4 @@
1
1
  export * from './auth.js';
2
2
  export * from './mongo-sanitize.js';
3
3
  export * from './step-up.js';
4
+ export * from './route-table.js';
@@ -3,4 +3,5 @@
3
3
  export * from './auth.js';
4
4
  export * from './mongo-sanitize.js';
5
5
  export * from './step-up.js';
6
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQ0FBK0M7QUFDL0Msc0NBQXNDO0FBRXRDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxjQUFjLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgMjAyNiBQaXBlbGluZSBCdWlsZGVyIENvbnRyaWJ1dG9yc1xuLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEFwYWNoZS0yLjBcblxuZXhwb3J0ICogZnJvbSAnLi9hdXRoLmpzJztcbmV4cG9ydCAqIGZyb20gJy4vbW9uZ28tc2FuaXRpemUuanMnO1xuZXhwb3J0ICogZnJvbSAnLi9zdGVwLXVwLmpzJztcbiJdfQ==
6
+ export * from './route-table.js';
7
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQ0FBK0M7QUFDL0Msc0NBQXNDO0FBRXRDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxrQkFBa0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIENvcHlyaWdodCAyMDI2IFBpcGVsaW5lIEJ1aWxkZXIgQ29udHJpYnV0b3JzXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuXG5leHBvcnQgKiBmcm9tICcuL2F1dGguanMnO1xuZXhwb3J0ICogZnJvbSAnLi9tb25nby1zYW5pdGl6ZS5qcyc7XG5leHBvcnQgKiBmcm9tICcuL3N0ZXAtdXAuanMnO1xuZXhwb3J0ICogZnJvbSAnLi9yb3V0ZS10YWJsZS5qcyc7XG4iXX0=
@@ -0,0 +1,104 @@
1
+ import type { Permission } from '../types/permissions.js';
2
+ /** One requirement a gate middleware enforces. */
3
+ export type RouteGate = {
4
+ kind: 'auth';
5
+ } | {
6
+ kind: 'permission';
7
+ mode: 'any' | 'all';
8
+ permissions: readonly Permission[];
9
+ allowService?: boolean;
10
+ } | {
11
+ kind: 'systemAdmin';
12
+ } | {
13
+ kind: 'servicePrincipal';
14
+ }
15
+ /** An INTERNAL route: user tokens refused outright, only these services admitted. */
16
+ | {
17
+ kind: 'internalService';
18
+ callers: readonly string[];
19
+ } | {
20
+ kind: 'stepUp';
21
+ methods?: readonly string[];
22
+ }
23
+ /** The whole SESSION must be MFA-grade (`requireAuth({ minAssurance })`), and
24
+ * optionally no older than `maxAge` seconds. */
25
+ | {
26
+ kind: 'assurance';
27
+ minAssurance: 1 | 2;
28
+ maxAge?: number;
29
+ } | {
30
+ kind: 'feature';
31
+ feature: string;
32
+ } | {
33
+ kind: 'scope';
34
+ scope: string;
35
+ } | {
36
+ kind: 'audit';
37
+ actions: readonly string[];
38
+ };
39
+ /**
40
+ * Attach gate metadata to a middleware function (appends to any existing tags)
41
+ * and return the same function. Use it for a service-local gate so the route
42
+ * table knows what it enforces — e.g. a handler-level `requireComplianceWrite`
43
+ * tagged `{ kind: 'permission', mode: 'any', permissions: ['compliance:write'] }`.
44
+ */
45
+ export declare function tagRouteGate<T extends object>(fn: T, ...gates: RouteGate[]): T;
46
+ /** The gate metadata attached to a middleware function (empty when untagged). */
47
+ export declare function getRouteGates(fn: unknown): readonly RouteGate[];
48
+ /**
49
+ * Declare the audit action(s) a route emits. A no-op middleware whose only job
50
+ * is to put the action on the route table, so the coverage test can require an
51
+ * audit declaration on every write route. Place it in the route's chain:
52
+ * `router.post('/', audited('pipeline.create'), handler)`. The handler still
53
+ * emits the event itself.
54
+ */
55
+ export declare function audited(...actions: string[]): (req: unknown, res: unknown, next: () => void) => void;
56
+ /** Resolved requirements for one method + path. */
57
+ export interface RouteTableEntry {
58
+ method: string;
59
+ path: string;
60
+ /** Authentication runs before the handler (requireAuth). */
61
+ auth: boolean;
62
+ /** Each permission gate in the chain (all must pass; each is any-of or all-of). */
63
+ permissions: Array<{
64
+ mode: 'any' | 'all';
65
+ permissions: Permission[];
66
+ allowService: boolean;
67
+ }>;
68
+ systemAdmin: boolean;
69
+ servicePrincipal: boolean;
70
+ /**
71
+ * The services allowed to call this route when it is INTERNAL (`requireInternalService`).
72
+ * An empty array means the route is not internal — a user token may reach it,
73
+ * subject to the other gates. Sorted, so the generated table is stable.
74
+ */
75
+ internalCallers: string[];
76
+ stepUp: boolean;
77
+ /** When the step-up gate names the factors that may earn it (`['webauthn',
78
+ * 'totp']` on the most dangerous routes), the allowed methods. Empty means
79
+ * any factor satisfies it. Sorted, so the generated table is stable. */
80
+ stepUpMethods: string[];
81
+ /** Highest `minAssurance` any gate in the chain demands; 0 when none does. */
82
+ minAssurance: 0 | 1 | 2;
83
+ /** Tightest `maxAge` (seconds) any assurance gate in the chain demands. */
84
+ maxAge?: number;
85
+ features: string[];
86
+ scopes: string[];
87
+ audit: string[];
88
+ }
89
+ /**
90
+ * Build the route table of an assembled Express app (or router): one entry per
91
+ * reachable method + path with every gate that runs before its handler.
92
+ * HEAD is folded into GET, as Express does.
93
+ */
94
+ export declare function buildRouteTable(app: unknown): RouteTableEntry[];
95
+ /** Whether a method mutates state (everything except GET/HEAD/OPTIONS). */
96
+ export declare function isWriteMethod(method: string): boolean;
97
+ /** Summary counts for a startup log line. */
98
+ export declare function summarizeRouteTable(table: readonly RouteTableEntry[]): {
99
+ routes: number;
100
+ writes: number;
101
+ ungated: number;
102
+ unaudited: number;
103
+ internal: number;
104
+ };
@@ -0,0 +1,230 @@
1
+ // Copyright 2026 Pipeline Builder Contributors
2
+ // SPDX-License-Identifier: Apache-2.0
3
+ /**
4
+ * Introspectable route table.
5
+ *
6
+ * Authorization is split between router mounts (`app.use('/x', gate, router)`)
7
+ * and individual routes, so grepping source can't prove that every route is
8
+ * gated. Instead, every gate middleware in this package carries METADATA (what it
9
+ * requires), and {@link buildRouteTable} walks an assembled Express app and
10
+ * resolves, per method + path, the full chain of gates Express would run before
11
+ * the handler: permissions, system-admin, service principal, step-up, feature,
12
+ * token scope, and the audit actions the route declares via {@link audited}.
13
+ *
14
+ * Express 5 (router@2) does not keep a mount's path string on its layer, so this
15
+ * module records it: on import it wraps `Router.prototype.use` to stamp each new
16
+ * layer with the path it was mounted at. api-core is imported before any route
17
+ * module registers a route, so every layer an app builds is stamped. The wrap
18
+ * only adds a symbol property; routing behaviour is unchanged.
19
+ */
20
+ import express from 'express';
21
+ // Symbol.for, not Symbol(): a test that loads api-core twice (ESM + a
22
+ // requireActual copy) must still see tags set by the other copy.
23
+ const GATES = Symbol.for('pipeline-builder.route-gates');
24
+ const LAYER_PATH = Symbol.for('pipeline-builder.layer-path');
25
+ const RECORDER_INSTALLED = Symbol.for('pipeline-builder.route-recorder');
26
+ /**
27
+ * Attach gate metadata to a middleware function (appends to any existing tags)
28
+ * and return the same function. Use it for a service-local gate so the route
29
+ * table knows what it enforces — e.g. a handler-level `requireComplianceWrite`
30
+ * tagged `{ kind: 'permission', mode: 'any', permissions: ['compliance:write'] }`.
31
+ */
32
+ export function tagRouteGate(fn, ...gates) {
33
+ const t = fn;
34
+ Object.defineProperty(t, GATES, { value: [...(t[GATES] ?? []), ...gates], configurable: true, enumerable: false, writable: true });
35
+ return fn;
36
+ }
37
+ /** The gate metadata attached to a middleware function (empty when untagged). */
38
+ export function getRouteGates(fn) {
39
+ if (typeof fn !== 'function')
40
+ return [];
41
+ return fn[GATES] ?? [];
42
+ }
43
+ /**
44
+ * Declare the audit action(s) a route emits. A no-op middleware whose only job
45
+ * is to put the action on the route table, so the coverage test can require an
46
+ * audit declaration on every write route. Place it in the route's chain:
47
+ * `router.post('/', audited('pipeline.create'), handler)`. The handler still
48
+ * emits the event itself.
49
+ */
50
+ export function audited(...actions) {
51
+ return tagRouteGate(function auditedRoute(_req, _res, next) { next(); }, { kind: 'audit', actions });
52
+ }
53
+ function installRouteRecorder() {
54
+ const proto = express.Router.prototype;
55
+ if (proto[RECORDER_INSTALLED])
56
+ return;
57
+ const originalUse = proto.use;
58
+ proto.use = function recordingUse(...args) {
59
+ const before = this.stack.length;
60
+ const result = originalUse.apply(this, args);
61
+ // Same path disambiguation as router@2's `use`: a leading non-function
62
+ // (possibly nested in arrays) is the path; otherwise the mount is '/'.
63
+ let first = args[0];
64
+ while (Array.isArray(first) && first.length > 0)
65
+ first = first[0];
66
+ const path = typeof first === 'function' ? '/' : String(args[0]);
67
+ for (let i = before; i < this.stack.length; i++) {
68
+ Object.defineProperty(this.stack[i], LAYER_PATH, { value: path, enumerable: false, configurable: true });
69
+ }
70
+ return result;
71
+ };
72
+ Object.defineProperty(proto, RECORDER_INSTALLED, { value: true, enumerable: false });
73
+ }
74
+ installRouteRecorder();
75
+ function joinPath(prefix, path) {
76
+ const joined = `${prefix.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
77
+ return joined.length > 1 ? joined.replace(/\/+$/, '') : '/';
78
+ }
79
+ function isRouter(handle) {
80
+ return typeof handle === 'function' && Array.isArray(handle.stack);
81
+ }
82
+ /**
83
+ * Whether a middleware layer (mounted under `prefix`) runs for `fullPath`.
84
+ * Mirrors `Layer.prototype.match`, including its fast path: a layer added with
85
+ * no path (`router.use(gate)`) matches EVERY path under its router — which is
86
+ * exactly how the shared `requirePermission` gates between two `router.use(...)`
87
+ * mounts reach the routers registered after them.
88
+ */
89
+ function applies(c, fullPath) {
90
+ const base = c.prefix === '/' ? '' : c.prefix;
91
+ if (base && fullPath !== base && !fullPath.startsWith(`${base}/`))
92
+ return false;
93
+ if (c.layer.slash)
94
+ return true;
95
+ const rel = fullPath.slice(base.length) || '/';
96
+ return c.layer.matchers.some((m) => m(rel) !== false);
97
+ }
98
+ function collectGates(fns) {
99
+ return fns.flatMap((fn) => getRouteGates(fn));
100
+ }
101
+ function toEntry(method, path, gates) {
102
+ const entry = {
103
+ method,
104
+ path,
105
+ auth: false,
106
+ permissions: [],
107
+ systemAdmin: false,
108
+ servicePrincipal: false,
109
+ internalCallers: [],
110
+ stepUp: false,
111
+ stepUpMethods: [],
112
+ minAssurance: 0,
113
+ features: [],
114
+ scopes: [],
115
+ audit: [],
116
+ };
117
+ for (const g of gates) {
118
+ switch (g.kind) {
119
+ case 'auth':
120
+ entry.auth = true;
121
+ break;
122
+ case 'permission':
123
+ entry.permissions.push({ mode: g.mode, permissions: [...g.permissions], allowService: g.allowService === true });
124
+ break;
125
+ case 'systemAdmin':
126
+ entry.systemAdmin = true;
127
+ break;
128
+ case 'servicePrincipal':
129
+ entry.servicePrincipal = true;
130
+ break;
131
+ case 'internalService':
132
+ for (const c of g.callers)
133
+ if (!entry.internalCallers.includes(c))
134
+ entry.internalCallers.push(c);
135
+ break;
136
+ case 'stepUp':
137
+ entry.stepUp = true;
138
+ for (const m of g.methods ?? [])
139
+ if (!entry.stepUpMethods.includes(m))
140
+ entry.stepUpMethods.push(m);
141
+ break;
142
+ case 'assurance':
143
+ // Several gates may apply; the STRICTEST wins, since every one of them runs.
144
+ if (g.minAssurance > entry.minAssurance)
145
+ entry.minAssurance = g.minAssurance;
146
+ if (g.maxAge !== undefined)
147
+ entry.maxAge = entry.maxAge === undefined ? g.maxAge : Math.min(entry.maxAge, g.maxAge);
148
+ break;
149
+ case 'feature':
150
+ if (!entry.features.includes(g.feature))
151
+ entry.features.push(g.feature);
152
+ break;
153
+ case 'scope':
154
+ if (!entry.scopes.includes(g.scope))
155
+ entry.scopes.push(g.scope);
156
+ break;
157
+ case 'audit':
158
+ for (const a of g.actions)
159
+ if (!entry.audit.includes(a))
160
+ entry.audit.push(a);
161
+ break;
162
+ }
163
+ }
164
+ entry.internalCallers.sort();
165
+ entry.stepUpMethods.sort();
166
+ return entry;
167
+ }
168
+ function walk(stack, prefix, inherited, out, seen) {
169
+ const local = [];
170
+ for (const layer of stack) {
171
+ if (layer.route) {
172
+ const paths = Array.isArray(layer.route.path) ? layer.route.path : [layer.route.path];
173
+ const methods = Object.keys(layer.route.methods).map((m) => (m === '_all' ? '*' : m.toUpperCase()));
174
+ for (const routePath of paths) {
175
+ const full = joinPath(prefix, String(routePath));
176
+ const chain = [...inherited, ...local].filter((c) => applies(c, full)).map((c) => c.layer.handle);
177
+ for (const method of methods) {
178
+ const key = `${method} ${full}`;
179
+ // First registration wins, as in Express: a later duplicate is unreachable.
180
+ if (seen.has(key))
181
+ continue;
182
+ seen.add(key);
183
+ const routeFns = layer.route.stack
184
+ .filter((l) => l.method === undefined || l.method.toUpperCase() === method || method === '*')
185
+ .map((l) => l.handle);
186
+ out.push(toEntry(method, full, collectGates([...chain, ...routeFns])));
187
+ }
188
+ }
189
+ }
190
+ else if (isRouter(layer.handle)) {
191
+ const mountPath = joinPath(prefix, layer[LAYER_PATH] ?? '/');
192
+ // Middleware that runs before this router (ancestors + earlier siblings)
193
+ // is inherited; applicability is re-checked against each full route path.
194
+ walk(layer.handle.stack, mountPath, [...inherited, ...local], out, seen);
195
+ }
196
+ else {
197
+ local.push({ layer, prefix });
198
+ }
199
+ }
200
+ }
201
+ /**
202
+ * Build the route table of an assembled Express app (or router): one entry per
203
+ * reachable method + path with every gate that runs before its handler.
204
+ * HEAD is folded into GET, as Express does.
205
+ */
206
+ export function buildRouteTable(app) {
207
+ const root = app.router ?? app;
208
+ const out = [];
209
+ if (!root || !Array.isArray(root.stack))
210
+ return out;
211
+ walk(root.stack, '/', [], out, new Set());
212
+ return out.sort((a, b) => (a.path === b.path ? a.method.localeCompare(b.method) : a.path.localeCompare(b.path)));
213
+ }
214
+ /** Whether a method mutates state (everything except GET/HEAD/OPTIONS). */
215
+ export function isWriteMethod(method) {
216
+ return !['GET', 'HEAD', 'OPTIONS'].includes(method.toUpperCase());
217
+ }
218
+ /** Summary counts for a startup log line. */
219
+ export function summarizeRouteTable(table) {
220
+ const gated = (e) => e.permissions.length > 0 || e.systemAdmin || e.servicePrincipal;
221
+ const writes = table.filter((e) => isWriteMethod(e.method));
222
+ return {
223
+ routes: table.length,
224
+ writes: writes.length,
225
+ ungated: table.filter((e) => !gated(e)).length,
226
+ unaudited: writes.filter((e) => e.audit.length === 0).length,
227
+ internal: table.filter((e) => e.internalCallers.length > 0).length,
228
+ };
229
+ }
230
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-table.js","sourceRoot":"","sources":["../../src/middleware/route-table.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2026 Pipeline Builder Contributors\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * Introspectable route table.\n *\n * Authorization is split between router mounts (`app.use('/x', gate, router)`)\n * and individual routes, so grepping source can't prove that every route is\n * gated. Instead, every gate middleware in this package carries METADATA (what it\n * requires), and {@link buildRouteTable} walks an assembled Express app and\n * resolves, per method + path, the full chain of gates Express would run before\n * the handler: permissions, system-admin, service principal, step-up, feature,\n * token scope, and the audit actions the route declares via {@link audited}.\n *\n * Express 5 (router@2) does not keep a mount's path string on its layer, so this\n * module records it: on import it wraps `Router.prototype.use` to stamp each new\n * layer with the path it was mounted at. api-core is imported before any route\n * module registers a route, so every layer an app builds is stamped. The wrap\n * only adds a symbol property; routing behaviour is unchanged.\n */\n\nimport express from 'express';\nimport type { Permission } from '../types/permissions.js';\n\n/** One requirement a gate middleware enforces. */\nexport type RouteGate =\n  | { kind: 'auth' }\n  | { kind: 'permission'; mode: 'any' | 'all'; permissions: readonly Permission[]; allowService?: boolean }\n  | { kind: 'systemAdmin' }\n  | { kind: 'servicePrincipal' }\n  /** An INTERNAL route: user tokens refused outright, only these services admitted. */\n  | { kind: 'internalService'; callers: readonly string[] }\n  | { kind: 'stepUp'; methods?: readonly string[] }\n  /** The whole SESSION must be MFA-grade (`requireAuth({ minAssurance })`), and\n   *  optionally no older than `maxAge` seconds. */\n  | { kind: 'assurance'; minAssurance: 1 | 2; maxAge?: number }\n  | { kind: 'feature'; feature: string }\n  | { kind: 'scope'; scope: string }\n  | { kind: 'audit'; actions: readonly string[] };\n\n// Symbol.for, not Symbol(): a test that loads api-core twice (ESM + a\n// requireActual copy) must still see tags set by the other copy.\nconst GATES = Symbol.for('pipeline-builder.route-gates');\nconst LAYER_PATH = Symbol.for('pipeline-builder.layer-path');\nconst RECORDER_INSTALLED = Symbol.for('pipeline-builder.route-recorder');\n\ntype Tagged = { [GATES]?: RouteGate[] };\n\n/**\n * Attach gate metadata to a middleware function (appends to any existing tags)\n * and return the same function. Use it for a service-local gate so the route\n * table knows what it enforces — e.g. a handler-level `requireComplianceWrite`\n * tagged `{ kind: 'permission', mode: 'any', permissions: ['compliance:write'] }`.\n */\nexport function tagRouteGate<T extends object>(fn: T, ...gates: RouteGate[]): T {\n  const t = fn as T & Tagged;\n  Object.defineProperty(t, GATES, { value: [...(t[GATES] ?? []), ...gates], configurable: true, enumerable: false, writable: true });\n  return fn;\n}\n\n/** The gate metadata attached to a middleware function (empty when untagged). */\nexport function getRouteGates(fn: unknown): readonly RouteGate[] {\n  if (typeof fn !== 'function') return [];\n  return (fn as Tagged)[GATES] ?? [];\n}\n\n/**\n * Declare the audit action(s) a route emits. A no-op middleware whose only job\n * is to put the action on the route table, so the coverage test can require an\n * audit declaration on every write route. Place it in the route's chain:\n * `router.post('/', audited('pipeline.create'), handler)`. The handler still\n * emits the event itself.\n */\nexport function audited(...actions: string[]): (req: unknown, res: unknown, next: () => void) => void {\n  return tagRouteGate(function auditedRoute(_req: unknown, _res: unknown, next: () => void) { next(); }, { kind: 'audit', actions });\n}\n\n// ---------------------------------------------------------------------------\n// Mount-path recording\n// ---------------------------------------------------------------------------\n\ninterface Layer {\n  handle: unknown;\n  route?: { path: string | string[]; methods: Record<string, boolean>; stack: Array<{ method?: string; handle: unknown }> };\n  matchers: Array<(path: string) => unknown>;\n  /** router@2's \"mounted at '/' with end:false\" fast path — matches ANY path. */\n  slash?: boolean;\n  [LAYER_PATH]?: string;\n}\n\ninterface RouterLike { stack: Layer[] }\n\nfunction installRouteRecorder(): void {\n  const proto = (express.Router as unknown as { prototype: Record<string | symbol, unknown> }).prototype;\n  if (proto[RECORDER_INSTALLED]) return;\n  const originalUse = proto.use as (this: RouterLike, ...args: unknown[]) => unknown;\n  proto.use = function recordingUse(this: RouterLike, ...args: unknown[]): unknown {\n    const before = this.stack.length;\n    const result = originalUse.apply(this, args);\n    // Same path disambiguation as router@2's `use`: a leading non-function\n    // (possibly nested in arrays) is the path; otherwise the mount is '/'.\n    let first: unknown = args[0];\n    while (Array.isArray(first) && first.length > 0) first = first[0];\n    const path = typeof first === 'function' ? '/' : String(args[0]);\n    for (let i = before; i < this.stack.length; i++) {\n      Object.defineProperty(this.stack[i], LAYER_PATH, { value: path, enumerable: false, configurable: true });\n    }\n    return result;\n  };\n  Object.defineProperty(proto, RECORDER_INSTALLED, { value: true, enumerable: false });\n}\n\ninstallRouteRecorder();\n\n// ---------------------------------------------------------------------------\n// Table construction\n// ---------------------------------------------------------------------------\n\n/** Resolved requirements for one method + path. */\nexport interface RouteTableEntry {\n  method: string;\n  path: string;\n  /** Authentication runs before the handler (requireAuth). */\n  auth: boolean;\n  /** Each permission gate in the chain (all must pass; each is any-of or all-of). */\n  permissions: Array<{ mode: 'any' | 'all'; permissions: Permission[]; allowService: boolean }>;\n  systemAdmin: boolean;\n  servicePrincipal: boolean;\n  /**\n   * The services allowed to call this route when it is INTERNAL (`requireInternalService`).\n   * An empty array means the route is not internal — a user token may reach it,\n   * subject to the other gates. Sorted, so the generated table is stable.\n   */\n  internalCallers: string[];\n  stepUp: boolean;\n  /** When the step-up gate names the factors that may earn it (`['webauthn',\n   *  'totp']` on the most dangerous routes), the allowed methods. Empty means\n   *  any factor satisfies it. Sorted, so the generated table is stable. */\n  stepUpMethods: string[];\n  /** Highest `minAssurance` any gate in the chain demands; 0 when none does. */\n  minAssurance: 0 | 1 | 2;\n  /** Tightest `maxAge` (seconds) any assurance gate in the chain demands. */\n  maxAge?: number;\n  features: string[];\n  scopes: string[];\n  audit: string[];\n}\n\ninterface Candidate { layer: Layer; prefix: string }\n\nfunction joinPath(prefix: string, path: string): string {\n  const joined = `${prefix.replace(/\\/+$/, '')}/${path.replace(/^\\/+/, '')}`;\n  return joined.length > 1 ? joined.replace(/\\/+$/, '') : '/';\n}\n\nfunction isRouter(handle: unknown): handle is RouterLike {\n  return typeof handle === 'function' && Array.isArray((handle as Partial<RouterLike>).stack);\n}\n\n/**\n * Whether a middleware layer (mounted under `prefix`) runs for `fullPath`.\n * Mirrors `Layer.prototype.match`, including its fast path: a layer added with\n * no path (`router.use(gate)`) matches EVERY path under its router — which is\n * exactly how the shared `requirePermission` gates between two `router.use(...)`\n * mounts reach the routers registered after them.\n */\nfunction applies(c: Candidate, fullPath: string): boolean {\n  const base = c.prefix === '/' ? '' : c.prefix;\n  if (base && fullPath !== base && !fullPath.startsWith(`${base}/`)) return false;\n  if (c.layer.slash) return true;\n  const rel = fullPath.slice(base.length) || '/';\n  return c.layer.matchers.some((m) => m(rel) !== false);\n}\n\nfunction collectGates(fns: unknown[]): RouteGate[] {\n  return fns.flatMap((fn) => getRouteGates(fn));\n}\n\nfunction toEntry(method: string, path: string, gates: RouteGate[]): RouteTableEntry {\n  const entry: RouteTableEntry = {\n    method,\n    path,\n    auth: false,\n    permissions: [],\n    systemAdmin: false,\n    servicePrincipal: false,\n    internalCallers: [],\n    stepUp: false,\n    stepUpMethods: [],\n    minAssurance: 0,\n    features: [],\n    scopes: [],\n    audit: [],\n  };\n  for (const g of gates) {\n    switch (g.kind) {\n      case 'auth': entry.auth = true; break;\n      case 'permission': entry.permissions.push({ mode: g.mode, permissions: [...g.permissions], allowService: g.allowService === true }); break;\n      case 'systemAdmin': entry.systemAdmin = true; break;\n      case 'servicePrincipal': entry.servicePrincipal = true; break;\n      case 'internalService': for (const c of g.callers) if (!entry.internalCallers.includes(c)) entry.internalCallers.push(c); break;\n      case 'stepUp':\n        entry.stepUp = true;\n        for (const m of g.methods ?? []) if (!entry.stepUpMethods.includes(m)) entry.stepUpMethods.push(m);\n        break;\n      case 'assurance':\n        // Several gates may apply; the STRICTEST wins, since every one of them runs.\n        if (g.minAssurance > entry.minAssurance) entry.minAssurance = g.minAssurance;\n        if (g.maxAge !== undefined) entry.maxAge = entry.maxAge === undefined ? g.maxAge : Math.min(entry.maxAge, g.maxAge);\n        break;\n      case 'feature': if (!entry.features.includes(g.feature)) entry.features.push(g.feature); break;\n      case 'scope': if (!entry.scopes.includes(g.scope)) entry.scopes.push(g.scope); break;\n      case 'audit': for (const a of g.actions) if (!entry.audit.includes(a)) entry.audit.push(a); break;\n    }\n  }\n  entry.internalCallers.sort();\n  entry.stepUpMethods.sort();\n  return entry;\n}\n\nfunction walk(stack: Layer[], prefix: string, inherited: Candidate[], out: RouteTableEntry[], seen: Set<string>): void {\n  const local: Candidate[] = [];\n  for (const layer of stack) {\n    if (layer.route) {\n      const paths = Array.isArray(layer.route.path) ? layer.route.path : [layer.route.path];\n      const methods = Object.keys(layer.route.methods).map((m) => (m === '_all' ? '*' : m.toUpperCase()));\n      for (const routePath of paths) {\n        const full = joinPath(prefix, String(routePath));\n        const chain = [...inherited, ...local].filter((c) => applies(c, full)).map((c) => c.layer.handle);\n        for (const method of methods) {\n          const key = `${method} ${full}`;\n          // First registration wins, as in Express: a later duplicate is unreachable.\n          if (seen.has(key)) continue;\n          seen.add(key);\n          const routeFns = layer.route.stack\n            .filter((l) => l.method === undefined || l.method.toUpperCase() === method || method === '*')\n            .map((l) => l.handle);\n          out.push(toEntry(method, full, collectGates([...chain, ...routeFns])));\n        }\n      }\n    } else if (isRouter(layer.handle)) {\n      const mountPath = joinPath(prefix, layer[LAYER_PATH] ?? '/');\n      // Middleware that runs before this router (ancestors + earlier siblings)\n      // is inherited; applicability is re-checked against each full route path.\n      walk(layer.handle.stack, mountPath, [...inherited, ...local], out, seen);\n    } else {\n      local.push({ layer, prefix });\n    }\n  }\n}\n\n/**\n * Build the route table of an assembled Express app (or router): one entry per\n * reachable method + path with every gate that runs before its handler.\n * HEAD is folded into GET, as Express does.\n */\nexport function buildRouteTable(app: unknown): RouteTableEntry[] {\n  const root = (app as { router?: RouterLike }).router ?? (app as RouterLike);\n  const out: RouteTableEntry[] = [];\n  if (!root || !Array.isArray(root.stack)) return out;\n  walk(root.stack, '/', [], out, new Set());\n  return out.sort((a, b) => (a.path === b.path ? a.method.localeCompare(b.method) : a.path.localeCompare(b.path)));\n}\n\n/** Whether a method mutates state (everything except GET/HEAD/OPTIONS). */\nexport function isWriteMethod(method: string): boolean {\n  return !['GET', 'HEAD', 'OPTIONS'].includes(method.toUpperCase());\n}\n\n/** Summary counts for a startup log line. */\nexport function summarizeRouteTable(table: readonly RouteTableEntry[]): { routes: number; writes: number; ungated: number; unaudited: number; internal: number } {\n  const gated = (e: RouteTableEntry): boolean => e.permissions.length > 0 || e.systemAdmin || e.servicePrincipal;\n  const writes = table.filter((e) => isWriteMethod(e.method));\n  return {\n    routes: table.length,\n    writes: writes.length,\n    ungated: table.filter((e) => !gated(e)).length,\n    unaudited: writes.filter((e) => e.audit.length === 0).length,\n    internal: table.filter((e) => e.internalCallers.length > 0).length,\n  };\n}\n"]}
@@ -2,9 +2,10 @@
2
2
  * `requireStepUp` — a shared step-up (recent-password-reverify) gate for the
3
3
  * stateless api services, mirroring the platform middleware of the same name.
4
4
  *
5
- * Flow: the UI hits `POST /api/auth/step-up` (platform) to re-verify the user's
6
- * password; platform mints a short-lived (60s) `step-up` JWT signed with the
7
- * SAME `JWT_SECRET` these services already verify access tokens with. The UI
5
+ * Flow: the UI hits `POST /api/auth/step-up` (platform) to re-verify the user;
6
+ * platform mints a short-lived (60s) `step-up` JWT with the SAME ES256 signing
7
+ * key it mints access tokens with, so these services verify it through the same
8
+ * JWKS. The UI
8
9
  * replays it as the `X-Step-Up-Token` header on the destructive/sensitive call;
9
10
  * this middleware verifies it, binds it to the caller (`sub` match), and
10
11
  * consumes its `jti` once (Redis-backed cross-instance when configured, else a
@@ -15,30 +16,54 @@
15
16
  * verify + single-use jti into api-core so any service can require it.
16
17
  */
17
18
  import type { Request, Response, NextFunction } from 'express';
19
+ /**
20
+ * How a step-up token was earned. Mirrors platform's `StepUpMethod`; kept here
21
+ * as its own union so a verifier can name the factors it accepts without
22
+ * importing platform.
23
+ */
24
+ export type StepUpMethod = 'password' | 'webauthn' | 'totp' | 'reauth';
25
+ /**
26
+ * The factors that count as a SECOND FACTOR, for routes that may only be
27
+ * unlocked by one (#8: impersonation, KMS, IdP settings, platform admin).
28
+ *
29
+ * A password or a provider re-auth proves the same single factor the session was
30
+ * already opened with, so on those routes they are not enough: the point is that
31
+ * someone holding only a stolen session — or only a stolen password — cannot
32
+ * proceed.
33
+ */
34
+ export declare const STRONG_STEP_UP_METHODS: readonly StepUpMethod[];
18
35
  /** Payload of a platform-issued step-up token (see platform issueStepUpToken). */
19
36
  export interface StepUpTokenPayload {
20
37
  type: 'step-up';
21
38
  sub: string;
22
39
  jti: string;
40
+ /** Which factor earned it. Absent only on a token minted before the claim
41
+ * existed, which a method-restricted gate treats as "not proven". */
42
+ method?: StepUpMethod;
23
43
  iat: number;
24
44
  exp: number;
25
45
  }
46
+ /** Options for {@link requireStepUp}. */
47
+ export interface RequireStepUpOptions {
48
+ /** Restrict which factors may earn the step-up (e.g. {@link STRONG_STEP_UP_METHODS}).
49
+ * Omitted means any factor the platform will issue a token for. */
50
+ methods?: readonly StepUpMethod[];
51
+ }
26
52
  /**
27
- * Verify a step-up token: valid signature (primary `JWT_SECRET`, or
28
- * `JWT_SECRET_PREVIOUS` during a rotation), allow-listed algorithm, issuer and
29
- * audience when configured, AND the `type: 'step-up'` + `jti` claims — a plain
30
- * access token shares the secret and `sub`, so without asserting the step-up
31
- * shape it would bypass the gate. Throws on any failure. Does NOT bind to a
32
- * caller — `requireStepUp` does the `sub` match and single-use consume.
53
+ * Verify a step-up token: a valid ES256 signature from one of platform's
54
+ * published signing keys, issuer and audience when configured, AND the
55
+ * `type: 'step-up'` + `jti` claims — a plain access token is signed by the same
56
+ * key and carries the same `sub`, so without asserting the step-up shape it
57
+ * would bypass the gate. Throws on any failure (an unfetchable key set included:
58
+ * an unverifiable token is not a step-up). Does NOT bind to a caller —
59
+ * `requireStepUp` does the `sub` match and single-use consume.
33
60
  *
34
- * Delegates to `requireAuth`'s own primitives rather than re-implementing them.
35
- * The hand-rolled copy this replaced dropped TWO of their guards: it never
36
- * pinned issuer/audience (so a step-up token from any other system sharing
37
- * `JWT_SECRET` was accepted wherever `JWT_ISSUER`/`JWT_AUDIENCE` are set), and
38
- * its previous-secret retry had no expiry/not-before carve-out, so an EXPIRED
39
- * token was retried and surfaced as a signature error instead of an expiry one.
61
+ * Delegates to `requireAuth`'s own primitive (`verifyUserJwt`) rather than
62
+ * re-implementing it. The hand-rolled copy this replaced dropped TWO of its
63
+ * guards: it never pinned issuer/audience, and its previous-secret retry had no
64
+ * expiry/not-before carve-out, so an EXPIRED token surfaced as a signature error.
40
65
  */
41
- export declare function verifyStepUpToken(token: string): StepUpTokenPayload;
66
+ export declare function verifyStepUpToken(token: string): Promise<StepUpTokenPayload>;
42
67
  /**
43
68
  * Consume a step-up `jti` exactly once. Returns true if this call claimed it
44
69
  * (first use), false if it was already consumed (replay). `expEpochSeconds` is
@@ -48,5 +73,12 @@ export declare function consumeStepUpJti(jti: string, expEpochSeconds: number):
48
73
  /**
49
74
  * Express middleware: require a valid, caller-bound, single-use step-up token in
50
75
  * the `X-Step-Up-Token` header. Must run AFTER `requireAuth` (needs `req.user`).
76
+ *
77
+ * Use directly (`router.post('/x', requireAuth, requireStepUp, h)`) for the
78
+ * ordinary any-factor gate, or call it with `{ methods }` to demand that the
79
+ * confirmation was earned by a specific factor — `requireStepUp({ methods:
80
+ * STRONG_STEP_UP_METHODS })` on the routes where a password re-prompt is not a
81
+ * meaningful second proof.
51
82
  */
52
83
  export declare function requireStepUp(req: Request, res: Response, next: NextFunction): Promise<void>;
84
+ export declare function requireStepUp(options: RequireStepUpOptions): (req: Request, res: Response, next: NextFunction) => void;