Open source CapCut alternative.
TypeScript
fix(site): sign the rest of a media batch when an asset has no file
David Lec0b67f08ac7b
diff --git a/site/src/cut/server/cloud/library.ts b/site/src/cut/server/cloud/library.tsindex f39382b4..e66d92c6 100644--- a/site/src/cut/server/cloud/library.ts+++ b/site/src/cut/server/cloud/library.ts@@ -24,7 +24,7 @@ import { addUsage, quotaCheck } from "./usage";import { libraryTypeOf } from "@/cut/lib/libraryFileType";import { itemName } from "@/cut/lib/itemName";import type { AssetType } from "@/cut/lib/types";-import { caught, decodeFileParam, dedupeName, err, HttpResponseError, inspirationFolderId, redirect, safeFileName } from "./util";+import { caught, decodeFileParam, dedupeName, err, HttpResponseError, inspirationFolderId, redirect, safeFileName, storableFileName } from "./util";/** Cap on one signed-URL batch, matching the project media batch. */const PRESIGN_GET_BATCH_MAX = 500;@@ -707,9 +707,7 @@ export const libraryCloud = {if (files.length > PRESIGN_GET_BATCH_MAX) return err("Too many files.", 400);const wanted = [...new Set(- files- .filter((f): f is string => typeof f === "string")- .map((f) => safeFileName(f)),+ files.flatMap((f) => (typeof f === "string" ? (storableFileName(f) ?? []) : [])),),];const rows = wanted.lengthdiff --git a/site/src/cut/server/cloud/media.ts b/site/src/cut/server/cloud/media.tsindex 598a6c29..e6e9617e 100644--- a/site/src/cut/server/cloud/media.ts+++ b/site/src/cut/server/cloud/media.ts@@ -7,7 +7,7 @@ import { mediaObjectUrl, mediaUrlLifetime } from "./mediaCdn";import { getProject, takenMediaNames } from "./projects";import { head, presignPut, projectMediaKey, putObject } from "./r2";import { addUsage, quotaCheck } from "./usage";-import { caught, dedupeName, err, safeFileName } from "./util";+import { caught, dedupeName, err, safeFileName, storableFileName } from "./util";/** Direct-upload cap: anything larger goes through presign. */const INLINE_UPLOAD_BYTES = 3.5 * 1024 * 1024;@@ -177,8 +177,8 @@ export const mediaCloud = {rows.map((r) => [`${r.projectId}/${r.fileName}`, String(r.updatedAt.getTime())]));const urls = wanted.flatMap((i) => {- const fileName = safeFileName(i.fileName!);- const version = versions.get(`${i.projectId}/${fileName}`);+ const fileName = storableFileName(i.fileName!);+ const version = fileName && versions.get(`${i.projectId}/${fileName}`);if (!version) return [];return [{diff --git a/site/src/cut/server/cloud/util.test.ts b/site/src/cut/server/cloud/util.test.tsnew file mode 100644index 00000000..90562dc5--- /dev/null+++ b/site/src/cut/server/cloud/util.test.ts@@ -0,0 +1,14 @@+import { expect, test } from "bun:test";+import { safeFileName, storableFileName } from "./util";++test("a block asset's empty name and dotfiles have no storable name", () => {+ expect(storableFileName("")).toBeNull();+ expect(storableFileName(".DS_Store")).toBeNull();+ expect(() => safeFileName("")).toThrow("Invalid file name.");+});++test("a storable name is sanitized to its basename", () => {+ expect(storableFileName("clips/phone 1.mov")).toBe("phone 1.mov");+ expect(storableFileName("a:b.mp4")).toBe("a_b.mp4");+ expect(safeFileName("clips/phone 1.mov")).toBe("phone 1.mov");+});diff --git a/site/src/cut/server/cloud/util.ts b/site/src/cut/server/cloud/util.tsindex a5df16fb..61379f15 100644--- a/site/src/cut/server/cloud/util.ts+++ b/site/src/cut/server/cloud/util.ts@@ -41,12 +41,20 @@ export const wantsDownload = (req: Request) => new URL(req.url).searchParams.has/** Sanitize an upload name the way the engine's saveMedia does. */export function safeFileName(original: string): string {+ const base = storableFileName(original);+ if (!base) throw new Error("Invalid file name.");+ return base;+}++/** The sanitized name, or null for one no object can be stored under — an+ * empty name, which a block asset carries, or a dotfile. Batch reads skip+ * these so one fileless asset leaves the rest of the batch signed. */+export function storableFileName(original: string): string | null {const base = path.basename(original).replace(/[^\w.\-() ]+/g, "_").slice(-80);- if (!base || base.startsWith(".")) throw new Error("Invalid file name.");- return base;+ return base && !base.startsWith(".") ? base : null;}/** A URL path segment decoded and checked: no separators, no dotfiles. */