@dollhousemcp/mcp-server 2.0.10 → 2.0.11
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/dist/auto-dollhouse/portDiscovery.d.ts +23 -0
- package/dist/auto-dollhouse/portDiscovery.d.ts.map +1 -0
- package/dist/auto-dollhouse/portDiscovery.js +77 -0
- package/dist/cli/console-token.d.ts +18 -0
- package/dist/cli/console-token.d.ts.map +1 -0
- package/dist/cli/console-token.js +187 -0
- package/dist/generated/version.d.ts +2 -2
- package/dist/generated/version.js +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +24 -5
- package/dist/web/console/consoleToken.d.ts +403 -0
- package/dist/web/console/consoleToken.d.ts.map +1 -0
- package/dist/web/console/consoleToken.js +930 -0
- package/dist/web/middleware/authMiddleware.d.ts +64 -0
- package/dist/web/middleware/authMiddleware.d.ts.map +1 -0
- package/dist/web/middleware/authMiddleware.js +174 -0
- package/dist/web/routes/consoleRouteHelpers.d.ts +33 -0
- package/dist/web/routes/consoleRouteHelpers.d.ts.map +1 -0
- package/dist/web/routes/consoleRouteHelpers.js +60 -0
- package/dist/web/routes/tokenRoutes.d.ts +37 -0
- package/dist/web/routes/tokenRoutes.d.ts.map +1 -0
- package/dist/web/routes/tokenRoutes.js +95 -0
- package/dist/web/routes/totpRoutes.d.ts +45 -0
- package/dist/web/routes/totpRoutes.d.ts.map +1 -0
- package/dist/web/routes/totpRoutes.js +187 -0
- package/package.json +1 -1
- package/server.json +2 -2
- package/dist/constants/version.d.ts +0 -3
- package/dist/constants/version.d.ts.map +0 -1
- package/dist/constants/version.js +0 -4
- package/dist/logging/sinks/SSELogSink.d.ts +0 -35
- package/dist/logging/sinks/SSELogSink.d.ts.map +0 -1
- package/dist/logging/sinks/SSELogSink.js +0 -181
- package/dist/logging/viewer/viewerHtml.d.ts +0 -8
- package/dist/logging/viewer/viewerHtml.d.ts.map +0 -1
- package/dist/logging/viewer/viewerHtml.js +0 -204
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Express middleware for console Bearer token authentication (#1780).
|
|
3
|
+
*
|
|
4
|
+
* Checks the `Authorization: Bearer <token>` header on requests to protected
|
|
5
|
+
* endpoints, with a `?token=<token>` query parameter fallback for SSE streams
|
|
6
|
+
* (EventSource cannot set custom headers).
|
|
7
|
+
*
|
|
8
|
+
* Behavior is gated on the `DOLLHOUSE_WEB_AUTH_ENABLED` env var. When the flag
|
|
9
|
+
* is false (the default during Phase 1 rollout) the middleware is a no-op —
|
|
10
|
+
* requests pass through unconditionally. When true, every protected request
|
|
11
|
+
* must carry a valid token or receive a 401.
|
|
12
|
+
*
|
|
13
|
+
* Phase 1 design notes:
|
|
14
|
+
* - Every valid token is treated as admin-scoped. Scope enforcement is a
|
|
15
|
+
* stubbed hook (`authorizeScope`) that always returns true. Phase 2 swaps
|
|
16
|
+
* in real scope checks without touching any route handler.
|
|
17
|
+
* - Element boundaries and tenant filtering are similarly stubbed for Phase 3.
|
|
18
|
+
* - The middleware attaches the matched token entry to `res.locals.tokenEntry`
|
|
19
|
+
* so downstream handlers can inspect it (audit logs, scope decisions, etc.).
|
|
20
|
+
*
|
|
21
|
+
* @since v2.1.0 — Issue #1780
|
|
22
|
+
*/
|
|
23
|
+
import type { RequestHandler } from 'express';
|
|
24
|
+
import type { ConsoleTokenStore } from '../console/consoleToken.js';
|
|
25
|
+
/**
|
|
26
|
+
* Options for the auth middleware factory.
|
|
27
|
+
*/
|
|
28
|
+
export interface AuthMiddlewareOptions {
|
|
29
|
+
/** The token store holding valid tokens. */
|
|
30
|
+
store: ConsoleTokenStore;
|
|
31
|
+
/** Whether auth is enforced. When false, middleware is a no-op. */
|
|
32
|
+
enabled: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* Path prefixes that are never protected. A request whose URL path starts
|
|
35
|
+
* with any of these strings will skip auth and be passed through to the
|
|
36
|
+
* next handler. Used to exempt health checks, version info, client detection,
|
|
37
|
+
* and similar public metadata endpoints.
|
|
38
|
+
*
|
|
39
|
+
* Paths are compared against `req.path` (the route-relative path), so include
|
|
40
|
+
* the full pathname starting with `/` — e.g. `/api/health`, `/api/setup/version`.
|
|
41
|
+
*/
|
|
42
|
+
publicPathPrefixes?: string[];
|
|
43
|
+
/** Optional label for log messages (e.g. "api" or "sse"). */
|
|
44
|
+
label?: string;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Create the core authentication middleware.
|
|
48
|
+
*
|
|
49
|
+
* The returned handler enforces Bearer token auth on every request it sees.
|
|
50
|
+
* Mount it with `app.use(createAuthMiddleware(...))` before protected routers,
|
|
51
|
+
* or attach it to individual routes that need protection.
|
|
52
|
+
*
|
|
53
|
+
* When `enabled: false`, the handler immediately calls `next()` — allowing
|
|
54
|
+
* the infrastructure to land with the default-off feature flag without
|
|
55
|
+
* breaking existing traffic.
|
|
56
|
+
*
|
|
57
|
+
* Phase 3 hardening (tracked in #1789): Add 401 rate limiting to prevent
|
|
58
|
+
* DoS from floods of bad-token requests. Brute-forcing a 256-bit token is
|
|
59
|
+
* infeasible, but an attacker flooding /api with wrong tokens could saturate
|
|
60
|
+
* the verify path. A sliding-window limiter keyed on the requesting IP is
|
|
61
|
+
* the right shape.
|
|
62
|
+
*/
|
|
63
|
+
export declare function createAuthMiddleware(options: AuthMiddlewareOptions): RequestHandler;
|
|
64
|
+
//# sourceMappingURL=authMiddleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../../src/web/middleware/authMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAmC,cAAc,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,4BAA4B,CAAC;AAsEvF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,KAAK,EAAE,iBAAiB,CAAC;IACzB,mEAAmE;IACnE,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,6DAA6D;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CAyCnF"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Express middleware for console Bearer token authentication (#1780).
|
|
3
|
+
*
|
|
4
|
+
* Checks the `Authorization: Bearer <token>` header on requests to protected
|
|
5
|
+
* endpoints, with a `?token=<token>` query parameter fallback for SSE streams
|
|
6
|
+
* (EventSource cannot set custom headers).
|
|
7
|
+
*
|
|
8
|
+
* Behavior is gated on the `DOLLHOUSE_WEB_AUTH_ENABLED` env var. When the flag
|
|
9
|
+
* is false (the default during Phase 1 rollout) the middleware is a no-op —
|
|
10
|
+
* requests pass through unconditionally. When true, every protected request
|
|
11
|
+
* must carry a valid token or receive a 401.
|
|
12
|
+
*
|
|
13
|
+
* Phase 1 design notes:
|
|
14
|
+
* - Every valid token is treated as admin-scoped. Scope enforcement is a
|
|
15
|
+
* stubbed hook (`authorizeScope`) that always returns true. Phase 2 swaps
|
|
16
|
+
* in real scope checks without touching any route handler.
|
|
17
|
+
* - Element boundaries and tenant filtering are similarly stubbed for Phase 3.
|
|
18
|
+
* - The middleware attaches the matched token entry to `res.locals.tokenEntry`
|
|
19
|
+
* so downstream handlers can inspect it (audit logs, scope decisions, etc.).
|
|
20
|
+
*
|
|
21
|
+
* @since v2.1.0 — Issue #1780
|
|
22
|
+
*/
|
|
23
|
+
import { UnicodeValidator } from '../../security/validators/unicodeValidator.js';
|
|
24
|
+
import { logger } from '../../utils/logger.js';
|
|
25
|
+
/** Query parameter name used as a fallback for SSE streams. */
|
|
26
|
+
const TOKEN_QUERY_PARAM = 'token';
|
|
27
|
+
/** Header name we look at for Bearer tokens. */
|
|
28
|
+
const AUTH_HEADER = 'authorization';
|
|
29
|
+
/** Prefix expected on the Authorization header value. */
|
|
30
|
+
const BEARER_PREFIX = 'Bearer ';
|
|
31
|
+
/**
|
|
32
|
+
* Strict format for console tokens — 64 lowercase hex characters (256 bits).
|
|
33
|
+
* Any presented token that does not match this pattern is rejected before it
|
|
34
|
+
* reaches the constant-time comparison. This blocks any non-ASCII Unicode
|
|
35
|
+
* payload (homographs, zero-width, bidi overrides, etc.) from ever touching
|
|
36
|
+
* the verify path. DMCP-SEC-004 mitigation.
|
|
37
|
+
*/
|
|
38
|
+
const TOKEN_FORMAT = /^[0-9a-f]{64}$/;
|
|
39
|
+
/**
|
|
40
|
+
* Sanitize a raw token string pulled from a request.
|
|
41
|
+
*
|
|
42
|
+
* - Normalizes to NFC via UnicodeValidator (DMCP-SEC-004)
|
|
43
|
+
* - Validates against the strict hex format
|
|
44
|
+
* - Returns the cleaned value, or null if anything looks wrong
|
|
45
|
+
*
|
|
46
|
+
* Any failure here results in a 401 at the call site. Legitimate tokens are
|
|
47
|
+
* 64-char lowercase hex, so normalization and format validation are effectively
|
|
48
|
+
* no-ops for valid input and hard rejections for anything malicious.
|
|
49
|
+
*/
|
|
50
|
+
function sanitizePresentedToken(raw) {
|
|
51
|
+
if (!raw)
|
|
52
|
+
return null;
|
|
53
|
+
const normalized = UnicodeValidator.normalize(raw).normalizedContent;
|
|
54
|
+
if (!TOKEN_FORMAT.test(normalized))
|
|
55
|
+
return null;
|
|
56
|
+
return normalized;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Extract a Bearer token from a request.
|
|
60
|
+
* Checks Authorization header first, then query parameter.
|
|
61
|
+
* Applies Unicode normalization and strict format validation before returning.
|
|
62
|
+
* Returns the sanitized token string, or null if none was found or the value
|
|
63
|
+
* failed validation.
|
|
64
|
+
*/
|
|
65
|
+
function extractToken(req) {
|
|
66
|
+
// Preferred: Authorization: Bearer <token>
|
|
67
|
+
const header = req.headers[AUTH_HEADER];
|
|
68
|
+
if (typeof header === 'string' && header.startsWith(BEARER_PREFIX)) {
|
|
69
|
+
const value = header.slice(BEARER_PREFIX.length).trim();
|
|
70
|
+
if (value) {
|
|
71
|
+
const sanitized = sanitizePresentedToken(value);
|
|
72
|
+
if (sanitized)
|
|
73
|
+
return sanitized;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
// Fallback for EventSource: ?token=<token>
|
|
77
|
+
const q = req.query[TOKEN_QUERY_PARAM];
|
|
78
|
+
if (typeof q === 'string' && q.length > 0) {
|
|
79
|
+
return sanitizePresentedToken(q);
|
|
80
|
+
}
|
|
81
|
+
if (Array.isArray(q) && q.length > 0 && typeof q[0] === 'string') {
|
|
82
|
+
return sanitizePresentedToken(q[0]);
|
|
83
|
+
}
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Create the core authentication middleware.
|
|
88
|
+
*
|
|
89
|
+
* The returned handler enforces Bearer token auth on every request it sees.
|
|
90
|
+
* Mount it with `app.use(createAuthMiddleware(...))` before protected routers,
|
|
91
|
+
* or attach it to individual routes that need protection.
|
|
92
|
+
*
|
|
93
|
+
* When `enabled: false`, the handler immediately calls `next()` — allowing
|
|
94
|
+
* the infrastructure to land with the default-off feature flag without
|
|
95
|
+
* breaking existing traffic.
|
|
96
|
+
*
|
|
97
|
+
* Phase 3 hardening (tracked in #1789): Add 401 rate limiting to prevent
|
|
98
|
+
* DoS from floods of bad-token requests. Brute-forcing a 256-bit token is
|
|
99
|
+
* infeasible, but an attacker flooding /api with wrong tokens could saturate
|
|
100
|
+
* the verify path. A sliding-window limiter keyed on the requesting IP is
|
|
101
|
+
* the right shape.
|
|
102
|
+
*/
|
|
103
|
+
export function createAuthMiddleware(options) {
|
|
104
|
+
const { store, enabled, label = 'console' } = options;
|
|
105
|
+
const publicPaths = options.publicPathPrefixes ?? [];
|
|
106
|
+
return (req, res, next) => {
|
|
107
|
+
if (!enabled) {
|
|
108
|
+
return next();
|
|
109
|
+
}
|
|
110
|
+
// Public path allowlist — skip auth for whitelisted prefixes.
|
|
111
|
+
// Use originalUrl.pathname so we match regardless of mount point.
|
|
112
|
+
const pathToCheck = req.originalUrl.split('?')[0];
|
|
113
|
+
for (const prefix of publicPaths) {
|
|
114
|
+
if (pathToCheck === prefix || pathToCheck.startsWith(prefix + '/')) {
|
|
115
|
+
return next();
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
const presented = extractToken(req);
|
|
119
|
+
if (!presented) {
|
|
120
|
+
return respondUnauthorized(res, 'missing_token', label, store, 0);
|
|
121
|
+
}
|
|
122
|
+
const entry = store.verify(presented);
|
|
123
|
+
if (!entry) {
|
|
124
|
+
// Log presented-length only — never the presented value itself.
|
|
125
|
+
// Distinguishes "token missing" from "token wrong length" from
|
|
126
|
+
// "length matches but content differs" when troubleshooting.
|
|
127
|
+
return respondUnauthorized(res, 'invalid_token', label, store, presented.length);
|
|
128
|
+
}
|
|
129
|
+
// Stubbed authorization hook — Phase 2 flips real scope checks on here.
|
|
130
|
+
if (!authorizeScope(entry, req)) {
|
|
131
|
+
return respondForbidden(res, 'scope_denied', label, entry);
|
|
132
|
+
}
|
|
133
|
+
// Stash the matched entry for downstream handlers and log success at debug.
|
|
134
|
+
res.locals.tokenEntry = entry;
|
|
135
|
+
logger.debug(`[Auth:${label}] verified token id=${entry.id} name="${entry.name}" route=${req.method} ${req.originalUrl.split('?')[0]}`);
|
|
136
|
+
return next();
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Scope authorization hook.
|
|
141
|
+
*
|
|
142
|
+
* Phase 1: every valid token is treated as admin — returns true unconditionally.
|
|
143
|
+
* Phase 2: this function will check `entry.scopes` against the route's required
|
|
144
|
+
* scopes (which can be attached via `res.locals.requiredScope` or a route
|
|
145
|
+
* metadata system).
|
|
146
|
+
*/
|
|
147
|
+
function authorizeScope(_entry, _req) {
|
|
148
|
+
return true;
|
|
149
|
+
}
|
|
150
|
+
/**
|
|
151
|
+
* Respond with 401 Unauthorized and a helpful hint about where to find the token.
|
|
152
|
+
* Includes presented-token length at debug level for troubleshooting — never the value.
|
|
153
|
+
*/
|
|
154
|
+
function respondUnauthorized(res, reason, label, store, presentedLength) {
|
|
155
|
+
logger.debug(`[Auth:${label}] 401 ${reason} presentedLength=${presentedLength}`);
|
|
156
|
+
res.status(401).json({
|
|
157
|
+
error: 'Authentication required',
|
|
158
|
+
reason,
|
|
159
|
+
hint: `Token file: ${store.getFilePath()}. Send 'Authorization: Bearer <token>' header, or append ?token=<token> for SSE streams.`,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* Respond with 403 Forbidden — token was valid but scope did not permit this route.
|
|
164
|
+
* Phase 1 never reaches here because `authorizeScope` always returns true, but
|
|
165
|
+
* the code path exists so Phase 2 can wire it up without changing the middleware shape.
|
|
166
|
+
*/
|
|
167
|
+
function respondForbidden(res, reason, label, entry) {
|
|
168
|
+
logger.debug(`[Auth:${label}] 403 ${reason}`, { tokenId: entry.id, scopes: entry.scopes });
|
|
169
|
+
res.status(403).json({
|
|
170
|
+
error: 'Token scope does not permit this action',
|
|
171
|
+
reason,
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../../src/web/middleware/authMiddleware.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Express middleware for console Bearer token authentication (#1780).\n *\n * Checks the `Authorization: Bearer <token>` header on requests to protected\n * endpoints, with a `?token=<token>` query parameter fallback for SSE streams\n * (EventSource cannot set custom headers).\n *\n * Behavior is gated on the `DOLLHOUSE_WEB_AUTH_ENABLED` env var. When the flag\n * is false (the default during Phase 1 rollout) the middleware is a no-op —\n * requests pass through unconditionally. When true, every protected request\n * must carry a valid token or receive a 401.\n *\n * Phase 1 design notes:\n * - Every valid token is treated as admin-scoped. Scope enforcement is a\n *   stubbed hook (`authorizeScope`) that always returns true. Phase 2 swaps\n *   in real scope checks without touching any route handler.\n * - Element boundaries and tenant filtering are similarly stubbed for Phase 3.\n * - The middleware attaches the matched token entry to `res.locals.tokenEntry`\n *   so downstream handlers can inspect it (audit logs, scope decisions, etc.).\n *\n * @since v2.1.0 — Issue #1780\n */\n\nimport type { Request, Response, NextFunction, RequestHandler } from 'express';\nimport type { ConsoleTokenStore, ConsoleTokenEntry } from '../console/consoleToken.js';\nimport { UnicodeValidator } from '../../security/validators/unicodeValidator.js';\nimport { logger } from '../../utils/logger.js';\n\n/** Query parameter name used as a fallback for SSE streams. */\nconst TOKEN_QUERY_PARAM = 'token';\n\n/** Header name we look at for Bearer tokens. */\nconst AUTH_HEADER = 'authorization';\n\n/** Prefix expected on the Authorization header value. */\nconst BEARER_PREFIX = 'Bearer ';\n\n/**\n * Strict format for console tokens — 64 lowercase hex characters (256 bits).\n * Any presented token that does not match this pattern is rejected before it\n * reaches the constant-time comparison. This blocks any non-ASCII Unicode\n * payload (homographs, zero-width, bidi overrides, etc.) from ever touching\n * the verify path. DMCP-SEC-004 mitigation.\n */\nconst TOKEN_FORMAT = /^[0-9a-f]{64}$/;\n\n/**\n * Sanitize a raw token string pulled from a request.\n *\n * - Normalizes to NFC via UnicodeValidator (DMCP-SEC-004)\n * - Validates against the strict hex format\n * - Returns the cleaned value, or null if anything looks wrong\n *\n * Any failure here results in a 401 at the call site. Legitimate tokens are\n * 64-char lowercase hex, so normalization and format validation are effectively\n * no-ops for valid input and hard rejections for anything malicious.\n */\nfunction sanitizePresentedToken(raw: string): string | null {\n  if (!raw) return null;\n  const normalized = UnicodeValidator.normalize(raw).normalizedContent;\n  if (!TOKEN_FORMAT.test(normalized)) return null;\n  return normalized;\n}\n\n/**\n * Extract a Bearer token from a request.\n * Checks Authorization header first, then query parameter.\n * Applies Unicode normalization and strict format validation before returning.\n * Returns the sanitized token string, or null if none was found or the value\n * failed validation.\n */\nfunction extractToken(req: Request): string | null {\n  // Preferred: Authorization: Bearer <token>\n  const header = req.headers[AUTH_HEADER];\n  if (typeof header === 'string' && header.startsWith(BEARER_PREFIX)) {\n    const value = header.slice(BEARER_PREFIX.length).trim();\n    if (value) {\n      const sanitized = sanitizePresentedToken(value);\n      if (sanitized) return sanitized;\n    }\n  }\n\n  // Fallback for EventSource: ?token=<token>\n  const q = req.query[TOKEN_QUERY_PARAM];\n  if (typeof q === 'string' && q.length > 0) {\n    return sanitizePresentedToken(q);\n  }\n  if (Array.isArray(q) && q.length > 0 && typeof q[0] === 'string') {\n    return sanitizePresentedToken(q[0]);\n  }\n\n  return null;\n}\n\n/**\n * Options for the auth middleware factory.\n */\nexport interface AuthMiddlewareOptions {\n  /** The token store holding valid tokens. */\n  store: ConsoleTokenStore;\n  /** Whether auth is enforced. When false, middleware is a no-op. */\n  enabled: boolean;\n  /**\n   * Path prefixes that are never protected. A request whose URL path starts\n   * with any of these strings will skip auth and be passed through to the\n   * next handler. Used to exempt health checks, version info, client detection,\n   * and similar public metadata endpoints.\n   *\n   * Paths are compared against `req.path` (the route-relative path), so include\n   * the full pathname starting with `/` — e.g. `/api/health`, `/api/setup/version`.\n   */\n  publicPathPrefixes?: string[];\n  /** Optional label for log messages (e.g. \"api\" or \"sse\"). */\n  label?: string;\n}\n\n/**\n * Create the core authentication middleware.\n *\n * The returned handler enforces Bearer token auth on every request it sees.\n * Mount it with `app.use(createAuthMiddleware(...))` before protected routers,\n * or attach it to individual routes that need protection.\n *\n * When `enabled: false`, the handler immediately calls `next()` — allowing\n * the infrastructure to land with the default-off feature flag without\n * breaking existing traffic.\n *\n * Phase 3 hardening (tracked in #1789): Add 401 rate limiting to prevent\n * DoS from floods of bad-token requests. Brute-forcing a 256-bit token is\n * infeasible, but an attacker flooding /api with wrong tokens could saturate\n * the verify path. A sliding-window limiter keyed on the requesting IP is\n * the right shape.\n */\nexport function createAuthMiddleware(options: AuthMiddlewareOptions): RequestHandler {\n  const { store, enabled, label = 'console' } = options;\n  const publicPaths = options.publicPathPrefixes ?? [];\n\n  return (req: Request, res: Response, next: NextFunction) => {\n    if (!enabled) {\n      return next();\n    }\n\n    // Public path allowlist — skip auth for whitelisted prefixes.\n    // Use originalUrl.pathname so we match regardless of mount point.\n    const pathToCheck = req.originalUrl.split('?')[0];\n    for (const prefix of publicPaths) {\n      if (pathToCheck === prefix || pathToCheck.startsWith(prefix + '/')) {\n        return next();\n      }\n    }\n\n    const presented = extractToken(req);\n    if (!presented) {\n      return respondUnauthorized(res, 'missing_token', label, store, 0);\n    }\n\n    const entry = store.verify(presented);\n    if (!entry) {\n      // Log presented-length only — never the presented value itself.\n      // Distinguishes \"token missing\" from \"token wrong length\" from\n      // \"length matches but content differs\" when troubleshooting.\n      return respondUnauthorized(res, 'invalid_token', label, store, presented.length);\n    }\n\n    // Stubbed authorization hook — Phase 2 flips real scope checks on here.\n    if (!authorizeScope(entry, req)) {\n      return respondForbidden(res, 'scope_denied', label, entry);\n    }\n\n    // Stash the matched entry for downstream handlers and log success at debug.\n    res.locals.tokenEntry = entry;\n    logger.debug(`[Auth:${label}] verified token id=${entry.id} name=\"${entry.name}\" route=${req.method} ${req.originalUrl.split('?')[0]}`);\n    return next();\n  };\n}\n\n/**\n * Scope authorization hook.\n *\n * Phase 1: every valid token is treated as admin — returns true unconditionally.\n * Phase 2: this function will check `entry.scopes` against the route's required\n * scopes (which can be attached via `res.locals.requiredScope` or a route\n * metadata system).\n */\nfunction authorizeScope(_entry: ConsoleTokenEntry, _req: Request): boolean {\n  return true;\n}\n\n/**\n * Respond with 401 Unauthorized and a helpful hint about where to find the token.\n * Includes presented-token length at debug level for troubleshooting — never the value.\n */\nfunction respondUnauthorized(\n  res: Response,\n  reason: 'missing_token' | 'invalid_token',\n  label: string,\n  store: ConsoleTokenStore,\n  presentedLength: number,\n): void {\n  logger.debug(`[Auth:${label}] 401 ${reason} presentedLength=${presentedLength}`);\n  res.status(401).json({\n    error: 'Authentication required',\n    reason,\n    hint: `Token file: ${store.getFilePath()}. Send 'Authorization: Bearer <token>' header, or append ?token=<token> for SSE streams.`,\n  });\n}\n\n/**\n * Respond with 403 Forbidden — token was valid but scope did not permit this route.\n * Phase 1 never reaches here because `authorizeScope` always returns true, but\n * the code path exists so Phase 2 can wire it up without changing the middleware shape.\n */\nfunction respondForbidden(\n  res: Response,\n  reason: string,\n  label: string,\n  entry: ConsoleTokenEntry,\n): void {\n  logger.debug(`[Auth:${label}] 403 ${reason}`, { tokenId: entry.id, scopes: entry.scopes });\n  res.status(403).json({\n    error: 'Token scope does not permit this action',\n    reason,\n  });\n}\n"]}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared helpers for console auth route handlers (TOTP + token management).
|
|
3
|
+
*
|
|
4
|
+
* Extracted to eliminate duplication between totpRoutes.ts and tokenRoutes.ts.
|
|
5
|
+
* Both routers need the same error-mapping, structured-error-response, and
|
|
6
|
+
* body-field-extraction logic.
|
|
7
|
+
*
|
|
8
|
+
* @since v2.1.0 — Issue #1795
|
|
9
|
+
*/
|
|
10
|
+
import type { Response } from 'express';
|
|
11
|
+
import type { TotpErrorCode } from '../console/consoleToken.js';
|
|
12
|
+
/**
|
|
13
|
+
* Maps a store error code to the appropriate HTTP status.
|
|
14
|
+
* Centralized so all console auth endpoints return consistent status codes
|
|
15
|
+
* for the same failure class. The `satisfies never` exhaustiveness check
|
|
16
|
+
* ensures new TotpErrorCode values get mapped at compile time.
|
|
17
|
+
*/
|
|
18
|
+
export declare function httpStatusForStoreError(code: TotpErrorCode): number;
|
|
19
|
+
/**
|
|
20
|
+
* Send a structured error response with both a human-readable message and
|
|
21
|
+
* a machine-readable code. Shape is stable so the CLI and Security tab UI
|
|
22
|
+
* can branch on `code` instead of string-matching the message.
|
|
23
|
+
*/
|
|
24
|
+
export declare function sendStoreError(res: Response, status: number, code: string, message: string): void;
|
|
25
|
+
/**
|
|
26
|
+
* Safely extract a string field from an unknown request body and NFC-normalize
|
|
27
|
+
* it (DMCP-SEC-004). Returns null if the body is not an object or the field
|
|
28
|
+
* is missing / not a string. Normalization blocks homograph, bidi, and
|
|
29
|
+
* zero-width abuse before the value reaches downstream parsers (TOTP codes,
|
|
30
|
+
* otpauth URI labels, pending-id lookups).
|
|
31
|
+
*/
|
|
32
|
+
export declare function getNormalizedStringField(body: unknown, field: string): string | null;
|
|
33
|
+
//# sourceMappingURL=consoleRouteHelpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consoleRouteHelpers.d.ts","sourceRoot":"","sources":["../../../src/web/routes/consoleRouteHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAmBnE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKpF"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared helpers for console auth route handlers (TOTP + token management).
|
|
3
|
+
*
|
|
4
|
+
* Extracted to eliminate duplication between totpRoutes.ts and tokenRoutes.ts.
|
|
5
|
+
* Both routers need the same error-mapping, structured-error-response, and
|
|
6
|
+
* body-field-extraction logic.
|
|
7
|
+
*
|
|
8
|
+
* @since v2.1.0 — Issue #1795
|
|
9
|
+
*/
|
|
10
|
+
import { UnicodeValidator } from '../../security/validators/unicodeValidator.js';
|
|
11
|
+
/**
|
|
12
|
+
* Maps a store error code to the appropriate HTTP status.
|
|
13
|
+
* Centralized so all console auth endpoints return consistent status codes
|
|
14
|
+
* for the same failure class. The `satisfies never` exhaustiveness check
|
|
15
|
+
* ensures new TotpErrorCode values get mapped at compile time.
|
|
16
|
+
*/
|
|
17
|
+
export function httpStatusForStoreError(code) {
|
|
18
|
+
switch (code) {
|
|
19
|
+
case 'ALREADY_ENROLLED':
|
|
20
|
+
return 409;
|
|
21
|
+
case 'NOT_ENROLLED':
|
|
22
|
+
case 'PENDING_NOT_FOUND':
|
|
23
|
+
case 'INVALID_TOTP_CODE':
|
|
24
|
+
return 400;
|
|
25
|
+
case 'TOO_MANY_PENDING':
|
|
26
|
+
return 429;
|
|
27
|
+
case 'TOTP_REQUIRED':
|
|
28
|
+
return 403;
|
|
29
|
+
case 'STORE_NOT_INITIALIZED':
|
|
30
|
+
return 503;
|
|
31
|
+
default: {
|
|
32
|
+
code;
|
|
33
|
+
return 400;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Send a structured error response with both a human-readable message and
|
|
39
|
+
* a machine-readable code. Shape is stable so the CLI and Security tab UI
|
|
40
|
+
* can branch on `code` instead of string-matching the message.
|
|
41
|
+
*/
|
|
42
|
+
export function sendStoreError(res, status, code, message) {
|
|
43
|
+
res.status(status).json({ error: message, code });
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Safely extract a string field from an unknown request body and NFC-normalize
|
|
47
|
+
* it (DMCP-SEC-004). Returns null if the body is not an object or the field
|
|
48
|
+
* is missing / not a string. Normalization blocks homograph, bidi, and
|
|
49
|
+
* zero-width abuse before the value reaches downstream parsers (TOTP codes,
|
|
50
|
+
* otpauth URI labels, pending-id lookups).
|
|
51
|
+
*/
|
|
52
|
+
export function getNormalizedStringField(body, field) {
|
|
53
|
+
if (!body || typeof body !== 'object')
|
|
54
|
+
return null;
|
|
55
|
+
const val = body[field];
|
|
56
|
+
if (typeof val !== 'string')
|
|
57
|
+
return null;
|
|
58
|
+
return UnicodeValidator.normalize(val).normalizedContent;
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc29sZVJvdXRlSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy93ZWIvcm91dGVzL2NvbnNvbGVSb3V0ZUhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7O0dBUUc7QUFJSCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUVqRjs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FBQyxJQUFtQjtJQUN6RCxRQUFRLElBQUksRUFBRSxDQUFDO1FBQ2IsS0FBSyxrQkFBa0I7WUFDckIsT0FBTyxHQUFHLENBQUM7UUFDYixLQUFLLGNBQWMsQ0FBQztRQUNwQixLQUFLLG1CQUFtQixDQUFDO1FBQ3pCLEtBQUssbUJBQW1CO1lBQ3RCLE9BQU8sR0FBRyxDQUFDO1FBQ2IsS0FBSyxrQkFBa0I7WUFDckIsT0FBTyxHQUFHLENBQUM7UUFDYixLQUFLLGVBQWU7WUFDbEIsT0FBTyxHQUFHLENBQUM7UUFDYixLQUFLLHVCQUF1QjtZQUMxQixPQUFPLEdBQUcsQ0FBQztRQUNiLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDUixJQUFvQixDQUFDO1lBQ3JCLE9BQU8sR0FBRyxDQUFDO1FBQ2IsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxjQUFjLENBQzVCLEdBQWEsRUFDYixNQUFjLEVBQ2QsSUFBWSxFQUNaLE9BQWU7SUFFZixHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztBQUNwRCxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLHdCQUF3QixDQUFDLElBQWEsRUFBRSxLQUFhO0lBQ25FLElBQUksQ0FBQyxJQUFJLElBQUksT0FBTyxJQUFJLEtBQUssUUFBUTtRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ25ELE1BQU0sR0FBRyxHQUFJLElBQWdDLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDckQsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDekMsT0FBTyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsaUJBQWlCLENBQUM7QUFDM0QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogU2hhcmVkIGhlbHBlcnMgZm9yIGNvbnNvbGUgYXV0aCByb3V0ZSBoYW5kbGVycyAoVE9UUCArIHRva2VuIG1hbmFnZW1lbnQpLlxuICpcbiAqIEV4dHJhY3RlZCB0byBlbGltaW5hdGUgZHVwbGljYXRpb24gYmV0d2VlbiB0b3RwUm91dGVzLnRzIGFuZCB0b2tlblJvdXRlcy50cy5cbiAqIEJvdGggcm91dGVycyBuZWVkIHRoZSBzYW1lIGVycm9yLW1hcHBpbmcsIHN0cnVjdHVyZWQtZXJyb3ItcmVzcG9uc2UsIGFuZFxuICogYm9keS1maWVsZC1leHRyYWN0aW9uIGxvZ2ljLlxuICpcbiAqIEBzaW5jZSB2Mi4xLjAg4oCUIElzc3VlICMxNzk1XG4gKi9cblxuaW1wb3J0IHR5cGUgeyBSZXNwb25zZSB9IGZyb20gJ2V4cHJlc3MnO1xuaW1wb3J0IHR5cGUgeyBUb3RwRXJyb3JDb2RlIH0gZnJvbSAnLi4vY29uc29sZS9jb25zb2xlVG9rZW4uanMnO1xuaW1wb3J0IHsgVW5pY29kZVZhbGlkYXRvciB9IGZyb20gJy4uLy4uL3NlY3VyaXR5L3ZhbGlkYXRvcnMvdW5pY29kZVZhbGlkYXRvci5qcyc7XG5cbi8qKlxuICogTWFwcyBhIHN0b3JlIGVycm9yIGNvZGUgdG8gdGhlIGFwcHJvcHJpYXRlIEhUVFAgc3RhdHVzLlxuICogQ2VudHJhbGl6ZWQgc28gYWxsIGNvbnNvbGUgYXV0aCBlbmRwb2ludHMgcmV0dXJuIGNvbnNpc3RlbnQgc3RhdHVzIGNvZGVzXG4gKiBmb3IgdGhlIHNhbWUgZmFpbHVyZSBjbGFzcy4gVGhlIGBzYXRpc2ZpZXMgbmV2ZXJgIGV4aGF1c3RpdmVuZXNzIGNoZWNrXG4gKiBlbnN1cmVzIG5ldyBUb3RwRXJyb3JDb2RlIHZhbHVlcyBnZXQgbWFwcGVkIGF0IGNvbXBpbGUgdGltZS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGh0dHBTdGF0dXNGb3JTdG9yZUVycm9yKGNvZGU6IFRvdHBFcnJvckNvZGUpOiBudW1iZXIge1xuICBzd2l0Y2ggKGNvZGUpIHtcbiAgICBjYXNlICdBTFJFQURZX0VOUk9MTEVEJzpcbiAgICAgIHJldHVybiA0MDk7XG4gICAgY2FzZSAnTk9UX0VOUk9MTEVEJzpcbiAgICBjYXNlICdQRU5ESU5HX05PVF9GT1VORCc6XG4gICAgY2FzZSAnSU5WQUxJRF9UT1RQX0NPREUnOlxuICAgICAgcmV0dXJuIDQwMDtcbiAgICBjYXNlICdUT09fTUFOWV9QRU5ESU5HJzpcbiAgICAgIHJldHVybiA0Mjk7XG4gICAgY2FzZSAnVE9UUF9SRVFVSVJFRCc6XG4gICAgICByZXR1cm4gNDAzO1xuICAgIGNhc2UgJ1NUT1JFX05PVF9JTklUSUFMSVpFRCc6XG4gICAgICByZXR1cm4gNTAzO1xuICAgIGRlZmF1bHQ6IHtcbiAgICAgIGNvZGUgc2F0aXNmaWVzIG5ldmVyO1xuICAgICAgcmV0dXJuIDQwMDtcbiAgICB9XG4gIH1cbn1cblxuLyoqXG4gKiBTZW5kIGEgc3RydWN0dXJlZCBlcnJvciByZXNwb25zZSB3aXRoIGJvdGggYSBodW1hbi1yZWFkYWJsZSBtZXNzYWdlIGFuZFxuICogYSBtYWNoaW5lLXJlYWRhYmxlIGNvZGUuIFNoYXBlIGlzIHN0YWJsZSBzbyB0aGUgQ0xJIGFuZCBTZWN1cml0eSB0YWIgVUlcbiAqIGNhbiBicmFuY2ggb24gYGNvZGVgIGluc3RlYWQgb2Ygc3RyaW5nLW1hdGNoaW5nIHRoZSBtZXNzYWdlLlxuICovXG5leHBvcnQgZnVuY3Rpb24gc2VuZFN0b3JlRXJyb3IoXG4gIHJlczogUmVzcG9uc2UsXG4gIHN0YXR1czogbnVtYmVyLFxuICBjb2RlOiBzdHJpbmcsXG4gIG1lc3NhZ2U6IHN0cmluZyxcbik6IHZvaWQge1xuICByZXMuc3RhdHVzKHN0YXR1cykuanNvbih7IGVycm9yOiBtZXNzYWdlLCBjb2RlIH0pO1xufVxuXG4vKipcbiAqIFNhZmVseSBleHRyYWN0IGEgc3RyaW5nIGZpZWxkIGZyb20gYW4gdW5rbm93biByZXF1ZXN0IGJvZHkgYW5kIE5GQy1ub3JtYWxpemVcbiAqIGl0IChETUNQLVNFQy0wMDQpLiBSZXR1cm5zIG51bGwgaWYgdGhlIGJvZHkgaXMgbm90IGFuIG9iamVjdCBvciB0aGUgZmllbGRcbiAqIGlzIG1pc3NpbmcgLyBub3QgYSBzdHJpbmcuIE5vcm1hbGl6YXRpb24gYmxvY2tzIGhvbW9ncmFwaCwgYmlkaSwgYW5kXG4gKiB6ZXJvLXdpZHRoIGFidXNlIGJlZm9yZSB0aGUgdmFsdWUgcmVhY2hlcyBkb3duc3RyZWFtIHBhcnNlcnMgKFRPVFAgY29kZXMsXG4gKiBvdHBhdXRoIFVSSSBsYWJlbHMsIHBlbmRpbmctaWQgbG9va3VwcykuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBnZXROb3JtYWxpemVkU3RyaW5nRmllbGQoYm9keTogdW5rbm93biwgZmllbGQ6IHN0cmluZyk6IHN0cmluZyB8IG51bGwge1xuICBpZiAoIWJvZHkgfHwgdHlwZW9mIGJvZHkgIT09ICdvYmplY3QnKSByZXR1cm4gbnVsbDtcbiAgY29uc3QgdmFsID0gKGJvZHkgYXMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4pW2ZpZWxkXTtcbiAgaWYgKHR5cGVvZiB2YWwgIT09ICdzdHJpbmcnKSByZXR1cm4gbnVsbDtcbiAgcmV0dXJuIFVuaWNvZGVWYWxpZGF0b3Iubm9ybWFsaXplKHZhbCkubm9ybWFsaXplZENvbnRlbnQ7XG59XG4iXX0=
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Console token management HTTP routes — #1795.
|
|
3
|
+
*
|
|
4
|
+
* Provides:
|
|
5
|
+
* - POST /api/console/token/rotate — rotate the primary token with TOTP confirmation
|
|
6
|
+
*
|
|
7
|
+
* Security model:
|
|
8
|
+
* - All endpoints require a valid existing console token. Enforcement
|
|
9
|
+
* happens via an always-on `createAuthMiddleware` instance mounted at the
|
|
10
|
+
* top of this router, independent of `DOLLHOUSE_WEB_AUTH_ENABLED`.
|
|
11
|
+
* - Rotation additionally requires TOTP confirmation (Pattern B). Pattern A
|
|
12
|
+
* (OS dialog fallback) is deferred to a follow-up issue.
|
|
13
|
+
* - A sliding-window rate limit throttles rotation attempts so a bad actor
|
|
14
|
+
* with a live session can't brute-force TOTP codes by flooding rotations.
|
|
15
|
+
*
|
|
16
|
+
* @since v2.1.0 — Issue #1795
|
|
17
|
+
*/
|
|
18
|
+
import { Router } from 'express';
|
|
19
|
+
import { type ConsoleTokenStore } from '../console/consoleToken.js';
|
|
20
|
+
/**
|
|
21
|
+
* Options for the token routes factory.
|
|
22
|
+
*/
|
|
23
|
+
export interface TokenRoutesOptions {
|
|
24
|
+
store: ConsoleTokenStore;
|
|
25
|
+
/** Maximum rotation attempts per window. Default: 10. */
|
|
26
|
+
rateLimitMax?: number;
|
|
27
|
+
/** Rate limit window in milliseconds. Default: 60_000 (1 minute). */
|
|
28
|
+
rateLimitWindowMs?: number;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Build the Express router exposing token management endpoints. The returned
|
|
32
|
+
* router should be mounted at `/api/console/token`; the caller does not need
|
|
33
|
+
* to add additional auth middleware — this router enforces its own auth
|
|
34
|
+
* regardless of the global feature flag.
|
|
35
|
+
*/
|
|
36
|
+
export declare function createTokenRoutes(options: TokenRoutesOptions): Router;
|
|
37
|
+
//# sourceMappingURL=tokenRoutes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenRoutes.d.ts","sourceRoot":"","sources":["../../../src/web/routes/tokenRoutes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAa,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAiB/E;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,iBAAiB,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAyDrE"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Console token management HTTP routes — #1795.
|
|
3
|
+
*
|
|
4
|
+
* Provides:
|
|
5
|
+
* - POST /api/console/token/rotate — rotate the primary token with TOTP confirmation
|
|
6
|
+
*
|
|
7
|
+
* Security model:
|
|
8
|
+
* - All endpoints require a valid existing console token. Enforcement
|
|
9
|
+
* happens via an always-on `createAuthMiddleware` instance mounted at the
|
|
10
|
+
* top of this router, independent of `DOLLHOUSE_WEB_AUTH_ENABLED`.
|
|
11
|
+
* - Rotation additionally requires TOTP confirmation (Pattern B). Pattern A
|
|
12
|
+
* (OS dialog fallback) is deferred to a follow-up issue.
|
|
13
|
+
* - A sliding-window rate limit throttles rotation attempts so a bad actor
|
|
14
|
+
* with a live session can't brute-force TOTP codes by flooding rotations.
|
|
15
|
+
*
|
|
16
|
+
* @since v2.1.0 — Issue #1795
|
|
17
|
+
*/
|
|
18
|
+
import express, { Router } from 'express';
|
|
19
|
+
import { TotpError } from '../console/consoleToken.js';
|
|
20
|
+
import { createAuthMiddleware } from '../middleware/authMiddleware.js';
|
|
21
|
+
import { SlidingWindowRateLimiter } from '../../utils/SlidingWindowRateLimiter.js';
|
|
22
|
+
import { httpStatusForStoreError, sendStoreError, getNormalizedStringField } from './consoleRouteHelpers.js';
|
|
23
|
+
import { logger } from '../../utils/logger.js';
|
|
24
|
+
/** JSON body size limit — rotation requests are tiny. */
|
|
25
|
+
const BODY_LIMIT = '1kb';
|
|
26
|
+
/**
|
|
27
|
+
* Rate limit for the rotation endpoint: 10 attempts per minute.
|
|
28
|
+
* Same rationale as the TOTP enrollment confirm limiter — brute-force
|
|
29
|
+
* success probability stays well below 5e-5/min.
|
|
30
|
+
*/
|
|
31
|
+
const DEFAULT_RATE_LIMIT_MAX = 10;
|
|
32
|
+
const DEFAULT_RATE_LIMIT_WINDOW_MS = 60_000;
|
|
33
|
+
/**
|
|
34
|
+
* Build the Express router exposing token management endpoints. The returned
|
|
35
|
+
* router should be mounted at `/api/console/token`; the caller does not need
|
|
36
|
+
* to add additional auth middleware — this router enforces its own auth
|
|
37
|
+
* regardless of the global feature flag.
|
|
38
|
+
*/
|
|
39
|
+
export function createTokenRoutes(options) {
|
|
40
|
+
const { store } = options;
|
|
41
|
+
const router = Router();
|
|
42
|
+
const jsonParser = express.json({ limit: BODY_LIMIT, type: 'application/json' });
|
|
43
|
+
const rateLimitMax = options.rateLimitMax ?? DEFAULT_RATE_LIMIT_MAX;
|
|
44
|
+
const rateLimitWindowMs = options.rateLimitWindowMs ?? DEFAULT_RATE_LIMIT_WINDOW_MS;
|
|
45
|
+
const rotateLimiter = new SlidingWindowRateLimiter(rateLimitMax, rateLimitWindowMs);
|
|
46
|
+
// Always-on auth — same pattern as the TOTP router.
|
|
47
|
+
const auth = createAuthMiddleware({
|
|
48
|
+
store,
|
|
49
|
+
enabled: true,
|
|
50
|
+
label: 'token',
|
|
51
|
+
});
|
|
52
|
+
router.use(auth);
|
|
53
|
+
/** GET /info — token metadata + TOTP status for the Security tab UI (#1791). */
|
|
54
|
+
router.get('/info', (_req, res) => {
|
|
55
|
+
const masked = store.listMasked();
|
|
56
|
+
const totpStatus = store.getTotpStatus();
|
|
57
|
+
res.json({
|
|
58
|
+
tokens: masked,
|
|
59
|
+
totp: totpStatus,
|
|
60
|
+
filePath: store.getFilePath(),
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
/** POST /rotate — rotate the primary console token with TOTP confirmation. */
|
|
64
|
+
router.post('/rotate', jsonParser, async (req, res) => {
|
|
65
|
+
if (!rotateLimiter.tryAcquire()) {
|
|
66
|
+
sendStoreError(res, 429, 'RATE_LIMITED', 'Too many rotation attempts — slow down');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
const confirmationCode = getNormalizedStringField(req.body, 'confirmationCode');
|
|
70
|
+
if (!confirmationCode) {
|
|
71
|
+
sendStoreError(res, 400, 'MISSING_FIELDS', 'confirmationCode is required');
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
try {
|
|
75
|
+
const result = await store.rotatePrimary(confirmationCode);
|
|
76
|
+
res.json({
|
|
77
|
+
token: result.token,
|
|
78
|
+
rotatedAt: result.rotatedAt,
|
|
79
|
+
graceUntil: result.graceUntil,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
const message = err instanceof Error ? err.message : 'Rotation failed';
|
|
84
|
+
logger.debug(`[Token] rotate failed: ${message}`);
|
|
85
|
+
if (err instanceof TotpError) {
|
|
86
|
+
sendStoreError(res, httpStatusForStoreError(err.code), err.code, err.message);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
sendStoreError(res, 500, 'INTERNAL', message);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
return router;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tokenRoutes.js","sourceRoot":"","sources":["../../../src/web/routes/tokenRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Console token management HTTP routes — #1795.\n *\n * Provides:\n * - POST /api/console/token/rotate — rotate the primary token with TOTP confirmation\n *\n * Security model:\n * - All endpoints require a valid existing console token. Enforcement\n *   happens via an always-on `createAuthMiddleware` instance mounted at the\n *   top of this router, independent of `DOLLHOUSE_WEB_AUTH_ENABLED`.\n * - Rotation additionally requires TOTP confirmation (Pattern B). Pattern A\n *   (OS dialog fallback) is deferred to a follow-up issue.\n * - A sliding-window rate limit throttles rotation attempts so a bad actor\n *   with a live session can't brute-force TOTP codes by flooding rotations.\n *\n * @since v2.1.0 — Issue #1795\n */\n\nimport express, { Router } from 'express';\nimport type { Request, Response } from 'express';\nimport { TotpError, type ConsoleTokenStore } from '../console/consoleToken.js';\nimport { createAuthMiddleware } from '../middleware/authMiddleware.js';\nimport { SlidingWindowRateLimiter } from '../../utils/SlidingWindowRateLimiter.js';\nimport { httpStatusForStoreError, sendStoreError, getNormalizedStringField } from './consoleRouteHelpers.js';\nimport { logger } from '../../utils/logger.js';\n\n/** JSON body size limit — rotation requests are tiny. */\nconst BODY_LIMIT = '1kb';\n\n/**\n * Rate limit for the rotation endpoint: 10 attempts per minute.\n * Same rationale as the TOTP enrollment confirm limiter — brute-force\n * success probability stays well below 5e-5/min.\n */\nconst DEFAULT_RATE_LIMIT_MAX = 10;\nconst DEFAULT_RATE_LIMIT_WINDOW_MS = 60_000;\n\n/**\n * Options for the token routes factory.\n */\nexport interface TokenRoutesOptions {\n  store: ConsoleTokenStore;\n  /** Maximum rotation attempts per window. Default: 10. */\n  rateLimitMax?: number;\n  /** Rate limit window in milliseconds. Default: 60_000 (1 minute). */\n  rateLimitWindowMs?: number;\n}\n\n/**\n * Build the Express router exposing token management endpoints. The returned\n * router should be mounted at `/api/console/token`; the caller does not need\n * to add additional auth middleware — this router enforces its own auth\n * regardless of the global feature flag.\n */\nexport function createTokenRoutes(options: TokenRoutesOptions): Router {\n  const { store } = options;\n  const router = Router();\n  const jsonParser = express.json({ limit: BODY_LIMIT, type: 'application/json' });\n  const rateLimitMax = options.rateLimitMax ?? DEFAULT_RATE_LIMIT_MAX;\n  const rateLimitWindowMs = options.rateLimitWindowMs ?? DEFAULT_RATE_LIMIT_WINDOW_MS;\n  const rotateLimiter = new SlidingWindowRateLimiter(rateLimitMax, rateLimitWindowMs);\n\n  // Always-on auth — same pattern as the TOTP router.\n  const auth = createAuthMiddleware({\n    store,\n    enabled: true,\n    label: 'token',\n  });\n  router.use(auth);\n\n  /** GET /info — token metadata + TOTP status for the Security tab UI (#1791). */\n  router.get('/info', (_req: Request, res: Response) => {\n    const masked = store.listMasked();\n    const totpStatus = store.getTotpStatus();\n    res.json({\n      tokens: masked,\n      totp: totpStatus,\n      filePath: store.getFilePath(),\n    });\n  });\n\n  /** POST /rotate — rotate the primary console token with TOTP confirmation. */\n  router.post('/rotate', jsonParser, async (req: Request, res: Response) => {\n    if (!rotateLimiter.tryAcquire()) {\n      sendStoreError(res, 429, 'RATE_LIMITED', 'Too many rotation attempts — slow down');\n      return;\n    }\n    const confirmationCode = getNormalizedStringField(req.body, 'confirmationCode');\n    if (!confirmationCode) {\n      sendStoreError(res, 400, 'MISSING_FIELDS', 'confirmationCode is required');\n      return;\n    }\n    try {\n      const result = await store.rotatePrimary(confirmationCode);\n      res.json({\n        token: result.token,\n        rotatedAt: result.rotatedAt,\n        graceUntil: result.graceUntil,\n      });\n    } catch (err) {\n      const message = err instanceof Error ? err.message : 'Rotation failed';\n      logger.debug(`[Token] rotate failed: ${message}`);\n      if (err instanceof TotpError) {\n        sendStoreError(res, httpStatusForStoreError(err.code), err.code, err.message);\n      } else {\n        sendStoreError(res, 500, 'INTERNAL', message);\n      }\n    }\n  });\n\n  return router;\n}\n"]}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* TOTP (authenticator) enrollment HTTP routes — Phase 2 of #1780 (#1794).
|
|
3
|
+
*
|
|
4
|
+
* Provides:
|
|
5
|
+
* - GET /api/console/totp/status — enrollment state (no secrets)
|
|
6
|
+
* - POST /api/console/totp/enroll/begin — generate secret, return QR + otpauth URI
|
|
7
|
+
* - POST /api/console/totp/enroll/confirm — verify code, persist, return backup codes (once)
|
|
8
|
+
* - POST /api/console/totp/disable — verify code, clear enrollment
|
|
9
|
+
*
|
|
10
|
+
* Security model:
|
|
11
|
+
* - All endpoints require a valid existing console token. The caller must
|
|
12
|
+
* prove they already hold the token before they can enroll a second
|
|
13
|
+
* factor — otherwise an attacker with local port access could pre-enroll
|
|
14
|
+
* their own authenticator and lock the legitimate user out.
|
|
15
|
+
* - Enforcement happens via an always-on `createAuthMiddleware` instance
|
|
16
|
+
* mounted at the top of this router, independent of the global
|
|
17
|
+
* DOLLHOUSE_WEB_AUTH_ENABLED flag.
|
|
18
|
+
* - Backup codes are returned in plaintext exactly once (confirm response)
|
|
19
|
+
* and only their sha256 hashes are retained by the store.
|
|
20
|
+
* - A sliding-window rate limit throttles confirm/disable attempts on a
|
|
21
|
+
* per-IP basis so a bad actor with a live session can't brute-force a
|
|
22
|
+
* TOTP window by flooding requests.
|
|
23
|
+
*
|
|
24
|
+
* @since v2.1.0 — Issue #1794
|
|
25
|
+
*/
|
|
26
|
+
import { Router } from 'express';
|
|
27
|
+
import { type ConsoleTokenStore } from '../console/consoleToken.js';
|
|
28
|
+
/**
|
|
29
|
+
* Options for the TOTP routes factory.
|
|
30
|
+
*/
|
|
31
|
+
export interface TotpRoutesOptions {
|
|
32
|
+
store: ConsoleTokenStore;
|
|
33
|
+
/** Maximum code-verification attempts per window. Default: 10. */
|
|
34
|
+
rateLimitMax?: number;
|
|
35
|
+
/** Rate limit window in milliseconds. Default: 60_000 (1 minute). */
|
|
36
|
+
rateLimitWindowMs?: number;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Build the Express router exposing TOTP endpoints. The returned router
|
|
40
|
+
* should be mounted at `/api/console/totp`; the caller does not need to
|
|
41
|
+
* add additional auth middleware — this router enforces its own auth
|
|
42
|
+
* regardless of the global feature flag.
|
|
43
|
+
*/
|
|
44
|
+
export declare function createTotpRoutes(options: TotpRoutesOptions): Router;
|
|
45
|
+
//# sourceMappingURL=totpRoutes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"totpRoutes.d.ts","sourceRoot":"","sources":["../../../src/web/routes/totpRoutes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAG1C,OAAO,EAAa,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AA4C/E;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,iBAAiB,CAAC;IACzB,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAgHnE"}
|