2025-05-30 00:00:58 +09:00
|
|
|
const fs = require('fs');
|
|
|
|
|
const path = require('path');
|
|
|
|
|
const fetch = require('node-fetch');
|
|
|
|
|
const passport = require('passport');
|
2025-08-11 18:49:34 -04:00
|
|
|
const { ErrorTypes } = require('librechat-data-provider');
|
2025-05-30 22:18:13 -04:00
|
|
|
const { hashToken, logger } = require('@librechat/data-schemas');
|
2025-05-30 00:00:58 +09:00
|
|
|
const { Strategy: SamlStrategy } = require('@node-saml/passport-saml');
|
🏢 feat: Tenant-Scoped App Config in Auth Login Flows (#12434)
* feat: add resolveAppConfigForUser utility for tenant-scoped auth config
TypeScript utility in packages/api that wraps getAppConfig in
tenantStorage.run() when the user has a tenantId, falling back to
baseOnly for new users or non-tenant deployments. Uses DI pattern
(getAppConfig passed as parameter) for testability.
Auth flows apply role-level overrides only (userId not passed)
because user/group principal resolution is deferred to post-auth.
* feat: tenant-scoped app config in auth login flows
All auth strategies (LDAP, SAML, OpenID, social login) now use a
two-phase domain check consistent with requestPasswordReset:
1. Fast-fail with base config (memory-cached, zero DB queries)
2. DB user lookup
3. Tenant-scoped re-check via resolveAppConfigForUser (only when
user has a tenantId; otherwise reuse base config)
This preserves the original fast-fail protection against globally
blocked domains while enabling tenant-specific config overrides.
OpenID error ordering preserved: AUTH_FAILED checked before domain
re-check so users with wrong providers get the correct error type.
registerUser unchanged (baseOnly, no user identity yet).
* test: add tenant-scoped config tests for auth strategies
Add resolveAppConfig.spec.ts in packages/api with 8 tests:
- baseOnly fallback for null/undefined/no-tenant users
- tenant-scoped config with role and tenantId
- ALS context propagation verified inside getAppConfig callback
- undefined role with tenantId edge case
Update strategy and AuthService tests to mock resolveAppConfigForUser
via @librechat/api. Tests verify two-phase domain check behavior:
fast-fail before DB, tenant re-check after. Non-tenant users reuse
base config without calling resolveAppConfigForUser.
* refactor: skip redundant domain re-check for non-tenant users
Guard the second isEmailDomainAllowed call with appConfig !== baseConfig
in SAML, OpenID, and social strategies. For non-tenant users the tenant
config is the same base config object, so the second check is a no-op.
Narrow eslint-disable in resolveAppConfig.spec.ts to the specific
require line instead of blanket file-level suppression.
* fix: address review findings — consistency, tests, and ordering
- Consolidate duplicate require('@librechat/api') in AuthService.js
- Add two-phase domain check to LDAP (base fast-fail before findUser),
making all strategies consistent with PR description
- Add appConfig !== baseConfig guard to requestPasswordReset second
domain check, consistent with SAML/OpenID/social strategies
- Move SAML provider check before tenant config resolution to avoid
unnecessary resolveAppConfigForUser call for wrong-provider users
- Add tenant domain rejection tests to SAML, OpenID, and social specs
verifying that tenant config restrictions actually block login
- Add error propagation tests to resolveAppConfig.spec.ts
- Remove redundant mockTenantStorage alias in resolveAppConfig.spec.ts
- Narrow eslint-disable to specific require line
* test: add tenant domain rejection test for LDAP strategy
Covers the appConfig !== baseConfig && !isEmailDomainAllowed path,
consistent with SAML, OpenID, and social strategy specs.
* refactor: rename resolveAppConfig to app/resolve per AGENTS.md
Rename resolveAppConfig.ts → resolve.ts and
resolveAppConfig.spec.ts → resolve.spec.ts to align with
the project's concise naming convention.
* fix: remove fragile reference-equality guard, add logging and docs
Remove appConfig !== baseConfig guard from all strategies and
requestPasswordReset. The guard relied on implicit cache-backend
identity semantics (in-memory Keyv returns same object reference)
that would silently break with Redis or cloned configs. The second
isEmailDomainAllowed call is a cheap synchronous check — always
running it is clearer and eliminates the coupling.
Add audit logging to requestPasswordReset domain blocks (base and
tenant), consistent with all auth strategies.
Extract duplicated error construction into makeDomainDeniedError().
Wrap resolveAppConfigForUser in requestPasswordReset with try/catch
to prevent DB errors from leaking to the client via the controller's
generic catch handler.
Document the dual tenantId propagation (ALS for DB isolation,
explicit param for cache key) in resolveAppConfigForUser JSDoc.
Add comment documenting the LDAP error-type ordering change
(cross-provider users from blocked domains now get 'domain not
allowed' instead of AUTH_FAILED).
Assert resolveAppConfigForUser is not called on LDAP provider
mismatch path.
* fix: return generic response for tenant domain block in password reset
Tenant-scoped domain rejection in requestPasswordReset now returns the
same generic "If an account with that email exists..." response instead
of an Error. This prevents user-enumeration: an attacker cannot
distinguish between "email not found" and "tenant blocks this domain"
by comparing HTTP responses.
The base-config fast-fail (pre-user-lookup) still returns an Error
since it fires before any user existence is revealed.
* docs: document phase 1 vs phase 2 domain check behavior in JSDoc
Phase 1 (base config, pre-findUser) intentionally returns Error/400
to reveal globally blocked domains without confirming user existence.
Phase 2 (tenant config, post-findUser) returns generic 200 to prevent
user-enumeration. This distinction is now explicit in the JSDoc.
2026-03-27 16:08:43 -04:00
|
|
|
const {
|
|
|
|
|
getBalanceConfig,
|
|
|
|
|
isEmailDomainAllowed,
|
|
|
|
|
resolveAppConfigForUser,
|
|
|
|
|
} = require('@librechat/api');
|
2025-05-30 00:00:58 +09:00
|
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
2025-05-30 22:18:13 -04:00
|
|
|
const { findUser, createUser, updateUser } = require('~/models');
|
2025-08-26 12:10:18 -04:00
|
|
|
const { getAppConfig } = require('~/server/services/Config');
|
2025-05-30 00:00:58 +09:00
|
|
|
const paths = require('~/config/paths');
|
|
|
|
|
|
|
|
|
|
let crypto;
|
|
|
|
|
try {
|
|
|
|
|
crypto = require('node:crypto');
|
|
|
|
|
} catch (err) {
|
|
|
|
|
logger.error('[samlStrategy] crypto support is disabled!', err);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Retrieves the certificate content from the given value.
|
|
|
|
|
*
|
|
|
|
|
* This function determines whether the provided value is a certificate string (RFC7468 format or
|
|
|
|
|
* base64-encoded without a header) or a valid file path. If the value matches one of these formats,
|
|
|
|
|
* the certificate content is returned. Otherwise, an error is thrown.
|
|
|
|
|
*
|
|
|
|
|
* @see https://github.com/node-saml/node-saml/tree/master?tab=readme-ov-file#configuration-option-idpcert
|
|
|
|
|
* @param {string} value - The certificate string or file path.
|
|
|
|
|
* @returns {string} The certificate content if valid.
|
|
|
|
|
* @throws {Error} If the value is not a valid certificate string or file path.
|
|
|
|
|
*/
|
|
|
|
|
function getCertificateContent(value) {
|
|
|
|
|
if (typeof value !== 'string') {
|
|
|
|
|
throw new Error('Invalid input: SAML_CERT must be a string.');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if it's an RFC7468 formatted PEM certificate
|
|
|
|
|
const pemRegex = new RegExp(
|
|
|
|
|
'-----BEGIN (CERTIFICATE|PUBLIC KEY)-----\n' + // header
|
|
|
|
|
'([A-Za-z0-9+/=]{64}\n)+' + // base64 content (64 characters per line)
|
|
|
|
|
'[A-Za-z0-9+/=]{1,64}\n' + // base64 content (last line)
|
|
|
|
|
'-----END (CERTIFICATE|PUBLIC KEY)-----', // footer
|
|
|
|
|
);
|
|
|
|
|
if (pemRegex.test(value)) {
|
|
|
|
|
logger.info('[samlStrategy] Detected RFC7468-formatted certificate string.');
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if it's a Base64-encoded certificate (no header)
|
|
|
|
|
if (/^[A-Za-z0-9+/=]+$/.test(value) && value.length % 4 === 0) {
|
|
|
|
|
logger.info('[samlStrategy] Detected base64-encoded certificate string (no header).');
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if file exists and is readable
|
|
|
|
|
const certPath = path.normalize(path.isAbsolute(value) ? value : path.join(paths.root, value));
|
|
|
|
|
if (fs.existsSync(certPath) && fs.statSync(certPath).isFile()) {
|
|
|
|
|
try {
|
|
|
|
|
logger.info(`[samlStrategy] Loading certificate from file: ${certPath}`);
|
|
|
|
|
return fs.readFileSync(certPath, 'utf8').trim();
|
|
|
|
|
} catch (error) {
|
|
|
|
|
throw new Error(`Error reading certificate file: ${error.message}`);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw new Error('Invalid cert: SAML_CERT must be a valid file path or certificate string.');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Retrieves a SAML claim from a profile object based on environment configuration.
|
|
|
|
|
* @param {object} profile - Saml profile
|
|
|
|
|
* @param {string} envVar - Environment variable name (SAML_*)
|
|
|
|
|
* @param {string} defaultKey - Default key to use if the environment variable is not set
|
|
|
|
|
* @returns {string}
|
|
|
|
|
*/
|
|
|
|
|
function getSamlClaim(profile, envVar, defaultKey) {
|
|
|
|
|
const claimKey = process.env[envVar];
|
|
|
|
|
|
|
|
|
|
// Avoids accessing `profile[""]` when the environment variable is empty string.
|
|
|
|
|
if (claimKey) {
|
|
|
|
|
return profile[claimKey] ?? profile[defaultKey];
|
|
|
|
|
}
|
|
|
|
|
return profile[defaultKey];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getEmail(profile) {
|
|
|
|
|
return getSamlClaim(profile, 'SAML_EMAIL_CLAIM', 'email');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getUserName(profile) {
|
|
|
|
|
return getSamlClaim(profile, 'SAML_USERNAME_CLAIM', 'username');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getGivenName(profile) {
|
|
|
|
|
return getSamlClaim(profile, 'SAML_GIVEN_NAME_CLAIM', 'given_name');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getFamilyName(profile) {
|
|
|
|
|
return getSamlClaim(profile, 'SAML_FAMILY_NAME_CLAIM', 'family_name');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getPicture(profile) {
|
|
|
|
|
return getSamlClaim(profile, 'SAML_PICTURE_CLAIM', 'picture');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Downloads an image from a URL using an access token.
|
|
|
|
|
* @param {string} url
|
|
|
|
|
* @returns {Promise<Buffer>}
|
|
|
|
|
*/
|
|
|
|
|
const downloadImage = async (url) => {
|
|
|
|
|
try {
|
|
|
|
|
const response = await fetch(url);
|
|
|
|
|
if (response.ok) {
|
|
|
|
|
return await response.buffer();
|
|
|
|
|
} else {
|
|
|
|
|
throw new Error(`${response.statusText} (HTTP ${response.status})`);
|
|
|
|
|
}
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error(`[samlStrategy] Error downloading image at URL "${url}": ${error}`);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Determines the full name of a user based on SAML profile and environment configuration.
|
|
|
|
|
*
|
|
|
|
|
* @param {Object} profile - The user profile object from SAML Connect
|
|
|
|
|
* @returns {string} The determined full name of the user
|
|
|
|
|
*/
|
|
|
|
|
function getFullName(profile) {
|
|
|
|
|
if (process.env.SAML_NAME_CLAIM) {
|
|
|
|
|
logger.info(
|
|
|
|
|
`[samlStrategy] Using SAML_NAME_CLAIM: ${process.env.SAML_NAME_CLAIM}, profile: ${profile[process.env.SAML_NAME_CLAIM]}`,
|
|
|
|
|
);
|
|
|
|
|
return profile[process.env.SAML_NAME_CLAIM];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const givenName = getGivenName(profile);
|
|
|
|
|
const familyName = getFamilyName(profile);
|
|
|
|
|
|
|
|
|
|
if (givenName && familyName) {
|
|
|
|
|
return `${givenName} ${familyName}`;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (givenName) {
|
|
|
|
|
return givenName;
|
|
|
|
|
}
|
|
|
|
|
if (familyName) {
|
|
|
|
|
return familyName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return getUserName(profile) || getEmail(profile);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Converts an input into a string suitable for a username.
|
|
|
|
|
* If the input is a string, it will be returned as is.
|
|
|
|
|
* If the input is an array, elements will be joined with underscores.
|
|
|
|
|
* In case of undefined or other falsy values, a default value will be returned.
|
|
|
|
|
*
|
|
|
|
|
* @param {string | string[] | undefined} input - The input value to be converted into a username.
|
|
|
|
|
* @param {string} [defaultValue=''] - The default value to return if the input is falsy.
|
|
|
|
|
* @returns {string} The processed input as a string suitable for a username.
|
|
|
|
|
*/
|
|
|
|
|
function convertToUsername(input, defaultValue = '') {
|
|
|
|
|
if (typeof input === 'string') {
|
|
|
|
|
return input;
|
|
|
|
|
} else if (Array.isArray(input)) {
|
|
|
|
|
return input.join('_');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return defaultValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
async function setupSaml() {
|
|
|
|
|
try {
|
|
|
|
|
const samlConfig = {
|
|
|
|
|
entryPoint: process.env.SAML_ENTRY_POINT,
|
|
|
|
|
issuer: process.env.SAML_ISSUER,
|
|
|
|
|
callbackUrl: process.env.SAML_CALLBACK_URL,
|
|
|
|
|
idpCert: getCertificateContent(process.env.SAML_CERT),
|
|
|
|
|
wantAssertionsSigned: process.env.SAML_USE_AUTHN_RESPONSE_SIGNED === 'true' ? false : true,
|
|
|
|
|
wantAuthnResponseSigned: process.env.SAML_USE_AUTHN_RESPONSE_SIGNED === 'true' ? true : false,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
passport.use(
|
|
|
|
|
'saml',
|
|
|
|
|
new SamlStrategy(samlConfig, async (profile, done) => {
|
|
|
|
|
try {
|
|
|
|
|
logger.info(`[samlStrategy] SAML authentication received for NameID: ${profile.nameID}`);
|
|
|
|
|
logger.debug('[samlStrategy] SAML profile:', profile);
|
|
|
|
|
|
2025-09-11 01:01:58 -04:00
|
|
|
const userEmail = getEmail(profile) || '';
|
|
|
|
|
|
🏢 feat: Tenant-Scoped App Config in Auth Login Flows (#12434)
* feat: add resolveAppConfigForUser utility for tenant-scoped auth config
TypeScript utility in packages/api that wraps getAppConfig in
tenantStorage.run() when the user has a tenantId, falling back to
baseOnly for new users or non-tenant deployments. Uses DI pattern
(getAppConfig passed as parameter) for testability.
Auth flows apply role-level overrides only (userId not passed)
because user/group principal resolution is deferred to post-auth.
* feat: tenant-scoped app config in auth login flows
All auth strategies (LDAP, SAML, OpenID, social login) now use a
two-phase domain check consistent with requestPasswordReset:
1. Fast-fail with base config (memory-cached, zero DB queries)
2. DB user lookup
3. Tenant-scoped re-check via resolveAppConfigForUser (only when
user has a tenantId; otherwise reuse base config)
This preserves the original fast-fail protection against globally
blocked domains while enabling tenant-specific config overrides.
OpenID error ordering preserved: AUTH_FAILED checked before domain
re-check so users with wrong providers get the correct error type.
registerUser unchanged (baseOnly, no user identity yet).
* test: add tenant-scoped config tests for auth strategies
Add resolveAppConfig.spec.ts in packages/api with 8 tests:
- baseOnly fallback for null/undefined/no-tenant users
- tenant-scoped config with role and tenantId
- ALS context propagation verified inside getAppConfig callback
- undefined role with tenantId edge case
Update strategy and AuthService tests to mock resolveAppConfigForUser
via @librechat/api. Tests verify two-phase domain check behavior:
fast-fail before DB, tenant re-check after. Non-tenant users reuse
base config without calling resolveAppConfigForUser.
* refactor: skip redundant domain re-check for non-tenant users
Guard the second isEmailDomainAllowed call with appConfig !== baseConfig
in SAML, OpenID, and social strategies. For non-tenant users the tenant
config is the same base config object, so the second check is a no-op.
Narrow eslint-disable in resolveAppConfig.spec.ts to the specific
require line instead of blanket file-level suppression.
* fix: address review findings — consistency, tests, and ordering
- Consolidate duplicate require('@librechat/api') in AuthService.js
- Add two-phase domain check to LDAP (base fast-fail before findUser),
making all strategies consistent with PR description
- Add appConfig !== baseConfig guard to requestPasswordReset second
domain check, consistent with SAML/OpenID/social strategies
- Move SAML provider check before tenant config resolution to avoid
unnecessary resolveAppConfigForUser call for wrong-provider users
- Add tenant domain rejection tests to SAML, OpenID, and social specs
verifying that tenant config restrictions actually block login
- Add error propagation tests to resolveAppConfig.spec.ts
- Remove redundant mockTenantStorage alias in resolveAppConfig.spec.ts
- Narrow eslint-disable to specific require line
* test: add tenant domain rejection test for LDAP strategy
Covers the appConfig !== baseConfig && !isEmailDomainAllowed path,
consistent with SAML, OpenID, and social strategy specs.
* refactor: rename resolveAppConfig to app/resolve per AGENTS.md
Rename resolveAppConfig.ts → resolve.ts and
resolveAppConfig.spec.ts → resolve.spec.ts to align with
the project's concise naming convention.
* fix: remove fragile reference-equality guard, add logging and docs
Remove appConfig !== baseConfig guard from all strategies and
requestPasswordReset. The guard relied on implicit cache-backend
identity semantics (in-memory Keyv returns same object reference)
that would silently break with Redis or cloned configs. The second
isEmailDomainAllowed call is a cheap synchronous check — always
running it is clearer and eliminates the coupling.
Add audit logging to requestPasswordReset domain blocks (base and
tenant), consistent with all auth strategies.
Extract duplicated error construction into makeDomainDeniedError().
Wrap resolveAppConfigForUser in requestPasswordReset with try/catch
to prevent DB errors from leaking to the client via the controller's
generic catch handler.
Document the dual tenantId propagation (ALS for DB isolation,
explicit param for cache key) in resolveAppConfigForUser JSDoc.
Add comment documenting the LDAP error-type ordering change
(cross-provider users from blocked domains now get 'domain not
allowed' instead of AUTH_FAILED).
Assert resolveAppConfigForUser is not called on LDAP provider
mismatch path.
* fix: return generic response for tenant domain block in password reset
Tenant-scoped domain rejection in requestPasswordReset now returns the
same generic "If an account with that email exists..." response instead
of an Error. This prevents user-enumeration: an attacker cannot
distinguish between "email not found" and "tenant blocks this domain"
by comparing HTTP responses.
The base-config fast-fail (pre-user-lookup) still returns an Error
since it fires before any user existence is revealed.
* docs: document phase 1 vs phase 2 domain check behavior in JSDoc
Phase 1 (base config, pre-findUser) intentionally returns Error/400
to reveal globally blocked domains without confirming user existence.
Phase 2 (tenant config, post-findUser) returns generic 200 to prevent
user-enumeration. This distinction is now explicit in the JSDoc.
2026-03-27 16:08:43 -04:00
|
|
|
const baseConfig = await getAppConfig({ baseOnly: true });
|
|
|
|
|
if (!isEmailDomainAllowed(userEmail, baseConfig?.registration?.allowedDomains)) {
|
2025-09-11 01:01:58 -04:00
|
|
|
logger.error(
|
|
|
|
|
`[SAML Strategy] Authentication blocked - email domain not allowed [Email: ${userEmail}]`,
|
|
|
|
|
);
|
|
|
|
|
return done(null, false, { message: 'Email domain not allowed' });
|
|
|
|
|
}
|
|
|
|
|
|
2025-05-30 00:00:58 +09:00
|
|
|
let user = await findUser({ samlId: profile.nameID });
|
|
|
|
|
logger.info(
|
|
|
|
|
`[samlStrategy] User ${user ? 'found' : 'not found'} with SAML ID: ${profile.nameID}`,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!user) {
|
2025-09-11 01:01:58 -04:00
|
|
|
user = await findUser({ email: userEmail });
|
2025-05-30 00:00:58 +09:00
|
|
|
logger.info(
|
2025-09-11 01:01:58 -04:00
|
|
|
`[samlStrategy] User ${user ? 'found' : 'not found'} with email: ${userEmail}`,
|
2025-05-30 00:00:58 +09:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2025-08-11 18:49:34 -04:00
|
|
|
if (user && user.provider !== 'saml') {
|
|
|
|
|
logger.info(
|
|
|
|
|
`[samlStrategy] User ${user.email} already exists with provider ${user.provider}`,
|
|
|
|
|
);
|
|
|
|
|
return done(null, false, {
|
|
|
|
|
message: ErrorTypes.AUTH_FAILED,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
🏢 feat: Tenant-Scoped App Config in Auth Login Flows (#12434)
* feat: add resolveAppConfigForUser utility for tenant-scoped auth config
TypeScript utility in packages/api that wraps getAppConfig in
tenantStorage.run() when the user has a tenantId, falling back to
baseOnly for new users or non-tenant deployments. Uses DI pattern
(getAppConfig passed as parameter) for testability.
Auth flows apply role-level overrides only (userId not passed)
because user/group principal resolution is deferred to post-auth.
* feat: tenant-scoped app config in auth login flows
All auth strategies (LDAP, SAML, OpenID, social login) now use a
two-phase domain check consistent with requestPasswordReset:
1. Fast-fail with base config (memory-cached, zero DB queries)
2. DB user lookup
3. Tenant-scoped re-check via resolveAppConfigForUser (only when
user has a tenantId; otherwise reuse base config)
This preserves the original fast-fail protection against globally
blocked domains while enabling tenant-specific config overrides.
OpenID error ordering preserved: AUTH_FAILED checked before domain
re-check so users with wrong providers get the correct error type.
registerUser unchanged (baseOnly, no user identity yet).
* test: add tenant-scoped config tests for auth strategies
Add resolveAppConfig.spec.ts in packages/api with 8 tests:
- baseOnly fallback for null/undefined/no-tenant users
- tenant-scoped config with role and tenantId
- ALS context propagation verified inside getAppConfig callback
- undefined role with tenantId edge case
Update strategy and AuthService tests to mock resolveAppConfigForUser
via @librechat/api. Tests verify two-phase domain check behavior:
fast-fail before DB, tenant re-check after. Non-tenant users reuse
base config without calling resolveAppConfigForUser.
* refactor: skip redundant domain re-check for non-tenant users
Guard the second isEmailDomainAllowed call with appConfig !== baseConfig
in SAML, OpenID, and social strategies. For non-tenant users the tenant
config is the same base config object, so the second check is a no-op.
Narrow eslint-disable in resolveAppConfig.spec.ts to the specific
require line instead of blanket file-level suppression.
* fix: address review findings — consistency, tests, and ordering
- Consolidate duplicate require('@librechat/api') in AuthService.js
- Add two-phase domain check to LDAP (base fast-fail before findUser),
making all strategies consistent with PR description
- Add appConfig !== baseConfig guard to requestPasswordReset second
domain check, consistent with SAML/OpenID/social strategies
- Move SAML provider check before tenant config resolution to avoid
unnecessary resolveAppConfigForUser call for wrong-provider users
- Add tenant domain rejection tests to SAML, OpenID, and social specs
verifying that tenant config restrictions actually block login
- Add error propagation tests to resolveAppConfig.spec.ts
- Remove redundant mockTenantStorage alias in resolveAppConfig.spec.ts
- Narrow eslint-disable to specific require line
* test: add tenant domain rejection test for LDAP strategy
Covers the appConfig !== baseConfig && !isEmailDomainAllowed path,
consistent with SAML, OpenID, and social strategy specs.
* refactor: rename resolveAppConfig to app/resolve per AGENTS.md
Rename resolveAppConfig.ts → resolve.ts and
resolveAppConfig.spec.ts → resolve.spec.ts to align with
the project's concise naming convention.
* fix: remove fragile reference-equality guard, add logging and docs
Remove appConfig !== baseConfig guard from all strategies and
requestPasswordReset. The guard relied on implicit cache-backend
identity semantics (in-memory Keyv returns same object reference)
that would silently break with Redis or cloned configs. The second
isEmailDomainAllowed call is a cheap synchronous check — always
running it is clearer and eliminates the coupling.
Add audit logging to requestPasswordReset domain blocks (base and
tenant), consistent with all auth strategies.
Extract duplicated error construction into makeDomainDeniedError().
Wrap resolveAppConfigForUser in requestPasswordReset with try/catch
to prevent DB errors from leaking to the client via the controller's
generic catch handler.
Document the dual tenantId propagation (ALS for DB isolation,
explicit param for cache key) in resolveAppConfigForUser JSDoc.
Add comment documenting the LDAP error-type ordering change
(cross-provider users from blocked domains now get 'domain not
allowed' instead of AUTH_FAILED).
Assert resolveAppConfigForUser is not called on LDAP provider
mismatch path.
* fix: return generic response for tenant domain block in password reset
Tenant-scoped domain rejection in requestPasswordReset now returns the
same generic "If an account with that email exists..." response instead
of an Error. This prevents user-enumeration: an attacker cannot
distinguish between "email not found" and "tenant blocks this domain"
by comparing HTTP responses.
The base-config fast-fail (pre-user-lookup) still returns an Error
since it fires before any user existence is revealed.
* docs: document phase 1 vs phase 2 domain check behavior in JSDoc
Phase 1 (base config, pre-findUser) intentionally returns Error/400
to reveal globally blocked domains without confirming user existence.
Phase 2 (tenant config, post-findUser) returns generic 200 to prevent
user-enumeration. This distinction is now explicit in the JSDoc.
2026-03-27 16:08:43 -04:00
|
|
|
const appConfig = user?.tenantId
|
|
|
|
|
? await resolveAppConfigForUser(getAppConfig, user)
|
|
|
|
|
: baseConfig;
|
|
|
|
|
|
|
|
|
|
if (!isEmailDomainAllowed(userEmail, appConfig?.registration?.allowedDomains)) {
|
|
|
|
|
logger.error(
|
|
|
|
|
`[SAML Strategy] Authentication blocked - email domain not allowed [Email: ${userEmail}]`,
|
|
|
|
|
);
|
|
|
|
|
return done(null, false, { message: 'Email domain not allowed' });
|
|
|
|
|
}
|
|
|
|
|
|
2025-05-30 00:00:58 +09:00
|
|
|
const fullName = getFullName(profile);
|
|
|
|
|
|
|
|
|
|
const username = convertToUsername(
|
|
|
|
|
getUserName(profile) || getGivenName(profile) || getEmail(profile),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!user) {
|
|
|
|
|
user = {
|
|
|
|
|
provider: 'saml',
|
|
|
|
|
samlId: profile.nameID,
|
|
|
|
|
username,
|
2025-09-10 23:13:39 -04:00
|
|
|
email: userEmail,
|
2025-05-30 00:00:58 +09:00
|
|
|
emailVerified: true,
|
|
|
|
|
name: fullName,
|
|
|
|
|
};
|
2025-08-26 12:10:18 -04:00
|
|
|
const balanceConfig = getBalanceConfig(appConfig);
|
2025-05-30 22:18:13 -04:00
|
|
|
user = await createUser(user, balanceConfig, true, true);
|
2025-05-30 00:00:58 +09:00
|
|
|
} else {
|
|
|
|
|
user.provider = 'saml';
|
|
|
|
|
user.samlId = profile.nameID;
|
|
|
|
|
user.username = username;
|
|
|
|
|
user.name = fullName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const picture = getPicture(profile);
|
|
|
|
|
if (picture && !user.avatar?.includes('manual=true')) {
|
|
|
|
|
const imageBuffer = await downloadImage(profile.picture);
|
|
|
|
|
if (imageBuffer) {
|
|
|
|
|
let fileName;
|
|
|
|
|
if (crypto) {
|
|
|
|
|
fileName = (await hashToken(profile.nameID)) + '.png';
|
|
|
|
|
} else {
|
|
|
|
|
fileName = profile.nameID + '.png';
|
|
|
|
|
}
|
|
|
|
|
|
2025-09-05 11:09:32 -04:00
|
|
|
const { saveBuffer } = getStrategyFunctions(
|
|
|
|
|
appConfig?.fileStrategy ?? process.env.CDN_PROVIDER,
|
|
|
|
|
);
|
2025-05-30 00:00:58 +09:00
|
|
|
const imagePath = await saveBuffer({
|
|
|
|
|
fileName,
|
|
|
|
|
userId: user._id.toString(),
|
|
|
|
|
buffer: imageBuffer,
|
|
|
|
|
});
|
|
|
|
|
user.avatar = imagePath ?? '';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
user = await updateUser(user._id, user);
|
|
|
|
|
|
|
|
|
|
logger.info(
|
|
|
|
|
`[samlStrategy] Login success SAML ID: ${user.samlId} | email: ${user.email} | username: ${user.username}`,
|
|
|
|
|
{
|
|
|
|
|
user: {
|
|
|
|
|
samlId: user.samlId,
|
|
|
|
|
username: user.username,
|
|
|
|
|
email: user.email,
|
|
|
|
|
name: user.name,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
done(null, user);
|
|
|
|
|
} catch (err) {
|
|
|
|
|
logger.error('[samlStrategy] Login failed', err);
|
|
|
|
|
done(err);
|
|
|
|
|
}
|
|
|
|
|
}),
|
|
|
|
|
);
|
|
|
|
|
} catch (err) {
|
|
|
|
|
logger.error('[samlStrategy]', err);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module.exports = { setupSaml, getCertificateContent };
|