mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-27 21:58:51 +01:00
Some checks failed
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Has been cancelled
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Has been cancelled
Publish `@librechat/client` to NPM / build-and-publish (push) Has been cancelled
Publish `librechat-data-provider` to NPM / build (push) Has been cancelled
Publish `@librechat/data-schemas` to NPM / build-and-publish (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile, librechat-dev, node) (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile.multi, librechat-dev-api, api-build) (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Sync Translation Keys with Locize (push) Has been cancelled
Publish `librechat-data-provider` to NPM / publish-npm (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Create Translation PR on Version Published (push) Has been cancelled
* fix: Header and Environment Variable Handling Bug from #9931 * refactor: Remove warning log for missing tokens in extractOpenIDTokenInfo function * feat: Enhance resolveNestedObject function for improved placeholder processing - Added a new function `resolveNestedObject` to recursively process nested objects, replacing placeholders in string values while preserving the original structure. - Updated `createTestUser` to use `IUser` type and modified user ID generation. - Added comprehensive unit tests for `resolveNestedObject` to cover various scenarios, including nested structures, arrays, and custom user variables. - Improved type handling in `processMCPEnv` to ensure correct processing of mixed numeric and placeholder values. * refactor: Remove unnecessary manipulation of Bedrock options introduced in #9931 - Eliminated the resolveHeaders function call from the getOptions method in options.js, as it was no longer necessary for processing additional model request fields. - This change simplifies the code and improves maintainability.
358 lines
11 KiB
TypeScript
358 lines
11 KiB
TypeScript
import { extractEnvVariable } from 'librechat-data-provider';
|
|
import type { MCPOptions } from 'librechat-data-provider';
|
|
import type { IUser } from '@librechat/data-schemas';
|
|
import type { RequestBody } from '~/types';
|
|
import { extractOpenIDTokenInfo, processOpenIDPlaceholders, isOpenIDTokenValid } from './oidc';
|
|
|
|
/**
|
|
* List of allowed user fields that can be used in MCP environment variables.
|
|
* These are non-sensitive string/boolean fields from the IUser interface.
|
|
*/
|
|
const ALLOWED_USER_FIELDS = [
|
|
'id',
|
|
'name',
|
|
'username',
|
|
'email',
|
|
'provider',
|
|
'role',
|
|
'googleId',
|
|
'facebookId',
|
|
'openidId',
|
|
'samlId',
|
|
'ldapId',
|
|
'githubId',
|
|
'discordId',
|
|
'appleId',
|
|
'emailVerified',
|
|
'twoFactorEnabled',
|
|
'termsAccepted',
|
|
] as const;
|
|
|
|
type AllowedUserField = (typeof ALLOWED_USER_FIELDS)[number];
|
|
type SafeUser = Pick<IUser, AllowedUserField>;
|
|
|
|
/**
|
|
* Creates a safe user object containing only allowed fields.
|
|
* Preserves federatedTokens for OpenID token template variable resolution.
|
|
*
|
|
* @param user - The user object to extract safe fields from
|
|
* @returns A new object containing only allowed fields plus federatedTokens if present
|
|
*/
|
|
export function createSafeUser(
|
|
user: IUser | null | undefined,
|
|
): Partial<SafeUser> & { federatedTokens?: unknown } {
|
|
if (!user) {
|
|
return {};
|
|
}
|
|
|
|
const safeUser: Partial<SafeUser> & { federatedTokens?: unknown } = {};
|
|
for (const field of ALLOWED_USER_FIELDS) {
|
|
if (field in user) {
|
|
safeUser[field] = user[field];
|
|
}
|
|
}
|
|
|
|
if ('federatedTokens' in user) {
|
|
safeUser.federatedTokens = user.federatedTokens;
|
|
}
|
|
|
|
return safeUser;
|
|
}
|
|
|
|
/**
|
|
* List of allowed request body fields that can be used in header placeholders.
|
|
* These are common fields from the request body that are safe to expose in headers.
|
|
*/
|
|
const ALLOWED_BODY_FIELDS = ['conversationId', 'parentMessageId', 'messageId'] as const;
|
|
|
|
/**
|
|
* Processes a string value to replace user field placeholders
|
|
* @param value - The string value to process
|
|
* @param user - The user object
|
|
* @returns The processed string with placeholders replaced
|
|
*/
|
|
function processUserPlaceholders(value: string, user?: IUser): string {
|
|
if (!user || typeof value !== 'string') {
|
|
return value;
|
|
}
|
|
|
|
for (const field of ALLOWED_USER_FIELDS) {
|
|
const placeholder = `{{LIBRECHAT_USER_${field.toUpperCase()}}}`;
|
|
|
|
if (typeof value !== 'string' || !value.includes(placeholder)) {
|
|
continue;
|
|
}
|
|
|
|
const fieldValue = user[field as keyof IUser];
|
|
|
|
// Skip replacement if field doesn't exist in user object
|
|
if (!(field in user)) {
|
|
continue;
|
|
}
|
|
|
|
// Special case for 'id' field: skip if undefined or empty
|
|
if (field === 'id' && (fieldValue === undefined || fieldValue === '')) {
|
|
continue;
|
|
}
|
|
|
|
const replacementValue = fieldValue == null ? '' : String(fieldValue);
|
|
value = value.replace(new RegExp(placeholder, 'g'), replacementValue);
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Replaces request body field placeholders within a string.
|
|
* Recognized placeholders: `{{LIBRECHAT_BODY_<FIELD>}}` where `<FIELD>` ∈ ALLOWED_BODY_FIELDS.
|
|
* If a body field is absent or null/undefined, it is replaced with an empty string.
|
|
*
|
|
* @param value - The string value to process
|
|
* @param body - The request body object
|
|
* @returns The processed string with placeholders replaced
|
|
*/
|
|
function processBodyPlaceholders(value: string, body: RequestBody): string {
|
|
// Type guard: ensure value is a string
|
|
if (typeof value !== 'string') {
|
|
return value;
|
|
}
|
|
|
|
for (const field of ALLOWED_BODY_FIELDS) {
|
|
const placeholder = `{{LIBRECHAT_BODY_${field.toUpperCase()}}}`;
|
|
if (!value.includes(placeholder)) {
|
|
continue;
|
|
}
|
|
|
|
const fieldValue = body[field];
|
|
const replacementValue = fieldValue == null ? '' : String(fieldValue);
|
|
value = value.replace(new RegExp(placeholder, 'g'), replacementValue);
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Processes a single string value by replacing various types of placeholders
|
|
* @param originalValue - The original string value to process
|
|
* @param customUserVars - Optional custom user variables to replace placeholders
|
|
* @param user - Optional user object for replacing user field placeholders
|
|
* @param body - Optional request body object for replacing body field placeholders
|
|
* @returns The processed string with all placeholders replaced
|
|
*/
|
|
function processSingleValue({
|
|
originalValue,
|
|
customUserVars,
|
|
user,
|
|
body = undefined,
|
|
}: {
|
|
originalValue: string;
|
|
customUserVars?: Record<string, string>;
|
|
user?: IUser;
|
|
body?: RequestBody;
|
|
}): string {
|
|
// Type guard: ensure we're working with a string
|
|
if (typeof originalValue !== 'string') {
|
|
return String(originalValue);
|
|
}
|
|
|
|
let value = originalValue;
|
|
|
|
if (customUserVars) {
|
|
for (const [varName, varVal] of Object.entries(customUserVars)) {
|
|
/** Escaped varName for use in regex to avoid issues with special characters */
|
|
const escapedVarName = varName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
const placeholderRegex = new RegExp(`\\{\\{${escapedVarName}\\}\\}`, 'g');
|
|
value = value.replace(placeholderRegex, varVal);
|
|
}
|
|
}
|
|
|
|
value = processUserPlaceholders(value, user);
|
|
|
|
const openidTokenInfo = extractOpenIDTokenInfo(user);
|
|
if (openidTokenInfo && isOpenIDTokenValid(openidTokenInfo)) {
|
|
value = processOpenIDPlaceholders(value, openidTokenInfo);
|
|
}
|
|
|
|
if (body) {
|
|
value = processBodyPlaceholders(value, body);
|
|
}
|
|
|
|
value = extractEnvVariable(value);
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Recursively processes an object to replace environment variables in string values
|
|
* @param params - Processing parameters
|
|
* @param params.options - The MCP options to process
|
|
* @param params.user - The user object containing all user fields
|
|
* @param params.customUserVars - vars that user set in settings
|
|
* @param params.body - the body of the request that is being processed
|
|
* @returns - The processed object with environment variables replaced
|
|
*/
|
|
export function processMCPEnv(params: {
|
|
options: Readonly<MCPOptions>;
|
|
user?: IUser;
|
|
customUserVars?: Record<string, string>;
|
|
body?: RequestBody;
|
|
}): MCPOptions {
|
|
const { options, user, customUserVars, body } = params;
|
|
|
|
if (options === null || options === undefined) {
|
|
return options;
|
|
}
|
|
|
|
const newObj: MCPOptions = structuredClone(options);
|
|
|
|
if ('env' in newObj && newObj.env) {
|
|
const processedEnv: Record<string, string> = {};
|
|
for (const [key, originalValue] of Object.entries(newObj.env)) {
|
|
processedEnv[key] = processSingleValue({ originalValue, customUserVars, user, body });
|
|
}
|
|
newObj.env = processedEnv;
|
|
}
|
|
|
|
if ('args' in newObj && newObj.args) {
|
|
const processedArgs: string[] = [];
|
|
for (const originalValue of newObj.args) {
|
|
processedArgs.push(processSingleValue({ originalValue, customUserVars, user, body }));
|
|
}
|
|
newObj.args = processedArgs;
|
|
}
|
|
|
|
// Process headers if they exist (for WebSocket, SSE, StreamableHTTP types)
|
|
// Note: `env` and `headers` are on different branches of the MCPOptions union type.
|
|
if ('headers' in newObj && newObj.headers) {
|
|
const processedHeaders: Record<string, string> = {};
|
|
for (const [key, originalValue] of Object.entries(newObj.headers)) {
|
|
processedHeaders[key] = processSingleValue({ originalValue, customUserVars, user, body });
|
|
}
|
|
newObj.headers = processedHeaders;
|
|
}
|
|
|
|
// Process URL if it exists (for WebSocket, SSE, StreamableHTTP types)
|
|
if ('url' in newObj && newObj.url) {
|
|
newObj.url = processSingleValue({ originalValue: newObj.url, customUserVars, user, body });
|
|
}
|
|
|
|
// Process OAuth configuration if it exists (for all transport types)
|
|
if ('oauth' in newObj && newObj.oauth) {
|
|
const processedOAuth: Record<string, boolean | string | string[] | undefined> = {};
|
|
for (const [key, originalValue] of Object.entries(newObj.oauth)) {
|
|
// Only process string values for environment variables
|
|
// token_exchange_method is an enum and shouldn't be processed
|
|
if (typeof originalValue === 'string') {
|
|
processedOAuth[key] = processSingleValue({ originalValue, customUserVars, user, body });
|
|
} else {
|
|
processedOAuth[key] = originalValue;
|
|
}
|
|
}
|
|
newObj.oauth = processedOAuth;
|
|
}
|
|
|
|
return newObj;
|
|
}
|
|
|
|
/**
|
|
* Recursively processes a value, replacing placeholders in strings while preserving structure
|
|
* @param value - The value to process (can be string, number, boolean, array, object, etc.)
|
|
* @param options - Processing options
|
|
* @returns The processed value with the same structure
|
|
*/
|
|
function processValue(
|
|
value: unknown,
|
|
options: {
|
|
customUserVars?: Record<string, string>;
|
|
user?: IUser;
|
|
body?: RequestBody;
|
|
},
|
|
): unknown {
|
|
if (typeof value === 'string') {
|
|
return processSingleValue({
|
|
originalValue: value,
|
|
customUserVars: options.customUserVars,
|
|
user: options.user,
|
|
body: options.body,
|
|
});
|
|
}
|
|
|
|
if (Array.isArray(value)) {
|
|
return value.map((item) => processValue(item, options));
|
|
}
|
|
|
|
if (value !== null && typeof value === 'object') {
|
|
const processed: Record<string, unknown> = {};
|
|
for (const [key, val] of Object.entries(value)) {
|
|
processed[key] = processValue(val, options);
|
|
}
|
|
return processed;
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Recursively resolves placeholders in a nested object structure while preserving types.
|
|
* Only processes string values - leaves numbers, booleans, arrays, and nested objects intact.
|
|
*
|
|
* @param options - Configuration object
|
|
* @param options.obj - The object to process
|
|
* @param options.user - Optional user object for replacing user field placeholders
|
|
* @param options.body - Optional request body object for replacing body field placeholders
|
|
* @param options.customUserVars - Optional custom user variables to replace placeholders
|
|
* @returns The processed object with placeholders replaced in string values
|
|
*/
|
|
export function resolveNestedObject<T = unknown>(options?: {
|
|
obj: T | undefined;
|
|
user?: Partial<IUser> | { id: string };
|
|
body?: RequestBody;
|
|
customUserVars?: Record<string, string>;
|
|
}): T {
|
|
const { obj, user, body, customUserVars } = options ?? {};
|
|
|
|
if (!obj) {
|
|
return obj as T;
|
|
}
|
|
|
|
return processValue(obj, {
|
|
customUserVars,
|
|
user: user as IUser,
|
|
body,
|
|
}) as T;
|
|
}
|
|
|
|
/**
|
|
* Resolves header values by replacing user placeholders, body variables, custom variables, and environment variables.
|
|
*
|
|
* @param options - Optional configuration object.
|
|
* @param options.headers - The headers object to process.
|
|
* @param options.user - Optional user object for replacing user field placeholders (can be partial with just id).
|
|
* @param options.body - Optional request body object for replacing body field placeholders.
|
|
* @param options.customUserVars - Optional custom user variables to replace placeholders.
|
|
* @returns The processed headers with all placeholders replaced.
|
|
*/
|
|
export function resolveHeaders(options?: {
|
|
headers: Record<string, string> | undefined;
|
|
user?: Partial<IUser> | { id: string };
|
|
body?: RequestBody;
|
|
customUserVars?: Record<string, string>;
|
|
}) {
|
|
const { headers, user, body, customUserVars } = options ?? {};
|
|
const inputHeaders = headers ?? {};
|
|
|
|
const resolvedHeaders: Record<string, string> = { ...inputHeaders };
|
|
|
|
if (inputHeaders && typeof inputHeaders === 'object' && !Array.isArray(inputHeaders)) {
|
|
Object.keys(inputHeaders).forEach((key) => {
|
|
resolvedHeaders[key] = processSingleValue({
|
|
originalValue: inputHeaders[key],
|
|
customUserVars,
|
|
user: user as IUser,
|
|
body,
|
|
});
|
|
});
|
|
}
|
|
|
|
return resolvedHeaders;
|
|
}
|