Skip to content

Commit 0e7683d

Browse files
committed
fix(server): prevent caching private source control streams
1 parent e3679c7 commit 0e7683d

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

‎apps/server/src/assets/SourceControlMediaProxy.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,23 @@ describe("source-control image delivery", () => {
145145
);
146146
expect(redirect.status).toBe(302);
147147
expect(redirect.headers.get("location")).toBe(signedUrl);
148+
expect(redirect.headers.get("cache-control")).toMatch(
149+
/^private, (?:no-store|max-age=\d+)$/u,
150+
);
148151
const imageUrl = yield* issueAssetUrl({
149152
resource: { _tag: "source-control-media", reference: gitlab },
150153
});
151154
const fetchImage = (relativeUrl: string, method = "GET") =>
152155
Effect.promise(() => handler(new Request(`http://t3.test${relativeUrl}`, { method })));
153156
const image = yield* fetchImage(imageUrl.relativeUrl);
154157
expect(image.status).toBe(200);
158+
expect(image.headers.get("cache-control")).toBe("private, no-store");
155159
expect(image.headers.get("content-type")).toBe("image/svg+xml");
156160
expect(image.headers.get("content-security-policy")).toContain("sandbox");
157161
expect(yield* Effect.promise(() => image.text())).toBe("<svg>image</svg>");
158162
const head = yield* fetchImage(imageUrl.relativeUrl, "HEAD");
159163
expect(head.status).toBe(200);
164+
expect(head.headers.get("cache-control")).toBe("private, no-store");
160165
expect(yield* Effect.promise(() => head.text())).toBe("");
161166
expect(
162167
(yield* fetchImage(
@@ -185,11 +190,13 @@ describe("source-control image delivery", () => {
185190
);
186191
const video = yield* requestVideo();
187192
expect(video.status).toBe(200);
193+
expect(video.headers.get("cache-control")).toBe("private, no-store");
188194
expect(video.headers.get("content-type")).toBe("video/mp4");
189195
expect(video.headers.get("accept-ranges")).toBe("bytes");
190196
expect(yield* Effect.promise(() => video.text())).toBe("abcdefgh");
191197
const segment = yield* requestVideo("bytes=2-5");
192198
expect(segment.status).toBe(206);
199+
expect(segment.headers.get("cache-control")).toBe("private, no-store");
193200
expect(segment.headers.get("content-range")).toBe("bytes 2-5/8");
194201
expect(segment.headers.get("content-length")).toBe("4");
195202
expect(yield* Effect.promise(() => segment.text())).toBe("cdef");
@@ -198,6 +205,7 @@ describe("source-control image delivery", () => {
198205
expect(invalidRange.headers.get("content-range")).toBe("bytes */8");
199206
const videoHead = yield* requestVideo("bytes=2-5", "HEAD");
200207
expect(videoHead.status).toBe(200);
208+
expect(videoHead.headers.get("cache-control")).toBe("private, no-store");
201209
expect(videoHead.headers.get("content-length")).toBe("8");
202210
expect(yield* Effect.promise(() => videoHead.text())).toBe("");
203211
yield* TestClock.adjust("61 minutes");

‎apps/server/src/http.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,8 @@ export const assetRouteLayer = HttpRouter.add(
414414
const headers = {
415415
...delivery.headers,
416416
...assetResponseHeaders("upload", { mimeType: delivery.contentType }),
417+
// Provider credentials can change independently of the signed asset URL.
418+
"Cache-Control": "private, no-store",
417419
"Content-Type": delivery.contentType,
418420
};
419421
return request.method === "HEAD"

0 commit comments

Comments
 (0)