mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-17 05:20:55 +00:00
* 🔐 fix: Apply Base Config Overrides Before Sign-In and Refuse Script Policy Links Sign-in decisions made before the user is known now read librechat.yaml plus the `__base__` override of the request's tenant, or of the deployment outside a tenant, and fail closed (`resolvePreAuthAppConfig`). Registration, the first phase of password reset and the first email-domain check of the LDAP, OpenID, SAML and social strategies use it. The second check applies the account's role overrides with or without a tenant, and a new account is checked against the role it will be created with before anything is inserted. OpenID checks again when the admin claim or role sync changes the role. Password reset issues no link when the account's config cannot be read. The signed-out `GET /api/config` serves Base `registration.socialLogins` and the pre-login interface fields (`resolvePreLoginAppConfig`), falling back to librechat.yaml when overrides cannot be read. `turnstile` becomes a base-only section, so Turnstile comes only from librechat.yaml. Config reads that merge documents stay in one tenant partition (`tenantPartition`, Mongoose binding `tenantPartitionFilter`): the active tenant's documents, or the tenantless ones outside a tenant. The config store's Mongoose binding reads, writes, lists and restores role documents, `__base__` included, in that partition, and its `listActive` draws every document from it; group and user documents stay addressed by id. Only a `list` with `acrossTenants` reads every partition, which `listConfigTombstones` uses so the startup MCP tombstone report still names each tenant's documents. The tenant-isolation conformance suite gains single-partition cases. Privacy policy and terms of service `externalUrl` must be http(s), `mailto:`, `tel:`, relative or blank (`isSafeLinkUrl`). Admin writes of another scheme are refused, a librechat.yaml link is dropped with a warning at load, a stored one is dropped at merge, and every payload and the client remove one that reaches them. The admin config meta reports `features.preAuthBaseOverrides: true`. * 🧪 test: Layer a Required-Field Override Through interface.currency Instead of Turnstile Turnstile is set in librechat.yaml only now, so profile overrides of it are skipped and the layering scenario could no longer see a role's Turnstile options completed by a user's site key. The scenario now layers `interface.currency`, whose `code` and `rate` are both required: the role stores only the rate, the user only the code, and /api/config serves both. * 🛂 fix: Admit a First OpenID Login Under Its Claimed Role Before Creating the Account The admin-role claim and role sync are now decided before a first-login OpenID account is created, and createUserOnce admits the email under that role's config, read in parallel with the USER role's, before inserting anything. A login the claimed role refuses creates no account and no start balance. Admitted logins are unchanged: the account is still created as USER (now explicitly), moved into the claimed role, re-checked and audited as before, with the claims decided once. An account a concurrent first login created gets the claims decided again for its own role and tenant.
146 lines
5.7 KiB
JavaScript
146 lines
5.7 KiB
JavaScript
const { FileSources } = require('librechat-data-provider');
|
|
const { getBalanceConfig, provisionSocialUser } = require('@librechat/api');
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
|
const { resizeAvatar } = require('~/server/services/Files/images/avatar');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
const { updateUser, getUserById, findBalanceByUser, createUserIfAbsent } = require('~/models');
|
|
|
|
/**
|
|
* Updates the avatar URL and email of an existing user. If the user's avatar URL does not include the query parameter
|
|
* '?manual=true', it updates the user's avatar with the provided URL. For local file storage, it directly updates
|
|
* the avatar URL, while for other storage types, it processes the avatar URL using the specified file strategy.
|
|
* Also updates the email if it has changed (e.g., when a Google Workspace email is updated).
|
|
*
|
|
* @param {IUser} oldUser - The existing user object that needs to be updated.
|
|
* @param {string} avatarUrl - The new avatar URL to be set for the user.
|
|
* @param {AppConfig} appConfig - The application configuration object.
|
|
* @param {string} [email] - Optional. The new email address to update if it has changed.
|
|
*
|
|
* @returns {Promise<void>}
|
|
* The function updates the user's avatar and/or email and saves the user object. It does not return any value.
|
|
*
|
|
* @throws {Error} Throws an error if there's an issue saving the updated user object.
|
|
*/
|
|
const handleExistingUser = async (oldUser, avatarUrl, appConfig, email) => {
|
|
const fileStrategy = appConfig?.fileStrategy ?? process.env.CDN_PROVIDER;
|
|
const isLocal = fileStrategy === FileSources.local;
|
|
const updates = {};
|
|
|
|
let updatedAvatar = false;
|
|
const hasManualFlag =
|
|
typeof oldUser?.avatar === 'string' && oldUser.avatar.includes('?manual=true');
|
|
|
|
if (avatarUrl && isLocal && (!oldUser?.avatar || !hasManualFlag)) {
|
|
updatedAvatar = avatarUrl;
|
|
} else if (avatarUrl && !isLocal && (!oldUser?.avatar || !hasManualFlag)) {
|
|
const userId = oldUser._id;
|
|
const resizedBuffer = await resizeAvatar({
|
|
userId,
|
|
input: avatarUrl,
|
|
});
|
|
const { processAvatar } = getStrategyFunctions(fileStrategy);
|
|
updatedAvatar = await processAvatar({ buffer: resizedBuffer, userId, manual: 'false' });
|
|
}
|
|
|
|
if (updatedAvatar) {
|
|
updates.avatar = updatedAvatar;
|
|
}
|
|
|
|
/** Update email if it has changed */
|
|
if (email && email.trim() !== oldUser.email) {
|
|
updates.email = email.trim();
|
|
}
|
|
|
|
if (Object.keys(updates).length > 0) {
|
|
await updateUser(oldUser._id, updates);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Processes a newly created social user's avatar through the file strategy (a local strategy keeps
|
|
* the provider URL) and returns the stored user.
|
|
*
|
|
* @param {string} newUserId - The new user's id.
|
|
* @param {string} avatarUrl - The provider's avatar URL.
|
|
* @param {AppConfig} appConfig - The application configuration object.
|
|
* @returns {Promise<User>}
|
|
*/
|
|
const finishNewSocialUser = async (newUserId, avatarUrl, appConfig) => {
|
|
const fileStrategy = appConfig?.fileStrategy ?? process.env.CDN_PROVIDER;
|
|
const isLocal = fileStrategy === FileSources.local;
|
|
|
|
if (avatarUrl && !isLocal) {
|
|
const resizedBuffer = await resizeAvatar({
|
|
userId: newUserId,
|
|
input: avatarUrl,
|
|
});
|
|
const { processAvatar } = getStrategyFunctions(fileStrategy);
|
|
const avatar = await processAvatar({
|
|
buffer: resizedBuffer,
|
|
userId: newUserId,
|
|
manual: 'false',
|
|
});
|
|
await updateUser(newUserId, { avatar });
|
|
}
|
|
|
|
return await getUserById(newUserId);
|
|
};
|
|
|
|
/**
|
|
* Creates a new user with the provided user details. If the file strategy is not local, the avatar URL is
|
|
* processed using the specified file strategy. The new user is saved to the database with the processed or
|
|
* original avatar URL. The account is admitted under the config of the role it is created with, so an email
|
|
* domain that config excludes fails the login before anything is created. When a concurrent first login
|
|
* created the account first, that account is handled as an existing user instead.
|
|
*
|
|
* @param {Object} params - The parameters object for user creation.
|
|
* @param {string} params.email - The email of the new user.
|
|
* @param {string} params.avatarUrl - The avatar URL of the new user.
|
|
* @param {string} params.provider - The provider of the user's account.
|
|
* @param {string} params.providerKey - The key to identify the provider in the user model.
|
|
* @param {string} params.providerId - The provider-specific ID of the user.
|
|
* @param {string} params.username - The username of the new user.
|
|
* @param {string} params.name - The name of the new user.
|
|
* @param {boolean} [params.emailVerified=false] - Optional. Indicates whether the user's email is verified. Defaults to false.
|
|
* @param {SocialUserLookup} params.lookup - The login's lookup, repeated when the insert loses a concurrent first login.
|
|
*
|
|
* @returns {Promise<User>}
|
|
* A promise that resolves to the newly created user object.
|
|
*
|
|
* @throws {Error} Throws an error if there's an issue creating or saving the new user object.
|
|
*/
|
|
const createSocialUser = async ({
|
|
email,
|
|
avatarUrl,
|
|
provider,
|
|
providerKey,
|
|
providerId,
|
|
username,
|
|
name,
|
|
emailVerified,
|
|
lookup,
|
|
}) =>
|
|
provisionSocialUser({
|
|
lookup,
|
|
newUser: {
|
|
email,
|
|
avatar: avatarUrl,
|
|
provider,
|
|
[providerKey]: providerId,
|
|
username,
|
|
name,
|
|
emailVerified,
|
|
},
|
|
getBalanceConfig,
|
|
getAppConfig,
|
|
createUserIfAbsent,
|
|
findBalanceByUser,
|
|
finishNewUser: (user, appConfig) => finishNewSocialUser(user._id, avatarUrl, appConfig),
|
|
refreshExistingUser: (user, accountConfig) =>
|
|
handleExistingUser(user, avatarUrl, accountConfig, email),
|
|
});
|
|
|
|
module.exports = {
|
|
handleExistingUser,
|
|
createSocialUser,
|
|
};
|