mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-01 11:36:29 +00:00
* 🌩️ feat: CloudFront CDN File Strategy + signed cookies Squashed from PR #12193: - feat(storage): add CloudFront CDN file strategy - feat(auth): add CloudFront signed cookie support Note: package.json/package-lock.json dependency additions are intentionally omitted from this commit and will be re-added via `npm install` after rebase to avoid lock-file merge conflicts. The two new peer deps that need to be re-installed are: - @aws-sdk/client-cloudfront@^3.1032.0 - @aws-sdk/cloudfront-signer@^3.1012.0 Also fixes 4 missing destructured names in AuthService.spec.js (getUserById, generateToken, generateRefreshToken, createSession) that were referenced in tests but not imported from the mocked '~/models'. * 📦 chore: install CloudFront SDK deps for PR #12193 Adds the two AWS CloudFront packages required by the rebased CloudFront CDN strategy: - @aws-sdk/client-cloudfront - @aws-sdk/cloudfront-signer Following the @aws-sdk/client-s3 pattern: - api/package.json: regular dependency (runtime resolution) - packages/api/package.json: peerDependency Generated by `npm install` against the freshly rebased lock file to avoid the merge conflicts that came from the original PR's lock-file edits being made against an older base of dev. * 🐛 fix: CI failures + review findings on CloudFront PR #12193 CI fixes - Rename packages/data-provider/src/__tests__/cloudfront-config.test.ts → src/cloudfront-config.spec.ts. Jest's default testMatch picks up __tests__/ directories even inside dist/, so the compiled .d.ts shell was being executed as an empty test suite. Moving to .spec.ts (matching the rest of the package) avoids the dist/ pickup. - Add cookieExpiry: 1800 to CloudFront crud.test makeConfig: the schema applies a default so CloudFrontFullConfig requires it. Review findings addressed - #1 (Codex + comprehensive): Normalize CloudFront domain with /\/+$/ regex (and key with /^\/+/ regex) in buildCloudFrontUrl, matching the cookie code so resource policy and file URLs stay aligned even when the configured domain has multiple trailing slashes. Added tests. - #2: Move DEFAULT_BASE_PATH out of s3Config into shared packages/api/src/storage/constants.ts. ImageService no longer imports S3-specific config. - #3: getCloudFrontConfig() returns Readonly<CloudFrontFullConfig> | null to discourage mutation of the cached signing config. - #4: Add cross-field refinement tests for cloudfrontConfigSchema (invalidateOnDelete-without-distributionId, imageSigning="cookies"-without-cookieDomain). - #6: Revert unrelated MCP comment re-indentation in librechat.example.yaml. - #7: Add azure_blob to the strategy list comment. Skipped - #5 (extractKeyFromS3Url with CloudFront URLs): existing deleteFileFromCloudFront tests already cover the path-equivalence assumption; renaming the helper is real refactor work beyond this PR's scope. - #8, #9 (NIT, low confidence): leaving for author judgement. * 🧹 chore: drop dead DEFAULT_BASE_PATH from s3Config test mock After moving DEFAULT_BASE_PATH to ~/storage/constants, crud.ts no longer reads it from s3Config — so the entry in the s3Config jest mock was misleading dead config. The tests still pass because the unmocked real constants module provides the value. --------- Co-authored-by: Danny Avila <danny@librechat.ai>
141 lines
5.6 KiB
JavaScript
141 lines
5.6 KiB
JavaScript
const cookies = require('cookie');
|
|
const { isEnabled, clearCloudFrontCookies } = require('@librechat/api');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { logoutUser } = require('~/server/services/AuthService');
|
|
const { getOpenIdConfig } = require('~/strategies');
|
|
|
|
/** Parses and validates OPENID_MAX_LOGOUT_URL_LENGTH, returning defaultValue on invalid input */
|
|
function parseMaxLogoutUrlLength(defaultValue = 2000) {
|
|
const raw = process.env.OPENID_MAX_LOGOUT_URL_LENGTH;
|
|
const trimmed = raw == null ? '' : raw.trim();
|
|
if (trimmed === '') {
|
|
return defaultValue;
|
|
}
|
|
const parsed = /^\d+$/.test(trimmed) ? Number(trimmed) : NaN;
|
|
if (!Number.isFinite(parsed) || parsed <= 0) {
|
|
logger.warn(
|
|
`[logoutController] Invalid OPENID_MAX_LOGOUT_URL_LENGTH value "${raw}", using default ${defaultValue}`,
|
|
);
|
|
return defaultValue;
|
|
}
|
|
return parsed;
|
|
}
|
|
|
|
const logoutController = async (req, res) => {
|
|
const parsedCookies = req.headers.cookie ? cookies.parse(req.headers.cookie) : {};
|
|
const isOpenIdUser = req.user?.openidId != null && req.user?.provider === 'openid';
|
|
|
|
let refreshToken;
|
|
let idToken;
|
|
if (isOpenIdUser && req.session?.openidTokens) {
|
|
refreshToken = req.session.openidTokens.refreshToken;
|
|
idToken = req.session.openidTokens.idToken;
|
|
delete req.session.openidTokens;
|
|
}
|
|
refreshToken = refreshToken || parsedCookies.refreshToken;
|
|
idToken = idToken || parsedCookies.openid_id_token;
|
|
|
|
try {
|
|
const logout = await logoutUser(req, refreshToken);
|
|
const { status, message } = logout;
|
|
|
|
res.clearCookie('refreshToken');
|
|
res.clearCookie('openid_access_token');
|
|
res.clearCookie('openid_id_token');
|
|
res.clearCookie('openid_user_id');
|
|
res.clearCookie('token_provider');
|
|
clearCloudFrontCookies(res);
|
|
const response = { message };
|
|
if (
|
|
isOpenIdUser &&
|
|
isEnabled(process.env.OPENID_USE_END_SESSION_ENDPOINT) &&
|
|
process.env.OPENID_ISSUER
|
|
) {
|
|
let openIdConfig;
|
|
try {
|
|
openIdConfig = getOpenIdConfig();
|
|
} catch (err) {
|
|
logger.warn('[logoutController] OpenID config not available:', err.message);
|
|
}
|
|
if (openIdConfig) {
|
|
const endSessionEndpoint = openIdConfig.serverMetadata().end_session_endpoint;
|
|
if (endSessionEndpoint) {
|
|
const endSessionUrl = new URL(endSessionEndpoint);
|
|
const postLogoutRedirectUri =
|
|
process.env.OPENID_POST_LOGOUT_REDIRECT_URI || `${process.env.DOMAIN_CLIENT}/login`;
|
|
endSessionUrl.searchParams.set('post_logout_redirect_uri', postLogoutRedirectUri);
|
|
|
|
/**
|
|
* OIDC RP-Initiated Logout cascading strategy:
|
|
* 1. id_token_hint (most secure, identifies exact session)
|
|
* 2. logout_hint + client_id (when URL would exceed safe length)
|
|
* 3. client_id only (when no token available)
|
|
*
|
|
* JWT tokens from spec-compliant OIDC providers use base64url
|
|
* encoding (RFC 7515), whose characters are all URL-safe, so
|
|
* token length equals URL-encoded length for projection.
|
|
* Non-compliant issuers using standard base64 (+/=) will cause
|
|
* underestimation; increase OPENID_MAX_LOGOUT_URL_LENGTH if the
|
|
* fallback does not trigger as expected.
|
|
*/
|
|
const maxLogoutUrlLength = parseMaxLogoutUrlLength();
|
|
let strategy = 'no_token';
|
|
if (idToken) {
|
|
const baseLength = endSessionUrl.toString().length;
|
|
const projectedLength = baseLength + '&id_token_hint='.length + idToken.length;
|
|
if (projectedLength > maxLogoutUrlLength) {
|
|
strategy = 'too_long';
|
|
logger.debug(
|
|
`[logoutController] Logout URL too long (${projectedLength} chars, max ${maxLogoutUrlLength}), ` +
|
|
'switching to logout_hint strategy',
|
|
);
|
|
} else {
|
|
strategy = 'use_token';
|
|
}
|
|
}
|
|
|
|
if (strategy === 'use_token') {
|
|
endSessionUrl.searchParams.set('id_token_hint', idToken);
|
|
} else {
|
|
if (strategy === 'too_long') {
|
|
const logoutHint = req.user?.email || req.user?.username || req.user?.openidId;
|
|
if (logoutHint) {
|
|
endSessionUrl.searchParams.set('logout_hint', logoutHint);
|
|
}
|
|
}
|
|
|
|
if (process.env.OPENID_CLIENT_ID) {
|
|
endSessionUrl.searchParams.set('client_id', process.env.OPENID_CLIENT_ID);
|
|
} else if (strategy === 'too_long') {
|
|
logger.warn(
|
|
'[logoutController] Logout URL exceeds max length and OPENID_CLIENT_ID is not set. ' +
|
|
'The OIDC end-session request may be rejected. ' +
|
|
'Consider setting OPENID_CLIENT_ID or increasing OPENID_MAX_LOGOUT_URL_LENGTH.',
|
|
);
|
|
} else {
|
|
logger.warn(
|
|
'[logoutController] Neither id_token_hint nor OPENID_CLIENT_ID is available. ' +
|
|
'To enable id_token_hint, set OPENID_REUSE_TOKENS=true. ' +
|
|
'The OIDC end-session request may be rejected by the identity provider.',
|
|
);
|
|
}
|
|
}
|
|
|
|
response.redirect = endSessionUrl.toString();
|
|
} else {
|
|
logger.warn(
|
|
'[logoutController] end_session_endpoint not found in OpenID issuer metadata. Please verify that the issuer is correct.',
|
|
);
|
|
}
|
|
}
|
|
}
|
|
return res.status(status).send(response);
|
|
} catch (err) {
|
|
logger.error('[logoutController]', err);
|
|
return res.status(500).json({ message: err.message });
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
logoutController,
|
|
};
|