mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-08-04 14:57:42 +00:00
Address the six lifecycle/concurrency merge blockers plus three contained
correctness items with deterministic race/failure tests.
MB1 revision/claim fencing: add a per-claim claimToken on Schedule, stamped
by claimDueSchedule/acquireManualRunLease and rotated on every owner edit.
Every worker-side write (disable/advance/release, misfire/exception advance)
is fenced on it, and a new revalidateClaim gate runs as the last check before
the loopback POST, so an owner disable/delete/edit or a lease-expiry re-claim
between claim and fire supersedes the fire instead of dispatching or clobbering.
MB2 deletion quiescing: schedule delete is now soft-delete + drain
(markScheduleDeleting disables, rotates the token, hides it, aborts in-flight
jobs; the reconciler erases once no run is active). Account deletion quiesces
all of a user's schedules before the message/conversation cascade.
MB3 atomic HITL resume reservation: a partial unique index enforces one active
run per schedule in the DB. reserveScheduledResume promotes the paused run and
verifies fireConcurrency BEFORE the approval is consumed, replacing the
non-atomic check-then-promote that could start two concurrent runs.
MB4 immutable generation identity: getJobStatus returns the job's
scheduleId/scheduledFor, and reconcile/clearReconciledJob require an identity
match so a replacement turn reusing the conversationId can't be finalized or
have its hash deleted as this run.
MB5 abort evidence: abortScheduledJob is identity-guarded, skips already-terminal
jobs, and preserves the job for reconcile before recording interrupted.
MB6 topology gate: isJobStoreShared reads the live stream backend
(GenerationJobManager.isRedis) combined with the clustered flag, not USE_REDIS,
so a clustered in-memory store is correctly treated as unshared.
C1 preserve inherited schedule limits under a boolean schedules override
(resolution folds it to {...base, use}). C2 atomic maxPerUser via a drift-free
{user, slot} partial unique index. C3 attachment-retention retry + rollback.
301 lines
10 KiB
JavaScript
301 lines
10 KiB
JavaScript
const mockGetUserById = jest.fn();
|
|
const mockDeleteMessages = jest.fn();
|
|
const mockDeleteAllUserSessions = jest.fn();
|
|
const mockDeleteUserById = jest.fn();
|
|
const mockDeleteAllSharedLinks = jest.fn();
|
|
const mockDeleteAllSharedLinksWithCleanup = jest.fn();
|
|
const mockDeletePresets = jest.fn();
|
|
const mockDeleteUserKey = jest.fn();
|
|
const mockDeleteConvos = jest.fn();
|
|
const mockDeleteFiles = jest.fn();
|
|
const mockGetFiles = jest.fn();
|
|
const mockUpdateUserPlugins = jest.fn();
|
|
const mockUpdateUser = jest.fn();
|
|
const mockFindToken = jest.fn();
|
|
const mockVerifyOTPOrBackupCode = jest.fn();
|
|
const mockDeleteUserPluginAuth = jest.fn();
|
|
const mockProcessDeleteRequest = jest.fn();
|
|
const mockDeleteToolCalls = jest.fn();
|
|
const mockDeleteUserAgents = jest.fn();
|
|
const mockDeleteUserPrompts = jest.fn();
|
|
const mockDeleteUserSkills = jest.fn();
|
|
|
|
jest.mock('@librechat/data-schemas', () => ({
|
|
logger: { error: jest.fn(), info: jest.fn() },
|
|
webSearchKeys: [],
|
|
}));
|
|
|
|
jest.mock('librechat-data-provider', () => ({
|
|
Tools: {},
|
|
CacheKeys: {},
|
|
Constants: { mcp_delimiter: '::', mcp_prefix: 'mcp_' },
|
|
FileSources: {},
|
|
}));
|
|
|
|
jest.mock('@librechat/api', () => ({
|
|
MCPOAuthHandler: {},
|
|
MCPTokenStorage: {},
|
|
normalizeHttpError: jest.fn(),
|
|
extractWebSearchEnvVars: jest.fn(),
|
|
needsRefresh: jest.fn(),
|
|
getNewS3URL: jest.fn(),
|
|
deleteAllSharedLinksWithCleanup: (...args) => mockDeleteAllSharedLinksWithCleanup(...args),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Schedules', () => ({
|
|
quiesceUserSchedules: jest.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
jest.mock('~/models', () => ({
|
|
deleteAllUserSessions: (...args) => mockDeleteAllUserSessions(...args),
|
|
deleteAllSharedLinks: (...args) => mockDeleteAllSharedLinks(...args),
|
|
updateUserPlugins: (...args) => mockUpdateUserPlugins(...args),
|
|
deleteUserById: (...args) => mockDeleteUserById(...args),
|
|
deleteMessages: (...args) => mockDeleteMessages(...args),
|
|
deletePresets: (...args) => mockDeletePresets(...args),
|
|
deleteUserKey: (...args) => mockDeleteUserKey(...args),
|
|
getUserById: (...args) => mockGetUserById(...args),
|
|
deleteConvos: (...args) => mockDeleteConvos(...args),
|
|
deleteFiles: (...args) => mockDeleteFiles(...args),
|
|
updateUser: (...args) => mockUpdateUser(...args),
|
|
findToken: (...args) => mockFindToken(...args),
|
|
getFiles: (...args) => mockGetFiles(...args),
|
|
deleteToolCalls: (...args) => mockDeleteToolCalls(...args),
|
|
deleteUserAgents: (...args) => mockDeleteUserAgents(...args),
|
|
deleteUserPrompts: (...args) => mockDeleteUserPrompts(...args),
|
|
deleteUserSkills: (...args) => mockDeleteUserSkills(...args),
|
|
deleteSchedulesByUser: jest.fn().mockResolvedValue(undefined),
|
|
deleteTransactions: jest.fn(),
|
|
deleteBalances: jest.fn(),
|
|
deleteAllAgentApiKeys: jest.fn(),
|
|
deleteAssistants: jest.fn(),
|
|
deleteConversationTags: jest.fn(),
|
|
deleteAllUserMemories: jest.fn(),
|
|
deleteActions: jest.fn(),
|
|
deleteTokens: jest.fn(),
|
|
removeUserFromAllGroups: jest.fn(),
|
|
deleteAclEntries: jest.fn(),
|
|
getSoleOwnedResourceIds: jest.fn().mockResolvedValue([]),
|
|
}));
|
|
|
|
jest.mock('~/server/services/PluginService', () => ({
|
|
updateUserPluginAuth: jest.fn(),
|
|
deleteUserPluginAuth: (...args) => mockDeleteUserPluginAuth(...args),
|
|
}));
|
|
|
|
jest.mock('~/server/services/twoFactorService', () => ({
|
|
verifyOTPOrBackupCode: (...args) => mockVerifyOTPOrBackupCode(...args),
|
|
}));
|
|
|
|
jest.mock('~/server/services/AuthService', () => ({
|
|
verifyEmail: jest.fn(),
|
|
resendVerificationEmail: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/config', () => ({
|
|
getMCPManager: jest.fn(),
|
|
getFlowStateManager: jest.fn(),
|
|
getMCPServersRegistry: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Config/getCachedTools', () => ({
|
|
invalidateCachedTools: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Files/process', () => ({
|
|
processDeleteRequest: (...args) => mockProcessDeleteRequest(...args),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Config', () => ({
|
|
getAppConfig: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/cache', () => ({
|
|
getLogStores: jest.fn(),
|
|
}));
|
|
|
|
const { deleteUserController } = require('~/server/controllers/UserController');
|
|
|
|
function createRes() {
|
|
const res = {};
|
|
res.status = jest.fn().mockReturnValue(res);
|
|
res.json = jest.fn().mockReturnValue(res);
|
|
res.send = jest.fn().mockReturnValue(res);
|
|
return res;
|
|
}
|
|
|
|
function stubDeletionMocks() {
|
|
mockDeleteMessages.mockResolvedValue();
|
|
mockDeleteAllUserSessions.mockResolvedValue();
|
|
mockDeleteUserKey.mockResolvedValue();
|
|
mockDeletePresets.mockResolvedValue();
|
|
mockDeleteConvos.mockResolvedValue();
|
|
mockDeleteUserPluginAuth.mockResolvedValue();
|
|
mockDeleteUserById.mockResolvedValue();
|
|
mockDeleteAllSharedLinks.mockResolvedValue();
|
|
mockDeleteAllSharedLinksWithCleanup.mockResolvedValue({ deletedCount: 0 });
|
|
mockGetFiles.mockResolvedValue([]);
|
|
mockProcessDeleteRequest.mockResolvedValue({ deletedFileIds: [], failedFileIds: [] });
|
|
mockDeleteFiles.mockResolvedValue();
|
|
mockDeleteToolCalls.mockResolvedValue();
|
|
mockDeleteUserAgents.mockResolvedValue();
|
|
mockDeleteUserPrompts.mockResolvedValue();
|
|
mockDeleteUserSkills.mockResolvedValue(0);
|
|
}
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
stubDeletionMocks();
|
|
});
|
|
|
|
describe('deleteUserController - 2FA enforcement', () => {
|
|
it('proceeds with deletion when 2FA is not enabled', async () => {
|
|
const req = { user: { id: 'user1', _id: 'user1', email: 'a@b.com' }, body: {} };
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue({ _id: 'user1', twoFactorEnabled: false });
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(200);
|
|
expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
expect(mockDeleteMessages).toHaveBeenCalled();
|
|
expect(mockDeleteUserAgents).toHaveBeenCalledWith('user1');
|
|
expect(mockDeleteUserPrompts).toHaveBeenCalledWith('user1');
|
|
expect(mockDeleteUserSkills).toHaveBeenCalledWith('user1');
|
|
expect(mockVerifyOTPOrBackupCode).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('proceeds with deletion when user has no 2FA record', async () => {
|
|
const req = { user: { id: 'user1', _id: 'user1', email: 'a@b.com' }, body: {} };
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue(null);
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(200);
|
|
expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
});
|
|
|
|
it('returns error when 2FA is enabled and verification fails with 400', async () => {
|
|
const req = { user: { id: 'user1', _id: 'user1' }, body: {} };
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue({
|
|
_id: 'user1',
|
|
twoFactorEnabled: true,
|
|
totpSecret: 'enc-secret',
|
|
});
|
|
mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: false, status: 400 });
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(res.status).toHaveBeenCalledWith(400);
|
|
expect(mockDeleteMessages).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('returns 401 when 2FA is enabled and invalid TOTP token provided', async () => {
|
|
const existingUser = {
|
|
_id: 'user1',
|
|
twoFactorEnabled: true,
|
|
totpSecret: 'enc-secret',
|
|
};
|
|
const req = { user: { id: 'user1', _id: 'user1' }, body: { token: 'wrong' } };
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue(existingUser);
|
|
mockVerifyOTPOrBackupCode.mockResolvedValue({
|
|
verified: false,
|
|
status: 401,
|
|
message: 'Invalid token or backup code',
|
|
});
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
|
|
user: existingUser,
|
|
token: 'wrong',
|
|
backupCode: undefined,
|
|
});
|
|
expect(res.status).toHaveBeenCalledWith(401);
|
|
expect(res.json).toHaveBeenCalledWith({ message: 'Invalid token or backup code' });
|
|
expect(mockDeleteMessages).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('returns 401 when 2FA is enabled and invalid backup code provided', async () => {
|
|
const existingUser = {
|
|
_id: 'user1',
|
|
twoFactorEnabled: true,
|
|
totpSecret: 'enc-secret',
|
|
backupCodes: [],
|
|
};
|
|
const req = { user: { id: 'user1', _id: 'user1' }, body: { backupCode: 'bad-code' } };
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue(existingUser);
|
|
mockVerifyOTPOrBackupCode.mockResolvedValue({
|
|
verified: false,
|
|
status: 401,
|
|
message: 'Invalid token or backup code',
|
|
});
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
|
|
user: existingUser,
|
|
token: undefined,
|
|
backupCode: 'bad-code',
|
|
});
|
|
expect(res.status).toHaveBeenCalledWith(401);
|
|
expect(mockDeleteMessages).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('deletes account when valid TOTP token provided with 2FA enabled', async () => {
|
|
const existingUser = {
|
|
_id: 'user1',
|
|
twoFactorEnabled: true,
|
|
totpSecret: 'enc-secret',
|
|
};
|
|
const req = {
|
|
user: { id: 'user1', _id: 'user1', email: 'a@b.com' },
|
|
body: { token: '123456' },
|
|
};
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue(existingUser);
|
|
mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
|
|
user: existingUser,
|
|
token: '123456',
|
|
backupCode: undefined,
|
|
});
|
|
expect(res.status).toHaveBeenCalledWith(200);
|
|
expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
expect(mockDeleteMessages).toHaveBeenCalled();
|
|
});
|
|
|
|
it('deletes account when valid backup code provided with 2FA enabled', async () => {
|
|
const existingUser = {
|
|
_id: 'user1',
|
|
twoFactorEnabled: true,
|
|
totpSecret: 'enc-secret',
|
|
backupCodes: [{ codeHash: 'h1', used: false }],
|
|
};
|
|
const req = {
|
|
user: { id: 'user1', _id: 'user1', email: 'a@b.com' },
|
|
body: { backupCode: 'valid-code' },
|
|
};
|
|
const res = createRes();
|
|
mockGetUserById.mockResolvedValue(existingUser);
|
|
mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
|
|
|
|
await deleteUserController(req, res);
|
|
|
|
expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
|
|
user: existingUser,
|
|
token: undefined,
|
|
backupCode: 'valid-code',
|
|
});
|
|
expect(res.status).toHaveBeenCalledWith(200);
|
|
expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
expect(mockDeleteMessages).toHaveBeenCalled();
|
|
});
|
|
});
|