mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 09:36:08 +00:00
A reservation id was never a secret and could not have been one. An upload token is base64url(payload) followed by its signature, so a client can read every claim out of its own token, and the two R2 init routes hand their reservation ids to the client outright. The asset route takes a reservation id from the request body and deleted it on the strength of that id and the billed user alone, and every hold an account owns is billed to the same user. So a caller could start a Bunny upload, read the id out of the token they were just given, quote it while attaching a one byte image or even a bare YouTube link, and have the quota handed back while the upload carried on. Repeat and a trial worth three gigabytes uploads as much as it likes for as long as Bunny takes to report a figure of its own. Signing the id rather than handing it over bought nothing, because signing is not hiding. A hold now records what it was opened for and is only ever consumed by that flow, so naming one is no longer enough to drop it. Guests hold against the workspace owner's quota rather than their own and had no way to give it back: the release was gated on being signed in. Declaring a size and walking away cost the guest nothing and cost the owner their whole remaining allowance for two hours. The guest grant now carries the reservation and the declared size, bound to the Bunny video as well as to ours, so cancelling gives the quota back and costs them the upload it stood for. What a guest can hold without cancelling lapses in half an hour rather than two hours. The in-transaction fallback check counted the account's Bunny storage as zero on a Bunny upload, because the figure was only prefetched for R2 providers and that branch was unreachable for Bunny until this PR made it reachable. On an account whose storage is all Bunny that was a check that could not fail. It is prefetched for every provider that can reach the fallback now.
224 lines
8.2 KiB
TypeScript
224 lines
8.2 KiB
TypeScript
// Exercises lib/r2-upload-session.ts, the bookkeeping either side of a direct
|
|
// upload.
|
|
//
|
|
// Small module, but the `where` clause on the cancel is load-bearing in two
|
|
// directions: it must not let a caller cancel a session that is not theirs to
|
|
// cancel, and it must actually match the session they do own, because the
|
|
// r2-init DELETE route releases the quota reservation only when the update
|
|
// reports a row. A cancel that quietly matches nothing leaves the reservation
|
|
// pinned for its whole TTL.
|
|
|
|
import { describe, expect, it } from 'vitest';
|
|
import { randomUUID } from 'crypto';
|
|
import { db } from '@/lib/db';
|
|
import { UPLOAD_RESERVATION_PURPOSES } from '@/lib/storage-quota';
|
|
import { cancelR2UploadSession, createR2UploadSession } from '@/lib/r2-upload-session';
|
|
import { seedProject } from '../factories';
|
|
|
|
const HOUR_MS = 60 * 60 * 1000;
|
|
|
|
async function newSession(
|
|
overrides: { expiresAt?: Date; multipartUploadId?: string | null; reservationId?: string } = {}
|
|
) {
|
|
const scenario = await seedProject();
|
|
const fileId = randomUUID();
|
|
const session = await createR2UploadSession({
|
|
userId: scenario.owner.id,
|
|
projectId: scenario.project.id,
|
|
billedUserId: scenario.owner.id,
|
|
objectKey: `videos/${fileId}.mp4`,
|
|
thumbnailObjectKey: `images/${fileId}.jpg`,
|
|
declaredSizeBytes: BigInt(4096),
|
|
contentType: 'video/mp4',
|
|
reservationId: overrides.reservationId ?? null,
|
|
uploadJti: randomUUID(),
|
|
expiresAt: overrides.expiresAt ?? new Date(Date.now() + HOUR_MS),
|
|
...(overrides.multipartUploadId === undefined
|
|
? {}
|
|
: { multipartUploadId: overrides.multipartUploadId }),
|
|
});
|
|
return { scenario, session, fileId };
|
|
}
|
|
|
|
describe('createR2UploadSession', () => {
|
|
it('writes an INITIATED row carrying every field the finalizer reads back', async () => {
|
|
const scenario = await seedProject();
|
|
const fileId = randomUUID();
|
|
const uploadJti = randomUUID();
|
|
const expiresAt = new Date(Date.now() + HOUR_MS);
|
|
|
|
const created = await createR2UploadSession({
|
|
userId: scenario.owner.id,
|
|
projectId: scenario.project.id,
|
|
billedUserId: scenario.owner.id,
|
|
objectKey: `videos/${fileId}.mp4`,
|
|
thumbnailObjectKey: `images/${fileId}.jpg`,
|
|
declaredSizeBytes: BigInt(123_456),
|
|
contentType: 'video/webm',
|
|
reservationId: null,
|
|
uploadJti,
|
|
expiresAt,
|
|
});
|
|
|
|
const row = await db.videoUploadSession.findUniqueOrThrow({ where: { id: created.id } });
|
|
expect(row.status).toBe('INITIATED');
|
|
expect(row.userId).toBe(scenario.owner.id);
|
|
expect(row.projectId).toBe(scenario.project.id);
|
|
expect(row.billedUserId).toBe(scenario.owner.id);
|
|
expect(row.objectKey).toBe(`videos/${fileId}.mp4`);
|
|
expect(row.thumbnailObjectKey).toBe(`images/${fileId}.jpg`);
|
|
expect(row.declaredSizeBytes).toBe(BigInt(123_456));
|
|
expect(row.contentType).toBe('video/webm');
|
|
expect(row.uploadJti).toBe(uploadJti);
|
|
expect(row.expiresAt.getTime()).toBe(expiresAt.getTime());
|
|
expect(row.reservationId).toBeNull();
|
|
expect(row.consumedAt).toBeNull();
|
|
});
|
|
|
|
// The field is optional on the input but the column is not nullable-by-
|
|
// accident: a single-shot PUT must store null rather than undefined, because
|
|
// the complete route branches on it to decide whether to assemble parts.
|
|
it('stores a null multipart id when none is supplied', async () => {
|
|
const { session } = await newSession();
|
|
|
|
expect(session.multipartUploadId).toBeNull();
|
|
});
|
|
|
|
it('stores an explicit null multipart id as null', async () => {
|
|
const { session } = await newSession({ multipartUploadId: null });
|
|
|
|
expect(session.multipartUploadId).toBeNull();
|
|
});
|
|
|
|
it('records the multipart upload id when the upload is chunked', async () => {
|
|
const { session } = await newSession({ multipartUploadId: 'multipart-upload-id-1' });
|
|
|
|
expect(session.multipartUploadId).toBe('multipart-upload-id-1');
|
|
});
|
|
|
|
it('links the quota reservation the caller already took', async () => {
|
|
const scenario = await seedProject();
|
|
const reservation = await db.uploadReservation.create({
|
|
data: {
|
|
billedUserId: scenario.owner.id,
|
|
sizeBytes: BigInt(4096),
|
|
purpose: UPLOAD_RESERVATION_PURPOSES.R2_VIDEO,
|
|
expiresAt: new Date(Date.now() + HOUR_MS),
|
|
},
|
|
});
|
|
const fileId = randomUUID();
|
|
|
|
const created = await createR2UploadSession({
|
|
userId: scenario.owner.id,
|
|
projectId: scenario.project.id,
|
|
billedUserId: scenario.owner.id,
|
|
objectKey: `videos/${fileId}.mp4`,
|
|
thumbnailObjectKey: `images/${fileId}.jpg`,
|
|
declaredSizeBytes: BigInt(4096),
|
|
contentType: 'video/mp4',
|
|
reservationId: reservation.id,
|
|
uploadJti: randomUUID(),
|
|
expiresAt: new Date(Date.now() + HOUR_MS),
|
|
});
|
|
|
|
expect(created.reservationId).toBe(reservation.id);
|
|
});
|
|
|
|
// objectKey is unique in the schema, which is what stops two sessions from
|
|
// ever pointing at the same object and racing each other's cleanup.
|
|
it('refuses a second session for the same object key', async () => {
|
|
const { scenario, fileId } = await newSession();
|
|
|
|
await expect(
|
|
createR2UploadSession({
|
|
userId: scenario.owner.id,
|
|
projectId: scenario.project.id,
|
|
billedUserId: scenario.owner.id,
|
|
objectKey: `videos/${fileId}.mp4`,
|
|
thumbnailObjectKey: `images/${fileId}.jpg`,
|
|
declaredSizeBytes: BigInt(4096),
|
|
contentType: 'video/mp4',
|
|
reservationId: null,
|
|
uploadJti: randomUUID(),
|
|
expiresAt: new Date(Date.now() + HOUR_MS),
|
|
})
|
|
).rejects.toThrow();
|
|
});
|
|
});
|
|
|
|
describe('cancelR2UploadSession', () => {
|
|
it('flips an INITIATED session to CANCELLED and stamps consumedAt', async () => {
|
|
const { session } = await newSession();
|
|
|
|
const result = await cancelR2UploadSession(session.id);
|
|
|
|
expect(result.count).toBe(1);
|
|
const row = await db.videoUploadSession.findUniqueOrThrow({ where: { id: session.id } });
|
|
expect(row.status).toBe('CANCELLED');
|
|
expect(row.consumedAt).toBeInstanceOf(Date);
|
|
});
|
|
|
|
it('matches nothing on a second cancel, so the route cannot double-release', async () => {
|
|
const { session } = await newSession();
|
|
await cancelR2UploadSession(session.id);
|
|
|
|
const result = await cancelR2UploadSession(session.id);
|
|
|
|
expect(result.count).toBe(0);
|
|
});
|
|
|
|
it('refuses to cancel a session that was already finalized', async () => {
|
|
const { session } = await newSession();
|
|
await db.videoUploadSession.update({
|
|
where: { id: session.id },
|
|
data: { status: 'FINALIZED' },
|
|
});
|
|
|
|
const result = await cancelR2UploadSession(session.id);
|
|
|
|
expect(result.count).toBe(0);
|
|
expect(
|
|
(await db.videoUploadSession.findUniqueOrThrow({ where: { id: session.id } })).status
|
|
).toBe('FINALIZED');
|
|
});
|
|
|
|
// An `expiresAt: { gt: now }` clause used to make this match zero rows once a session
|
|
// lapsed, so it stayed INITIATED with a null consumedAt for good. The r2-init DELETE
|
|
// route releases the quota reservation only when the update reports a row, so every
|
|
// abandoned upload held its reserved bytes against the user's quota permanently.
|
|
// Cancelling something already expired is the case that most needs to work.
|
|
it('cancels a session that has already expired', async () => {
|
|
const { session } = await newSession({ expiresAt: new Date(Date.now() - 60_000) });
|
|
|
|
const result = await cancelR2UploadSession(session.id);
|
|
|
|
expect(result.count).toBe(1);
|
|
const row = await db.videoUploadSession.findUniqueOrThrow({ where: { id: session.id } });
|
|
expect(row.status).toBe('CANCELLED');
|
|
expect(row.consumedAt).not.toBeNull();
|
|
});
|
|
|
|
it('does nothing for an id that matches no row', async () => {
|
|
const { session } = await newSession();
|
|
|
|
const result = await cancelR2UploadSession('no-such-session');
|
|
|
|
expect(result.count).toBe(0);
|
|
expect(
|
|
(await db.videoUploadSession.findUniqueOrThrow({ where: { id: session.id } })).status
|
|
).toBe('INITIATED');
|
|
});
|
|
|
|
it('leaves every other session alone', async () => {
|
|
const target = await newSession();
|
|
const bystander = await newSession();
|
|
|
|
await cancelR2UploadSession(target.session.id);
|
|
|
|
expect(
|
|
(await db.videoUploadSession.findUniqueOrThrow({ where: { id: bystander.session.id } }))
|
|
.status
|
|
).toBe('INITIATED');
|
|
});
|
|
});
|