mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-06-10 01:44:44 +00:00
Some checks are pending
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Waiting to run
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Waiting to run
GitNexus Index / index (push) Waiting to run
GitNexus Index / post-index (push) Blocked by required conditions
* feat: support data retention for normal chats Add retentionMode config variable supporting "all" and "temporary" values. When "all" is set, data retention applies to all chats, not just temporary ones. Adds isTemporary field to conversations for proper filtering. Adapted to new TS method files in packages/data-schemas since upstream moved models out of api/models/. Based on danny-avila/LibreChat#10532 Co-Authored-By: WhammyLeaf <233105313+WhammyLeaf@users.noreply.github.com> (cherry picked from commit30109e90b0) * feat: extend data retention to files, tool calls, and shared links Add expiredAt field and TTL indexes to file, toolCall, and share schemas. Set expiredAt on tool calls, shared links, and file uploads when retentionMode is "all" or chat is temporary. (cherry picked from commit48973752d3) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: lint/test (cherry picked from commit310c514e6a) * fix: address code review feedback for data retention PR Critical: - Fix BookmarkMenu crash: restore optional chaining on conversation - Fix migration hazard: backward-compatible sidebar filter that also checks expiredAt for documents without isTemporary field Major: - Add logging to getRetentionExpiry error path, align with tools.js - Add tests for retentionMode: ALL in saveConvo and saveMessage - Fix share route: apply expiredAt for temporary chats too by querying the conversation's isTemporary flag server-side - Add assertions for getRetentionExpiry mocks in process tests Minor: - Fix ChatRoute isTemporaryChat to be strictly boolean via Boolean() - Fix stale test description (expired -> temporary) - Comment out retentionMode default in example yaml - Simplify verbose if/else to isTemporary === true - Add compound index on { user: 1, isTemporary: 1 } - Remove narrating comment from process.spec.js Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> (cherry picked from commit6bad535f90) * chore: fix typescript (cherry picked from commit826527a46b) * fix: lint (cherry picked from commit77817e80ea) * fix: use mockSanitizeArtifactPath in retention test The 'getRetentionExpiry is called with the request object' test referenced an undefined `mockSanitizeFilename` identifier, breaking both lint (no-undef) and the test suite. Use the existing `mockSanitizeArtifactPath` mock that the surrounding tests already use, since `processCodeOutput` calls `sanitizeArtifactPath` (not `sanitizeFilename`) before invoking `getRetentionExpiry`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commit52ea2da66d) * fix: forward isTemporary from client for retention on file uploads and tool calls Server-side `getRetentionExpiry` (file uploads) and the tool-call controller both read `req.body.isTemporary`, but the file upload multipart form and the tool-call payload did not include that field. In `retentionMode: temporary` (default), files uploaded and tool calls created from temporary chats were therefore retained indefinitely. Forward the Recoil `isTemporary` flag in both client paths so the existing server checks can fire correctly. `ToolParams` gains an optional `isTemporary` field. Addresses Codex P1 review feedback on PR #29. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commit7e937df05a) * test: stub store.isTemporary in useFileHandling test mocks Previous commit added `useRecoilValue(store.isTemporary)` to the hook. The test file mocks `~/store` with only `ephemeralAgentByConvoId` and does not stub `useRecoilValue`, so all 7 cases threw "Invalid argument to useRecoilValue: expected an atom or selector but got undefined". Add a stub default export with `isTemporary` and a `useRecoilValue` mock returning `false`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commiteb1609537d) * fix: harden data retention semantics * fix: provide sweep request context for expired files * fix: preserve temporary flags in all-retention updates * fix: honor assistant versions in retention sweeps * fix: retain non-temporary flags in all mode * fix: hide expired retained records * fix: propagate retained conversation expiry * fix: refresh meili retention cutoff * fix: prevent overlapping file sweeps * fix: show legacy retained conversations * fix: index legacy retained records * fix: harden retention cleanup edge cases * fix: count failed file storage sweeps * fix: preserve legacy temporary retention * fix: assign retention sweep worker deterministically * fix: hide expired shared links on reads * fix: prevent retention refresh after parent expiry * fix: break code output retention import cycle * fix: harden retention review findings * fix: ignore expired share duplicates * fix: reject expired retained share creation * fix: harden retention review edge cases * fix: address retention audit findings * fix: enforce expired conversation shares in all retention * fix: scope temporary upload flag to chat files * fix: address retention review findings * fix: address codex retention review findings * fix: tighten missing storage detection * test: remove unused file process spec bindings --------- Co-authored-by: WhammyLeaf <233105313+WhammyLeaf@users.noreply.github.com> Co-authored-by: Aron Gates <aron@muonspace.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
172 lines
6.4 KiB
JavaScript
172 lines
6.4 KiB
JavaScript
jest.mock('uuid', () => ({ v4: jest.fn(() => 'mock-uuid') }));
|
|
|
|
jest.mock('@librechat/data-schemas', () => ({
|
|
logger: { warn: jest.fn(), debug: jest.fn(), error: jest.fn() },
|
|
}));
|
|
|
|
jest.mock('@librechat/agents', () => ({
|
|
getCodeBaseURL: jest.fn(() => 'http://localhost:8000'),
|
|
}));
|
|
|
|
const mockSanitizeArtifactPath = jest.fn();
|
|
const mockFlattenArtifactPath = jest.fn((name) => name.replace(/\//g, '__'));
|
|
|
|
const mockAxios = jest.fn().mockResolvedValue({
|
|
data: Buffer.from('file-content'),
|
|
});
|
|
mockAxios.post = jest.fn();
|
|
|
|
jest.mock('@librechat/api', () => {
|
|
const http = require('http');
|
|
const https = require('https');
|
|
return {
|
|
logAxiosError: jest.fn(),
|
|
getBasePath: jest.fn(() => ''),
|
|
sanitizeArtifactPath: mockSanitizeArtifactPath,
|
|
flattenArtifactPath: mockFlattenArtifactPath,
|
|
createAxiosInstance: jest.fn(() => mockAxios),
|
|
getCodeApiAuthHeaders: jest.fn(async () => ({})),
|
|
classifyCodeArtifact: jest.fn(() => 'other'),
|
|
extractCodeArtifactText: jest.fn(async () => null),
|
|
/* `processCodeOutput` calls this to derive the trust flag persisted
|
|
* on `IMongoFile.textFormat` — Codex P1 review on PR #12934. The
|
|
* mock returns null in lockstep with the null `text` above so
|
|
* downstream consumers don't see a phantom format. */
|
|
getExtractedTextFormat: jest.fn(() => null),
|
|
getStorageMetadata: jest.fn(() => ({})),
|
|
/* Pass-through `withTimeout`: this suite asserts traversal sanitization,
|
|
* not deferred preview timing. */
|
|
withTimeout: async (promise) => promise,
|
|
/* These traversal cases all use non-office filenames — keep the
|
|
* inline (non-finalize) path so existing assertions on a single
|
|
* createFile call hold. */
|
|
hasOfficeHtmlPath: jest.fn(() => false),
|
|
/* Identity-helper stub mirroring `packages/api/src/files/code/identity.ts`.
|
|
* `processCodeOutput` calls this for every output download URL;
|
|
* traversal cases don't care about the query shape, just that it
|
|
* returns something concatable. */
|
|
buildCodeEnvDownloadQuery: jest.fn(({ kind, id, version }) => {
|
|
const params = new URLSearchParams({ kind, id });
|
|
if (version != null) params.set('version', String(version));
|
|
return `?${params.toString()}`;
|
|
}),
|
|
codeServerHttpAgent: new http.Agent({ keepAlive: false }),
|
|
codeServerHttpsAgent: new https.Agent({ keepAlive: false }),
|
|
};
|
|
});
|
|
|
|
jest.mock('librechat-data-provider', () => ({
|
|
...jest.requireActual('librechat-data-provider'),
|
|
mergeFileConfig: jest.fn(() => ({ serverFileSizeLimit: 100 * 1024 * 1024 })),
|
|
getEndpointFileConfig: jest.fn(() => ({
|
|
fileSizeLimit: 100 * 1024 * 1024,
|
|
supportedMimeTypes: ['*/*'],
|
|
})),
|
|
fileConfig: { checkType: jest.fn(() => true) },
|
|
}));
|
|
|
|
jest.mock('~/models', () => ({
|
|
createFile: jest.fn().mockResolvedValue({}),
|
|
getFiles: jest.fn().mockResolvedValue([]),
|
|
updateFile: jest.fn(),
|
|
claimCodeFile: jest.fn().mockResolvedValue({ file_id: 'mock-uuid', usage: 0 }),
|
|
}));
|
|
|
|
const mockSaveBuffer = jest.fn().mockResolvedValue('/uploads/user123/mock-uuid__output.csv');
|
|
|
|
jest.mock('~/server/services/Files/strategies', () => ({
|
|
getStrategyFunctions: jest.fn(() => ({
|
|
saveBuffer: mockSaveBuffer,
|
|
})),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Files/permissions', () => ({
|
|
filterFilesByAgentAccess: jest.fn().mockResolvedValue([]),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Files/images/convert', () => ({
|
|
convertImage: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/server/utils', () => ({
|
|
determineFileType: jest.fn().mockResolvedValue({ mime: 'text/csv' }),
|
|
}));
|
|
|
|
jest.mock('~/server/services/Files/retention', () => ({
|
|
getRetentionExpiry: jest.fn(() => ({})),
|
|
}));
|
|
|
|
const { getRetentionExpiry } = require('~/server/services/Files/retention');
|
|
const { createFile } = require('~/models');
|
|
const { processCodeOutput } = require('../process');
|
|
|
|
const baseParams = {
|
|
req: {
|
|
user: { id: 'user123', tenantId: 'tenantA' },
|
|
config: {
|
|
fileStrategy: 'local',
|
|
imageOutputType: 'webp',
|
|
fileConfig: {},
|
|
},
|
|
},
|
|
id: 'code-file-id',
|
|
apiKey: 'test-key',
|
|
toolCallId: 'tool-1',
|
|
conversationId: 'conv-1',
|
|
messageId: 'msg-1',
|
|
session_id: 'session-1',
|
|
};
|
|
|
|
describe('processCodeOutput path traversal protection', () => {
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
test('sanitizeArtifactPath is called with the raw artifact name', async () => {
|
|
mockSanitizeArtifactPath.mockReturnValueOnce('output.csv');
|
|
await processCodeOutput({ ...baseParams, name: 'output.csv' });
|
|
expect(mockSanitizeArtifactPath).toHaveBeenCalledWith('output.csv');
|
|
});
|
|
|
|
test('sanitized name is used in saveBuffer fileName (and flattened to a single component)', async () => {
|
|
mockSanitizeArtifactPath.mockReturnValueOnce('sanitized-name.txt');
|
|
await processCodeOutput({ ...baseParams, name: '../../../tmp/poc.txt' });
|
|
|
|
expect(mockSanitizeArtifactPath).toHaveBeenCalledWith('../../../tmp/poc.txt');
|
|
const call = mockSaveBuffer.mock.calls[0][0];
|
|
/* `flattenArtifactPath` is identity for already-flat names; the assert
|
|
* is against the storage-key composition (`<file_id>__<flat>`). */
|
|
expect(call.fileName).toBe('mock-uuid__sanitized-name.txt');
|
|
});
|
|
|
|
test('sanitized name is stored as filename in the file record', async () => {
|
|
mockSanitizeArtifactPath.mockReturnValueOnce('safe-output.csv');
|
|
await processCodeOutput({ ...baseParams, name: 'unsafe/../../output.csv' });
|
|
|
|
const fileArg = createFile.mock.calls[0][0];
|
|
expect(fileArg.filename).toBe('safe-output.csv');
|
|
expect(fileArg.tenantId).toBe('tenantA');
|
|
});
|
|
|
|
test('getRetentionExpiry is called with the request object', async () => {
|
|
mockSanitizeArtifactPath.mockReturnValueOnce('output.csv');
|
|
await processCodeOutput({ ...baseParams, name: 'output.csv' });
|
|
expect(getRetentionExpiry).toHaveBeenCalledWith(baseParams.req);
|
|
});
|
|
|
|
test('sanitized name is used for image file records', async () => {
|
|
const { convertImage } = require('~/server/services/Files/images/convert');
|
|
convertImage.mockResolvedValueOnce({
|
|
filepath: '/images/user123/mock-uuid.webp',
|
|
bytes: 100,
|
|
});
|
|
|
|
mockSanitizeArtifactPath.mockReturnValueOnce('safe-chart.png');
|
|
await processCodeOutput({ ...baseParams, name: '../../../chart.png' });
|
|
|
|
expect(mockSanitizeArtifactPath).toHaveBeenCalledWith('../../../chart.png');
|
|
const fileArg = createFile.mock.calls[0][0];
|
|
expect(fileArg.filename).toBe('safe-chart.png');
|
|
expect(fileArg.tenantId).toBe('tenantA');
|
|
});
|
|
});
|