mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
158 lines
4.6 KiB
JavaScript
158 lines
4.6 KiB
JavaScript
const fs = require('fs');
|
|
const LdapStrategy = require('passport-ldapauth');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { isEnabled, getBalanceConfig } = require('@librechat/api');
|
|
const { SystemRoles, ErrorTypes } = require('librechat-data-provider');
|
|
const { createUser, findUser, updateUser, countUsers } = require('~/models');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
|
|
const {
|
|
LDAP_URL,
|
|
LDAP_BIND_DN,
|
|
LDAP_BIND_CREDENTIALS,
|
|
LDAP_USER_SEARCH_BASE,
|
|
LDAP_SEARCH_FILTER,
|
|
LDAP_CA_CERT_PATH,
|
|
LDAP_FULL_NAME,
|
|
LDAP_ID,
|
|
LDAP_USERNAME,
|
|
LDAP_EMAIL,
|
|
LDAP_TLS_REJECT_UNAUTHORIZED,
|
|
LDAP_STARTTLS,
|
|
} = process.env;
|
|
|
|
// Check required environment variables
|
|
if (!LDAP_URL || !LDAP_USER_SEARCH_BASE) {
|
|
module.exports = null;
|
|
}
|
|
|
|
const searchAttributes = [
|
|
'displayName',
|
|
'mail',
|
|
'uid',
|
|
'cn',
|
|
'name',
|
|
'commonname',
|
|
'givenName',
|
|
'sn',
|
|
'sAMAccountName',
|
|
];
|
|
|
|
if (LDAP_FULL_NAME) {
|
|
searchAttributes.push(...LDAP_FULL_NAME.split(','));
|
|
}
|
|
if (LDAP_ID) {
|
|
searchAttributes.push(LDAP_ID);
|
|
}
|
|
if (LDAP_USERNAME) {
|
|
searchAttributes.push(LDAP_USERNAME);
|
|
}
|
|
if (LDAP_EMAIL) {
|
|
searchAttributes.push(LDAP_EMAIL);
|
|
}
|
|
const rejectUnauthorized = isEnabled(LDAP_TLS_REJECT_UNAUTHORIZED);
|
|
const startTLS = isEnabled(LDAP_STARTTLS);
|
|
|
|
const ldapOptions = {
|
|
server: {
|
|
url: LDAP_URL,
|
|
bindDN: LDAP_BIND_DN,
|
|
bindCredentials: LDAP_BIND_CREDENTIALS,
|
|
searchBase: LDAP_USER_SEARCH_BASE,
|
|
searchFilter: LDAP_SEARCH_FILTER || 'mail={{username}}',
|
|
searchAttributes: [...new Set(searchAttributes)],
|
|
...(LDAP_CA_CERT_PATH && {
|
|
tlsOptions: {
|
|
rejectUnauthorized,
|
|
ca: (() => {
|
|
try {
|
|
return [fs.readFileSync(LDAP_CA_CERT_PATH)];
|
|
} catch (err) {
|
|
logger.error('[ldapStrategy]', 'Failed to read CA certificate', err);
|
|
throw err;
|
|
}
|
|
})(),
|
|
},
|
|
}),
|
|
...(startTLS && { starttls: true }),
|
|
},
|
|
usernameField: 'email',
|
|
passwordField: 'password',
|
|
};
|
|
|
|
const ldapLogin = new LdapStrategy(ldapOptions, async (userinfo, done) => {
|
|
if (!userinfo) {
|
|
return done(null, false, { message: 'Invalid credentials' });
|
|
}
|
|
|
|
try {
|
|
const ldapId =
|
|
(LDAP_ID && userinfo[LDAP_ID]) || userinfo.uid || userinfo.sAMAccountName || userinfo.mail;
|
|
|
|
let user = await findUser({ ldapId });
|
|
if (user && user.provider !== 'ldap') {
|
|
logger.info(
|
|
`[ldapStrategy] User ${user.email} already exists with provider ${user.provider}`,
|
|
);
|
|
return done(null, false, {
|
|
message: ErrorTypes.AUTH_FAILED,
|
|
});
|
|
}
|
|
|
|
const fullNameAttributes = LDAP_FULL_NAME && LDAP_FULL_NAME.split(',');
|
|
const fullName =
|
|
fullNameAttributes && fullNameAttributes.length > 0
|
|
? fullNameAttributes.map((attr) => userinfo[attr]).join(' ')
|
|
: userinfo.cn || userinfo.name || userinfo.commonname || userinfo.displayName;
|
|
|
|
const username =
|
|
(LDAP_USERNAME && userinfo[LDAP_USERNAME]) || userinfo.givenName || userinfo.mail;
|
|
|
|
const mail = (LDAP_EMAIL && userinfo[LDAP_EMAIL]) || userinfo.mail || username + '@ldap.local';
|
|
|
|
if (!userinfo.mail && !(LDAP_EMAIL && userinfo[LDAP_EMAIL])) {
|
|
logger.warn(
|
|
'[ldapStrategy]',
|
|
`No valid email attribute found in LDAP userinfo. Using fallback email: ${username}@ldap.local`,
|
|
`LDAP_EMAIL env var: ${LDAP_EMAIL || 'not set'}`,
|
|
`Available userinfo attributes: ${Object.keys(userinfo).join(', ')}`,
|
|
'Full userinfo:',
|
|
JSON.stringify(userinfo, null, 2),
|
|
);
|
|
}
|
|
|
|
if (!user) {
|
|
const isFirstRegisteredUser = (await countUsers()) === 0;
|
|
const role = isFirstRegisteredUser ? SystemRoles.ADMIN : SystemRoles.USER;
|
|
user = {
|
|
provider: 'ldap',
|
|
ldapId,
|
|
username,
|
|
email: mail,
|
|
emailVerified: true, // The ldap server administrator should verify the email
|
|
name: fullName,
|
|
role,
|
|
};
|
|
const appConfig = await getAppConfig({ role: user?.role });
|
|
const balanceConfig = getBalanceConfig(appConfig);
|
|
const userId = await createUser(user, balanceConfig);
|
|
user._id = userId;
|
|
} else {
|
|
// Users registered in LDAP are assumed to have their user information managed in LDAP,
|
|
// so update the user information with the values registered in LDAP
|
|
user.provider = 'ldap';
|
|
user.ldapId = ldapId;
|
|
user.email = mail;
|
|
user.username = username;
|
|
user.name = fullName;
|
|
}
|
|
|
|
user = await updateUser(user._id, user);
|
|
done(null, user);
|
|
} catch (err) {
|
|
logger.error('[ldapStrategy]', err);
|
|
done(err);
|
|
}
|
|
});
|
|
|
|
module.exports = ldapLogin;
|