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

* feat: integrate OpenID Connect support with token reuse
- Added `jwks-rsa` and `new-openid-client` dependencies for OpenID Connect functionality.
- Implemented OpenID token refresh logic in `AuthController`.
- Enhanced `LogoutController` to handle OpenID logout and session termination.
- Updated JWT authentication middleware to support OpenID token provider.
- Modified OAuth routes to accommodate OpenID authentication and token management.
- Created `setOpenIDAuthTokens` function to manage OpenID tokens in cookies.
- Upgraded OpenID strategy with user info fetching and token exchange protocol.
- Introduced `openIdJwtLogin` strategy for handling OpenID JWT tokens.
- Added caching mechanism for exchanged OpenID tokens.
- Updated configuration to include OpenID exchanged tokens cache key.
- updated .env.example to include the new env variables needed for the feature.
* fix: update return type in downloadImage documentation for clarity and fixed openIdJwtLogin env variables
* fix: update Jest configuration and tests for OpenID strategy integration
* fix: update OpenID strategy to include callback URL in setup
* fix: fix optionalJwtAuth middleware to support OpenID token reuse and improve currentUrl method in CustomOpenIDStrategy to override the dynamic host issue related to proxy (e.g. cloudfront)
* fix: fixed code formatting
* Fix: Add mocks for openid-client and passport strategy in Jest configuration to fix unit tests
* fix eslint errors: Format mock file openid-client.
* ✨ feat: Add PKCE support for OpenID and default handling in strategy setup
---------
Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com>
Co-authored-by: Ruben Talstra <RubenTalstra1211@outlook.com>
109 lines
2.8 KiB
JavaScript
109 lines
2.8 KiB
JavaScript
const fs = require('fs');
|
|
const ioredis = require('ioredis');
|
|
const KeyvRedis = require('@keyv/redis').default;
|
|
const { isEnabled } = require('~/server/utils');
|
|
const logger = require('~/config/winston');
|
|
|
|
const { REDIS_URI, USE_REDIS, USE_REDIS_CLUSTER, REDIS_CA, REDIS_KEY_PREFIX, REDIS_MAX_LISTENERS } =
|
|
process.env;
|
|
|
|
let keyvRedis;
|
|
const redis_prefix = REDIS_KEY_PREFIX || '';
|
|
const redis_max_listeners = Number(REDIS_MAX_LISTENERS) || 40;
|
|
|
|
function mapURI(uri) {
|
|
const regex =
|
|
/^(?:(?<scheme>\w+):\/\/)?(?:(?<user>[^:@]+)(?::(?<password>[^@]+))?@)?(?<host>[\w.-]+)(?::(?<port>\d{1,5}))?$/;
|
|
const match = uri.match(regex);
|
|
|
|
if (match) {
|
|
const { scheme, user, password, host, port } = match.groups;
|
|
|
|
return {
|
|
scheme: scheme || 'none',
|
|
user: user || null,
|
|
password: password || null,
|
|
host: host || null,
|
|
port: port || null,
|
|
};
|
|
} else {
|
|
const parts = uri.split(':');
|
|
if (parts.length === 2) {
|
|
return {
|
|
scheme: 'none',
|
|
user: null,
|
|
password: null,
|
|
host: parts[0],
|
|
port: parts[1],
|
|
};
|
|
}
|
|
|
|
return {
|
|
scheme: 'none',
|
|
user: null,
|
|
password: null,
|
|
host: uri,
|
|
port: null,
|
|
};
|
|
}
|
|
}
|
|
|
|
if (REDIS_URI && isEnabled(USE_REDIS)) {
|
|
let redisOptions = null;
|
|
/** @type {import('@keyv/redis').KeyvRedisOptions} */
|
|
let keyvOpts = {
|
|
useRedisSets: false,
|
|
keyPrefix: redis_prefix,
|
|
};
|
|
|
|
if (REDIS_CA) {
|
|
const ca = fs.readFileSync(REDIS_CA);
|
|
redisOptions = { tls: { ca } };
|
|
}
|
|
|
|
if (isEnabled(USE_REDIS_CLUSTER)) {
|
|
const hosts = REDIS_URI.split(',').map((item) => {
|
|
var value = mapURI(item);
|
|
|
|
return {
|
|
host: value.host,
|
|
port: value.port,
|
|
};
|
|
});
|
|
const cluster = new ioredis.Cluster(hosts, { redisOptions });
|
|
keyvRedis = new KeyvRedis(cluster, keyvOpts);
|
|
} else {
|
|
keyvRedis = new KeyvRedis(REDIS_URI, keyvOpts);
|
|
}
|
|
|
|
const pingInterval = setInterval(
|
|
() => {
|
|
logger.debug('KeyvRedis ping');
|
|
keyvRedis.client.ping().catch((err) => logger.error('Redis keep-alive ping failed:', err));
|
|
},
|
|
5 * 60 * 1000,
|
|
);
|
|
|
|
keyvRedis.on('ready', () => {
|
|
logger.info('KeyvRedis connection ready');
|
|
});
|
|
keyvRedis.on('reconnecting', () => {
|
|
logger.info('KeyvRedis connection reconnecting');
|
|
});
|
|
keyvRedis.on('end', () => {
|
|
logger.info('KeyvRedis connection ended');
|
|
});
|
|
keyvRedis.on('close', () => {
|
|
clearInterval(pingInterval);
|
|
logger.info('KeyvRedis connection closed');
|
|
});
|
|
keyvRedis.on('error', (err) => logger.error('KeyvRedis connection error:', err));
|
|
keyvRedis.setMaxListeners(redis_max_listeners);
|
|
logger.info(
|
|
'[Optional] Redis initialized. If you have issues, or seeing older values, disable it or flush cache to refresh values.',
|
|
);
|
|
} else {
|
|
logger.info('[Optional] Redis not initialized.');
|
|
}
|
|
|
|
module.exports = keyvRedis;
|