Fresh users copy-pasting healthcheck blocks from k8s/Docker docs need
the standard short aliases. Without /healthz and /readyz they get
connection refused. This commit:
1. Adds /healthz + /readyz as root-level aliases for /health/live +
/health/ready in src/app.js. Handler bodies DRYed into named
functions (livenessHandler, readinessHandler) so a probe semantics
change updates all five paths at once.
2. Removes the dead /api/v1/health*, /api/v1/health/live, /api/v1/health/ready
registrations from PUBLIC_ROUTES and CSRF exclusion list — those
routes were never actually mounted on the apiRouter (only root
paths existed). Anyone probing /api/v1/health now gets a clean 404
instead of being routed through to a duplicate root handler.
3. Adds bypass for the 5 probe paths in three places where it matters:
- PUBLIC_ROUTES (no auth)
- csrf-protection.js excludedPaths (no CSRF check)
- middleware.js request-logging exclusion (k8s polling every 10s
doesn't flood the audit log)
- middleware.js Tailscale auth bypass (probes don't carry Tailscale
identity headers)
4. Adds __tests__/health-probe-aliases.test.js (19 tests):
- Alias equivalence (/healthz == /health/live, /readyz == /health/ready)
- Back-compat (/health == /health/live)
- Path consolidation (all 3 /api/v1/health* return 404)
- Source-of-truth PUBLIC_ROUTES allowlist sync check
- Source-of-truth src/app.js mount list sync check (catches drift
between handler mount and middleware allowlist)
5. Documents probes in README (copy-paste docker-compose.yml +
Kubernetes blocks) and user-guide (Health Probes section + System
API table updated).
Post-fix: 941/941 tests pass (+19 new). Zero new ESLint warnings
introduced. The pre-existing warnings/errors in src/app.js line 906
('os' is not defined) and the empty blocks in logging.test.js are
not regressions from this commit.
233 lines
7.8 KiB
JavaScript
233 lines
7.8 KiB
JavaScript
/**
|
|
* CSRF Protection Module
|
|
* Implements HMAC-signed double-submit cookie pattern for stateless CSRF protection.
|
|
* The cookie contains a random nonce; the header must carry the HMAC signature
|
|
* of that nonce computed with a server-side secret. An attacker who can inject
|
|
* a cookie still cannot forge the matching header without the secret.
|
|
*/
|
|
|
|
const crypto = require('crypto');
|
|
const cryptoUtils = require('./crypto-utils');
|
|
const { errorResponse } = require('../utils/responses');
|
|
|
|
const CSRF_TOKEN_LENGTH = 32;
|
|
const CSRF_COOKIE_NAME = 'dashcaddy_csrf';
|
|
const CSRF_HEADER_NAME = 'x-csrf-token';
|
|
|
|
/**
|
|
* Generate a cryptographically secure CSRF nonce
|
|
* @returns {string} Base64URL-encoded random nonce
|
|
*/
|
|
function generateToken() {
|
|
return crypto.randomBytes(CSRF_TOKEN_LENGTH).toString('base64url');
|
|
}
|
|
|
|
/**
|
|
* Compute HMAC signature for a CSRF nonce using the server-side encryption key
|
|
* @param {string} nonce - The random nonce to sign
|
|
* @returns {string} Base64URL-encoded HMAC signature
|
|
*/
|
|
function signToken(nonce) {
|
|
const key = cryptoUtils.loadOrCreateKey();
|
|
return crypto.createHmac('sha256', key).update(nonce).digest('base64url');
|
|
}
|
|
|
|
/**
|
|
* Parse cookie header string into object
|
|
* @param {string} cookieHeader - Cookie header value
|
|
* @returns {Object} Parsed cookies
|
|
*/
|
|
function parseCookie(cookieHeader) {
|
|
if (!cookieHeader) return {};
|
|
|
|
return cookieHeader.split(';').reduce((cookies, cookie) => {
|
|
const [name, ...rest] = cookie.trim().split('=');
|
|
if (name && rest.length > 0) {
|
|
cookies[name] = rest.join('=');
|
|
}
|
|
return cookies;
|
|
}, {});
|
|
}
|
|
|
|
/**
|
|
* Create CSRF middleware with cookie domain support.
|
|
* When a TLD (e.g. ".sami") is provided, cookies are set with Domain=.sami
|
|
* so they are shared across all subdomains for forward_auth SSO.
|
|
* @param {Object} [options]
|
|
* @param {string} [options.cookieDomain] - e.g. ".sami" to share cookies across subdomains
|
|
* @returns {{ csrfCookieMiddleware: Function, renewCSRFToken: Function }}
|
|
*/
|
|
function createCSRFMiddleware(options = {}) {
|
|
const { cookieDomain } = options;
|
|
|
|
/**
|
|
* Middleware to set CSRF cookie on requests.
|
|
* Preserves existing nonce to avoid invalidating tokens the client has cached.
|
|
* New nonce is generated only on first visit (no cookie) or after TOTP login
|
|
* (which calls renewCSRFToken). If TOTP is disabled, the nonce is set once
|
|
* and never changes.
|
|
*/
|
|
function csrfCookieMiddleware(req, res, next) {
|
|
const cookies = parseCookie(req.headers.cookie);
|
|
const existingNonce = cookies[CSRF_COOKIE_NAME];
|
|
|
|
// Reuse existing nonce; only generate fresh if no cookie exists yet
|
|
const csrfNonce = existingNonce || generateToken();
|
|
|
|
// Store nonce + signature on request so endpoints can access them
|
|
req.csrfToken = signToken(csrfNonce);
|
|
req.csrfNonce = csrfNonce;
|
|
|
|
// Only set cookie if it's new (avoids unnecessary Set-Cookie headers)
|
|
if (!existingNonce) {
|
|
const cookieOpts = {
|
|
httpOnly: false, // Must be readable by JavaScript for signing
|
|
secure: req.secure || req.protocol === 'https',
|
|
sameSite: 'strict',
|
|
path: '/',
|
|
maxAge: 365 * 24 * 60 * 60 * 1000 // 1 year (effectively permanent)
|
|
};
|
|
if (cookieDomain) cookieOpts.domain = cookieDomain;
|
|
res.cookie(CSRF_COOKIE_NAME, csrfNonce, cookieOpts);
|
|
}
|
|
|
|
next();
|
|
}
|
|
|
|
/**
|
|
* Generate a fresh CSRF nonce and set it on the response.
|
|
* Called after TOTP login to rotate the token for the new session.
|
|
* @param {Object} res - Express response object
|
|
* @param {boolean} secure - Whether to set Secure flag on cookie
|
|
* @returns {string} The new CSRF signed token
|
|
*/
|
|
function renewCSRFToken(res, secure) {
|
|
const csrfNonce = generateToken();
|
|
const cookieOpts = {
|
|
httpOnly: false,
|
|
secure: !!secure,
|
|
sameSite: 'strict',
|
|
path: '/',
|
|
maxAge: 365 * 24 * 60 * 60 * 1000
|
|
};
|
|
if (cookieDomain) cookieOpts.domain = cookieDomain;
|
|
res.cookie(CSRF_COOKIE_NAME, csrfNonce, cookieOpts);
|
|
return signToken(csrfNonce);
|
|
}
|
|
|
|
return { csrfCookieMiddleware, renewCSRFToken };
|
|
}
|
|
|
|
/**
|
|
* Middleware to validate CSRF token on state-changing requests
|
|
* Validates that the token in the cookie matches the token in the header
|
|
*/
|
|
function csrfValidationMiddleware(req, res, next) {
|
|
const method = req.method.toUpperCase();
|
|
|
|
// Skip validation for safe methods
|
|
if (['GET', 'HEAD', 'OPTIONS'].includes(method)) {
|
|
return next();
|
|
}
|
|
|
|
// Skip CSRF validation in test environment
|
|
if (process.env.NODE_ENV === 'test') {
|
|
return next();
|
|
}
|
|
|
|
// Excluded paths that don't require CSRF validation
|
|
// Note: probe endpoints (/health, /health/live, /health/ready, /healthz,
|
|
// /readyz) are GET-only so they're already excluded by the safe-methods
|
|
// check above. Listed here for explicit safety in case any of them ever
|
|
// accept a POST in the future.
|
|
const excludedPaths = [
|
|
'/api/v1/totp/verify',
|
|
'/api/v1/totp/verify-setup',
|
|
'/api/v1/totp/setup',
|
|
'/health',
|
|
'/health/live',
|
|
'/health/ready',
|
|
'/healthz',
|
|
'/readyz',
|
|
// Machine-to-machine: publishing host POSTs here with its own shared-secret
|
|
// header (X-DashCaddy-Notify-Secret) — browsers never reach this endpoint.
|
|
'/api/v1/system/update-notify'
|
|
];
|
|
|
|
const isExcluded = excludedPaths.some(path => req.path === path) ||
|
|
req.path.startsWith('/api/v1/auth/gate/');
|
|
|
|
if (isExcluded) {
|
|
return next();
|
|
}
|
|
|
|
// Get nonce from cookie
|
|
const cookies = parseCookie(req.headers.cookie);
|
|
const cookieNonce = cookies[CSRF_COOKIE_NAME];
|
|
|
|
// Get signed token from header (case-insensitive)
|
|
const headerToken = req.headers[CSRF_HEADER_NAME] ||
|
|
req.headers[CSRF_HEADER_NAME.toLowerCase()];
|
|
|
|
// Skip CSRF for API key-authenticated requests (API keys are not sent automatically by browsers)
|
|
if (req.headers['x-api-key'] || (req.headers.authorization && req.headers.authorization.startsWith('Bearer '))) {
|
|
return next();
|
|
}
|
|
|
|
// Validate both values exist
|
|
if (!cookieNonce) {
|
|
console.warn(`[CSRF] Missing CSRF cookie: ${method} ${req.path} from ${req.ip}`);
|
|
return errorResponse(res, 403, '[DC-100] CSRF token missing', {
|
|
message: 'CSRF cookie not found. Please refresh the page (Ctrl+Shift+R) and try again.'
|
|
});
|
|
}
|
|
|
|
if (!headerToken) {
|
|
console.warn(`[CSRF] Missing CSRF header: ${method} ${req.path} from ${req.ip}`);
|
|
return errorResponse(res, 403, '[DC-100] CSRF token missing', {
|
|
message: 'CSRF token not provided in request headers. Please refresh the page (Ctrl+Shift+R) and try again.'
|
|
});
|
|
}
|
|
|
|
// Validate that the header token is the correct HMAC signature of the cookie nonce
|
|
try {
|
|
const expectedSig = signToken(cookieNonce);
|
|
const expectedBuffer = Buffer.from(expectedSig, 'base64url');
|
|
const headerBuffer = Buffer.from(headerToken, 'base64url');
|
|
|
|
if (expectedBuffer.length !== headerBuffer.length) {
|
|
throw new Error('Token length mismatch');
|
|
}
|
|
|
|
if (!crypto.timingSafeEqual(expectedBuffer, headerBuffer)) {
|
|
throw new Error('Token mismatch');
|
|
}
|
|
|
|
// Signature valid — request is authentic
|
|
next();
|
|
|
|
} catch (err) {
|
|
console.warn(`[CSRF] Invalid CSRF token: ${method} ${req.path} from ${req.ip} - ${err.message}`);
|
|
return errorResponse(res, 403, '[DC-101] CSRF token invalid', {
|
|
message: 'CSRF token validation failed. Please refresh the page (Ctrl+Shift+R) and try again.'
|
|
});
|
|
}
|
|
}
|
|
|
|
// Default instance (no domain) for backward compatibility with tests
|
|
const defaultInstance = createCSRFMiddleware();
|
|
|
|
module.exports = {
|
|
CSRF_TOKEN_LENGTH,
|
|
CSRF_COOKIE_NAME,
|
|
CSRF_HEADER_NAME,
|
|
generateToken,
|
|
signToken,
|
|
parseCookie,
|
|
createCSRFMiddleware,
|
|
csrfValidationMiddleware,
|
|
// Default instance exports for backward compat
|
|
csrfCookieMiddleware: defaultInstance.csrfCookieMiddleware,
|
|
renewCSRFToken: defaultInstance.renewCSRFToken
|
|
};
|