Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions apps/server/src/assets/AssetAccess.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,26 @@ describe("AssetAccess", () => {
}).pipe(Effect.provide(layerTest)),
);

it.effect("signs an exact GitLab upload and rejects expired or altered grants", () =>
Effect.gen(function* () {
const reference = {
origin: "http://gl.here",
project: "42",
secret: "66dbcd21ec5d24ed6ea225176098d52b",
fileName: "my image.png",
};
const signed = yield* issueAssetUrl({ resource: { _tag: "gitlab-upload", reference } });
const suffix = signed.relativeUrl.slice(`${ASSET_ROUTE_PREFIX}/`.length);
const separator = suffix.indexOf("/");
const token = suffix.slice(0, separator);
const name = suffix.slice(separator + 1);
expect(yield* resolveAsset(token, name)).toEqual({ kind: "gitlab-upload", reference });
expect(yield* resolveAsset(`x${token}`, name)).toBeNull();
yield* TestClock.adjust("61 minutes");
expect(yield* resolveAsset(token, name)).toBeNull();
}).pipe(Effect.provide(layerTest)),
);

it.effect("serves GitHub-hosted pull request media through the repository's credential", () =>
Effect.gen(function* () {
const resolve = (relativeUrl: string) => {
Expand Down
22 changes: 22 additions & 0 deletions apps/server/src/assets/AssetAccess.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { AssetResource } from "@t3tools/contracts";
import {
AssetAttachmentNotFoundError,
GitLabUploadReference,
AssetGitHubMediaUrlValidationError,
AssetPreviewTypeValidationError,
AssetProjectFaviconInspectionError,
Expand Down Expand Up @@ -89,6 +90,12 @@ const PREVIEW_ASSET_EXTENSIONS = new Set([
]);

const AssetClaimsSchema = Schema.Union([
Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("gitlab-upload"),
reference: GitLabUploadReference,
expiresAt: Schema.Number,
}),
Schema.Struct({
version: Schema.Literal(1),
kind: Schema.Literal("workspace-file"),
Expand Down Expand Up @@ -167,6 +174,7 @@ const decodeAssetClaims = Schema.decodeUnknownOption(AssetClaimsJson);
const encodeAssetClaims = Schema.encodeSync(AssetClaimsJson);

export type ResolvedAsset =
| { readonly kind: "gitlab-upload"; readonly reference: GitLabUploadReference }
| {
readonly kind: "file";
readonly path: string;
Expand Down Expand Up @@ -740,6 +748,16 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
fileName = "native-app-icon.png";
break;
}
case "gitlab-upload": {
claims = {
version: 1,
kind: "gitlab-upload",
reference: input.resource.reference,
expiresAt,
};
fileName = input.resource.reference.fileName;
break;
}
case "github-media": {
const fetchUrl = githubMediaFetchUrl(input.resource.url);
if (fetchUrl === null) {
Expand Down Expand Up @@ -855,6 +873,10 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
: null;
}

if (claims.kind === "gitlab-upload") {
return { kind: "gitlab-upload", reference: claims.reference } satisfies ResolvedAsset;
}

if (claims.kind === "github-media") {
return {
kind: "github-media",
Expand Down
Loading
Loading