mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-21 23:26:34 +01:00
🛂 fix: Reject OpenID Email Fallback When Stored openidId Mismatches Token Sub (#12312)
* 🔐 fix: Reject OpenID email fallback when stored openidId mismatches token sub When `findOpenIDUser` falls back to email lookup after the primary `openidId`/`idOnTheSource` query fails, it now rejects any user whose stored `openidId` differs from the incoming JWT subject claim. This closes an account-takeover vector where a valid IdP JWT containing a victim's email but a different `sub` could authenticate as the victim when OPENID_REUSE_TOKENS is enabled. The migration path (user has no `openidId` yet) is unaffected. * test: Validate openidId mismatch guard in email fallback path Update `findOpenIDUser` unit tests to assert that email-based lookups returning a user with a different `openidId` are rejected with AUTH_FAILED. Add matching integration test in `openIdJwtStrategy.spec` exercising the full verify callback with the real `findOpenIDUser`. * 🔐 fix: Remove redundant `openidId` truthiness check from mismatch guard The `&& openidId` middle term in the guard condition caused it to be bypassed when the incoming token `sub` was empty or undefined. Since the JS callers can pass `payload?.sub` (which may be undefined), this created a path where the guard never fired and the email fallback returned the victim's account. Removing the term ensures the guard rejects whenever the stored openidId differs from the incoming value, regardless of whether the incoming value is falsy. * test: Cover falsy openidId bypass and openidStrategy mismatch rejection Add regression test for the guard bypass when `openidId` is an empty string and the email lookup finds a user with a stored openidId. Add integration test in openidStrategy.spec.js exercising the mismatch rejection through the full processOpenIDAuth callback, ensuring both OIDC paths (JWT reuse and standard callback) are covered. Restore intent-documenting comment on the no-provider fixture.
This commit is contained in:
parent
39f5f83a8a
commit
11ab5f6ee5
4 changed files with 133 additions and 23 deletions
|
|
@ -271,6 +271,32 @@ describe('openIdJwtStrategy – OPENID_EMAIL_CLAIM', () => {
|
|||
expect(user).toBe(false);
|
||||
});
|
||||
|
||||
it('should reject login when email fallback finds user with mismatched openidId', async () => {
|
||||
const emailMatchWithDifferentSub = {
|
||||
_id: 'user-id-2',
|
||||
provider: 'openid',
|
||||
openidId: 'different-sub',
|
||||
email: payload.email,
|
||||
role: SystemRoles.USER,
|
||||
};
|
||||
|
||||
findUser.mockImplementation(async (query) => {
|
||||
if (query.$or) {
|
||||
return null;
|
||||
}
|
||||
if (query.email === payload.email) {
|
||||
return emailMatchWithDifferentSub;
|
||||
}
|
||||
return null;
|
||||
});
|
||||
|
||||
const req = { headers: { authorization: 'Bearer tok' }, session: {} };
|
||||
const { user, info } = await invokeVerify(req, payload);
|
||||
|
||||
expect(user).toBe(false);
|
||||
expect(info).toEqual({ message: 'auth_failed' });
|
||||
});
|
||||
|
||||
it('should trim whitespace from OPENID_EMAIL_CLAIM', async () => {
|
||||
process.env.OPENID_EMAIL_CLAIM = ' upn ';
|
||||
findUser.mockResolvedValue(null);
|
||||
|
|
|
|||
|
|
@ -356,6 +356,33 @@ describe('setupOpenId', () => {
|
|||
expect(updateUser).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should block login when email fallback finds user with mismatched openidId', async () => {
|
||||
const existingUser = {
|
||||
_id: 'existingUserId',
|
||||
provider: 'openid',
|
||||
openidId: 'different-sub-claim',
|
||||
email: tokenset.claims().email,
|
||||
username: 'existinguser',
|
||||
name: 'Existing User',
|
||||
};
|
||||
findUser.mockImplementation(async (query) => {
|
||||
if (query.$or) {
|
||||
return null;
|
||||
}
|
||||
if (query.email === tokenset.claims().email) {
|
||||
return existingUser;
|
||||
}
|
||||
return null;
|
||||
});
|
||||
|
||||
const result = await validate(tokenset);
|
||||
|
||||
expect(result.user).toBe(false);
|
||||
expect(result.details.message).toBe(ErrorTypes.AUTH_FAILED);
|
||||
expect(createUser).not.toHaveBeenCalled();
|
||||
expect(updateUser).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should enforce the required role and reject login if missing', async () => {
|
||||
// Arrange – simulate a token without the required role.
|
||||
jwtDecode.mockReturnValue({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue