mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-16 21:08:17 +00:00
Some checks are pending
Backend Unit Tests / Build packages (push) Waiting to run
Backend Unit Tests / Codegraph select (push) Waiting to run
Backend Unit Tests / TypeScript type checks (push) Blocked by required conditions
Backend Unit Tests / Circular dependency checks (push) Waiting to run
Backend Unit Tests / Tests: api (shard 1/3) (push) Blocked by required conditions
Backend Unit Tests / Tests: api (shard 2/3) (push) Blocked by required conditions
Backend Unit Tests / Tests: api (shard 3/3) (push) Blocked by required conditions
Backend Unit Tests / Tests: data-provider (push) Blocked by required conditions
Backend Unit Tests / Tests: data-schemas (push) Blocked by required conditions
Backend Unit Tests / Tests: @librechat/api (shard 1/4) (push) Blocked by required conditions
Backend Unit Tests / Tests: @librechat/api (shard 2/4) (push) Blocked by required conditions
Backend Unit Tests / Tests: @librechat/api (shard 3/4) (push) Blocked by required conditions
Backend Unit Tests / Tests: @librechat/api (shard 4/4) (push) Blocked by required conditions
Codegraph E2E Votes / vote (full suite) (push) Waiting to run
Docker Dev Branch Images Build / publish (push) Waiting to run
Frontend Unit Tests / Client build recovery regression (push) Waiting to run
Frontend Unit Tests / Codegraph select (push) Waiting to run
Frontend Unit Tests / Build packages (push) Waiting to run
Frontend Unit Tests / TypeScript type checks (client) (push) Blocked by required conditions
Frontend Unit Tests / Tests: @librechat/client (push) Blocked by required conditions
Frontend Unit Tests / Tests: Ubuntu (shard 1/2) (push) Blocked by required conditions
Frontend Unit Tests / Tests: Ubuntu (shard 2/2) (push) Blocked by required conditions
Frontend Unit Tests / Vite build verification (push) Blocked by required conditions
Sync Locize Translations & Create Translation PR / Sync Translation Keys with Locize (push) Waiting to run
Sync Locize Translations & Create Translation PR / Create Translation PR on Version Published (push) Blocked by required conditions
* feat: enforce required two-factor authentication Require local and LDAP accounts to enroll in TOTP before they can use the app when ENFORCE_TWO_FACTOR_AUTHENTICATION is set. Sign-in, refresh, bearer verification, optional share auth and image authorization all route an unenrolled account into a staged setup flow, and every bearer credential minted before enrollment or a password reset is retired. Password reset retirement uses the existing credentialsChangedAt stamp, and commitPasswordReset clears any staged enrollment in the same write. Passkey sign-in follows the same enrollment gate as password sign-in. * test: cover passkey sign-in handing off to required enrollment * refactor: keep Mongoose user types out of two-factor auth contracts * fix: withdraw a minted session when its retirement recheck fails * fix: hold Agent API keys and the reset CLI to the required two-factor policy * fix: adopt a setup token handed off after the setup screen mounted * fix: move every tab that receives an enrollment hand-off into setup * fix: read the enrollment gate's retirement cutoff in system scope * fix: clear minted session cookies before the fallible session deletion * fix: adopt a setup token persisted before the setup screen subscribed
84 lines
2.8 KiB
JavaScript
84 lines
2.8 KiB
JavaScript
const { logger, runAsSystem } = require('@librechat/data-schemas');
|
|
const { SystemRoles } = require('librechat-data-provider');
|
|
const { Strategy: JwtStrategy, ExtractJwt } = require('passport-jwt');
|
|
const {
|
|
AGENT_TRIGGER_SCOPE,
|
|
isTokenRetired,
|
|
continueAfterBearerRetirement,
|
|
} = require('@librechat/api');
|
|
const { getUserById, updateUser } = require('~/models');
|
|
|
|
const AGENT_TRIGGER_ADMISSION_PATHS = ['/api/agents/chat/agents', '/api/agents/chat/steer/deliver'];
|
|
|
|
/** A trigger-scoped bearer is deliberately useless outside the two internal
|
|
* admission routes that the execution host calls. */
|
|
function isAgentTriggerAdmissionRequest(req) {
|
|
if (req?.method !== 'POST' || req?.headers?.['x-lc-agent-trigger'] !== '1') {
|
|
return false;
|
|
}
|
|
try {
|
|
const pathname = new URL(req.originalUrl ?? req.url ?? '', 'http://localhost').pathname;
|
|
return AGENT_TRIGGER_ADMISSION_PATHS.some((path) => pathname.endsWith(path));
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// JWT strategy
|
|
const jwtLogin = () =>
|
|
new JwtStrategy(
|
|
{
|
|
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
|
|
secretOrKey: process.env.JWT_SECRET,
|
|
passReqToCallback: true,
|
|
},
|
|
async (req, payload, done) => {
|
|
try {
|
|
if (payload?.scope === AGENT_TRIGGER_SCOPE && !isAgentTriggerAdmissionRequest(req)) {
|
|
done(null, false, { message: 'Agent trigger token is not valid for this endpoint' });
|
|
return;
|
|
}
|
|
const user = await runAsSystem(() =>
|
|
getUserById(
|
|
payload?.id,
|
|
'-password -__v -totpSecret -backupCodes +agentTriggerDeletionStartedAt',
|
|
),
|
|
);
|
|
if (user?.agentTriggerDeletionStartedAt != null) {
|
|
done(null, false, {
|
|
message: 'Account deletion is in progress',
|
|
code: 'ACCOUNT_DELETION_IN_PROGRESS',
|
|
});
|
|
return;
|
|
}
|
|
if (user) {
|
|
return await continueAfterBearerRetirement(
|
|
user,
|
|
{ issuedAt: payload?.iat, issuedAtMs: payload?.issuedAtMs },
|
|
'jwt',
|
|
payload?.id,
|
|
done,
|
|
(message) => logger.warn(message),
|
|
async () => {
|
|
user.id = user._id.toString();
|
|
/** Absent on the full doc means local user; null skips getUserPrincipals' fallback lookup */
|
|
user.idOnTheSource ??= null;
|
|
if (!user.role) {
|
|
user.role = SystemRoles.USER;
|
|
await runAsSystem(() => updateUser(user.id, { role: user.role }));
|
|
}
|
|
done(null, user);
|
|
},
|
|
isTokenRetired,
|
|
);
|
|
} else {
|
|
logger.warn('[jwtLogin] JwtStrategy => no user found: ' + payload?.id);
|
|
done(null, false);
|
|
}
|
|
} catch (err) {
|
|
done(err, false);
|
|
}
|
|
},
|
|
);
|
|
|
|
module.exports = jwtLogin;
|