fix(upload): enforce the chunked-upload cap on bytes received, not declared
The init route checked the client-declared fileSize against general_max_file_size_mb, but nothing checked what then came through the chunk route: a client could declare `fileSize: 1` and stream any amount, and completeUpload only logged the size mismatch before handing the merged file on. The cap the earlier commit added at init was therefore a gate with no fence. The service now carries the cap from init and enforces it on the running byte total per chunk (aborting the upload once crossed, since the chunks on disk are already over the limit), rejects chunk indices outside the announced range, and re-checks the merged file as a backstop. Both routes answer 413/400 for these instead of a blanket 500.
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
* - a file over the configured cap is rejected with a 400 naming the limit
|
||||
* - the chunked-upload init route honours the same cap (it would otherwise
|
||||
* be a trivial bypass of the multipart route's cap)
|
||||
* - the chunk route enforces the cap on the bytes actually received, so a
|
||||
* client can't declare `fileSize: 1` at init and stream past the limit
|
||||
* - a file under the cap still gets past the size gate
|
||||
* - the limit is read per request, so an admin raising it takes effect
|
||||
*/
|
||||
@@ -127,6 +129,20 @@ describe('admin upload per-file size limit (general_max_file_size_mb)', () => {
|
||||
expect(res.body.error).toBe('File too large. Maximum size is 1 MB per file.');
|
||||
});
|
||||
|
||||
it('rejects chunk bytes over the limit regardless of the declared fileSize', async () => {
|
||||
await setLimitMb(1);
|
||||
const initRes = await postChunkedInit(1);
|
||||
expect(initRes.status).toBe(200);
|
||||
|
||||
const res = await request(app)
|
||||
.post(`/api/admin/photos/${eventId}/chunked-upload/${initRes.body.uploadId}/chunk/0`)
|
||||
.set('Authorization', `Bearer ${adminToken}`)
|
||||
.set('Content-Type', 'application/octet-stream')
|
||||
.send(Buffer.alloc(2 * 1024 * 1024, 0x41));
|
||||
expect(res.status).toBe(413);
|
||||
expect(res.body.error).toBe('File too large. Maximum size is 1 MB per file.');
|
||||
});
|
||||
|
||||
it('lets a file under the limit past the size gate', async () => {
|
||||
await setLimitMb(1);
|
||||
// Junk bytes, so it still fails downstream on the content check — that is
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
/**
|
||||
* The chunked-upload per-file cap has to hold on the bytes actually received,
|
||||
* not on the client-declared `fileSize` the init route validates. Declaring
|
||||
* `fileSize: 1` and then streaming 10 GB through the chunk route was a
|
||||
* complete bypass of general_max_file_size_mb; the merge step only logged a
|
||||
* size mismatch and processed the file anyway.
|
||||
*/
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
const fs = require('fs').promises;
|
||||
|
||||
process.env.STORAGE_PATH = path.join(os.tmpdir(), `picpeak-chunk-cap-test-${process.pid}`);
|
||||
|
||||
const chunkedUpload = require('../../src/services/chunkedUploadService');
|
||||
|
||||
const MB = 1024 * 1024;
|
||||
|
||||
const init = (overrides = {}) => chunkedUpload.initializeUpload({
|
||||
filename: 'clip.mp4',
|
||||
fileSize: 1,
|
||||
mimeType: 'video/mp4',
|
||||
eventId: 1,
|
||||
totalChunks: 2,
|
||||
maxFileSizeBytes: 1 * MB,
|
||||
...overrides,
|
||||
});
|
||||
|
||||
describe('chunkedUploadService per-file size cap', () => {
|
||||
afterAll(async () => {
|
||||
await fs.rm(process.env.STORAGE_PATH, { recursive: true, force: true }).catch(() => {});
|
||||
});
|
||||
|
||||
it('rejects a single chunk over the cap even when the declared fileSize is tiny', async () => {
|
||||
const { uploadId } = await init();
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(2 * MB)))
|
||||
.rejects.toMatchObject({ code: 'FILE_TOO_LARGE', statusCode: 413 });
|
||||
// Aborted, not merely rejected: the upload can no longer be completed.
|
||||
expect(chunkedUpload.getUploadStatus(uploadId)).toBeNull();
|
||||
});
|
||||
|
||||
it('rejects when the running total across chunks crosses the cap', async () => {
|
||||
const { uploadId } = await init();
|
||||
await chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(0.75 * MB));
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 1, Buffer.alloc(0.5 * MB)))
|
||||
.rejects.toMatchObject({ code: 'FILE_TOO_LARGE' });
|
||||
});
|
||||
|
||||
it('counts a re-sent chunk once, not twice', async () => {
|
||||
const { uploadId } = await init();
|
||||
await chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(0.6 * MB));
|
||||
// Same index again — replaces the earlier bytes, so the total stays 0.6 MB.
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(0.6 * MB))).resolves.toBeTruthy();
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 1, Buffer.alloc(0.3 * MB))).resolves.toBeTruthy();
|
||||
});
|
||||
|
||||
it('rejects chunk indices outside the announced range', async () => {
|
||||
const { uploadId } = await init();
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 2, Buffer.alloc(10)))
|
||||
.rejects.toMatchObject({ code: 'INVALID_CHUNK', statusCode: 400 });
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, -1, Buffer.alloc(10)))
|
||||
.rejects.toMatchObject({ code: 'INVALID_CHUNK' });
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, NaN, Buffer.alloc(10)))
|
||||
.rejects.toMatchObject({ code: 'INVALID_CHUNK' });
|
||||
});
|
||||
|
||||
it('merges an upload under the cap and reports the real size', async () => {
|
||||
const { uploadId } = await init();
|
||||
await chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(400 * 1024, 0x41));
|
||||
await chunkedUpload.uploadChunk(uploadId, 1, Buffer.alloc(400 * 1024, 0x42));
|
||||
const merged = await chunkedUpload.completeUpload(uploadId);
|
||||
expect(merged.size).toBe(800 * 1024);
|
||||
await fs.rm(merged.tempDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it('applies no cap when none is given', async () => {
|
||||
const { uploadId } = await init({ maxFileSizeBytes: undefined, totalChunks: 1 });
|
||||
await expect(chunkedUpload.uploadChunk(uploadId, 0, Buffer.alloc(3 * MB))).resolves.toBeTruthy();
|
||||
await chunkedUpload.abortUpload(uploadId);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user