Skip to content
Merged
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
68 changes: 68 additions & 0 deletions apps/server/src/deliverySidecarHttp.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { AuthSessionId } from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import { FetchHttpClient, HttpRouter } from "effect/http";
import { expect, it, vi } from "vite-plus/test";

import { EnvironmentAuth } from "./auth/EnvironmentAuth.ts";
import { layer } from "./deliverySidecarHttp.ts";

it("reads approved Delivery resources without forwarding client credentials", async () => {
vi.stubEnv("T3CODE_DELIVERY_SIDECAR_PORT", "45678");
const upstream = vi
.spyOn(globalThis, "fetch")
.mockImplementation(async () => Response.json({ version: 1 }));
const { handler, dispose } = HttpRouter.toWebHandler(
layer.pipe(
Layer.provideMerge(FetchHttpClient.layer),
Layer.provideMerge(
Layer.mock(EnvironmentAuth)({
authenticateHttpRequest: (request) =>
Effect.succeed({
sessionId: AuthSessionId.make("fixture-session"),
subject: "fixture",
method: "bearer-access-token",
scopes: request.headers.authorization ? ["orchestration:read"] : [],
}),
}),
),
),
{ disableLogger: true },
);
const prefix = "/delivery-sidecar/v1/";
const resource = "pull-requests/InTheta/omni-symphony-canary/340";
const send = (path: string, method = "GET", authenticated = true) =>
handler(
new Request(`http://localhost${prefix}${path}`, {
method,
headers: authenticated
? { authorization: "Bearer t3-session", cookie: "session=test" }
: {},
}),
);
try {
expect((await send(resource, "GET", false)).status).toBe(403);
expect((await send(resource, "POST")).status).toBe(404);
expect((await send("pull-requests/org/repo%2Fextra/340")).status).toBe(404);
expect(upstream).not.toHaveBeenCalled();

const response = await send(`${resource}?ignored=yes`);
expect(response.status).toBe(200);
expect(response.headers.get("cache-control")).toBe("no-store");
expect(await response.json()).toEqual({ version: 1 });
const [url, init] = upstream.mock.calls[0] ?? [];
expect(String(url)).toBe(`http://127.0.0.1:45678${prefix}${resource}`);
expect(init?.redirect).toBe("error");
expect(new Headers(init?.headers).get("authorization")).toBeNull();
expect(new Headers(init?.headers).get("cookie")).toBeNull();

expect((await send("managed-runs/85c0326b-52e0-46dc-899d-d451c5afb228")).status).toBe(200);
vi.stubEnv("T3CODE_DELIVERY_SIDECAR_PORT", "");
expect((await send(resource)).status).toBe(404);
expect(upstream).toHaveBeenCalledTimes(2);
} finally {
await dispose();
upstream.mockRestore();
vi.unstubAllEnvs();
}
});
72 changes: 72 additions & 0 deletions apps/server/src/deliverySidecarHttp.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import * as Effect from "effect/Effect";
import * as Option from "effect/Option";
import {
FetchHttpClient,
HttpClient,
HttpClientRequest,
HttpRouter,
HttpServerRequest,
HttpServerResponse,
} from "effect/http";

import { EnvironmentAuth } from "./auth/EnvironmentAuth.ts";

const prefix = "/delivery-sidecar/v1/";
const ticket = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
const pullRequest = /^pull-requests\/[a-z0-9-]+\/(?!\.{1,2}\/)[a-z0-9_.-]+\/[1-9][0-9]*$/i;
const managedRun = /^managed-runs\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
const headers = { "cache-control": "no-store" };

function configuredPort() {
return Number(process.env.T3CODE_DELIVERY_SIDECAR_PORT);
}

export const layer = HttpRouter.add(
"GET",
"/delivery-sidecar/v1/*",
Effect.gen(function* () {
const request = yield* HttpServerRequest.HttpServerRequest;
const path = new URL(request.url, "http://127.0.0.1").pathname;
const resource = path.slice(prefix.length);
const port = configuredPort();
if (
!Number.isInteger(port) ||
port < 1 ||
port > 65535 ||
!path.startsWith(prefix) ||
!(ticket.test(resource) || pullRequest.test(resource) || managedRun.test(resource))
) {
return HttpServerResponse.empty({ status: 404, headers });
}

const auth = yield* EnvironmentAuth;
const session = yield* auth.authenticateHttpRequest(request).pipe(Effect.option);
if (Option.isNone(session)) {
return HttpServerResponse.empty({ status: 401, headers });
}
if (!session.value.scopes.includes("orchestration:read")) {
return HttpServerResponse.empty({ status: 403, headers });
}

const client = yield* HttpClient.HttpClient;
const response = yield* client
.execute(HttpClientRequest.get(`http://127.0.0.1:${port}${prefix}${resource}`))
.pipe(
Effect.flatMap((result) =>
result.status === 200
? Effect.map(result.json, (body) => ({ status: result.status, body }))
: Effect.succeed({ status: result.status, body: null }),
),
Effect.provideService(FetchHttpClient.RequestInit, { redirect: "error" }),
Effect.timeout("15 seconds"),
Effect.option,
);
if (Option.isNone(response) || ![200, 404].includes(response.value.status)) {
return HttpServerResponse.empty({ status: 502, headers });
}
if (response.value.status === 404) {
return HttpServerResponse.empty({ status: 404, headers });
}
return HttpServerResponse.jsonUnsafe(response.value.body, { headers });
}),
);
2 changes: 2 additions & 0 deletions apps/server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import * as NonBlockingSpawner from "./process/NonBlockingSpawner.ts";
import * as KeepAwake from "./background/KeepAwake.ts";
import * as ServerConfig from "./config.ts";
import { withUntracedRequests } from "./http.ts";
import * as DeliverySidecarHttp from "./deliverySidecarHttp.ts";
import * as IsolatedApprovalHttp from "./isolatedApprovalHttp.ts";
import * as ServerHttp from "./http.ts";
import {
Expand Down Expand Up @@ -839,6 +840,7 @@ const layerMakeRoutes = Layer.mergeAll(
Layer.provide(AuthHttp.layerAuthenticatedAuth),
),
IsolatedApprovalHttp.layer,
DeliverySidecarHttp.layer,
ServerHttp.layerOtlpTracesProxyRoute,
ServerHttp.layerAssetRoute,
ServerHttp.layerAttachmentUploadRoute,
Expand Down
18 changes: 18 additions & 0 deletions apps/web/src/lib/deliverySidecarFetch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { readDesktopPrimaryBearerToken } from "~/environments/primary/desktopAuth";
import { resolvePrimaryEnvironmentHttpUrl } from "~/environments/primary/target";

export async function fetchDeliverySidecar(path: string, signal: AbortSignal): Promise<Response> {
const request = { cache: "no-store", signal } as const;
if (typeof window === "undefined" || !window.desktopBridge || import.meta.env.DEV) {
return fetch(path, request);
}

const url = resolvePrimaryEnvironmentHttpUrl(path);
const token = await readDesktopPrimaryBearerToken();
return fetch(url, {
...request,
credentials: "omit",
redirect: "error",
...(token ? { headers: { Authorization: `Bearer ${token}` } } : {}),
});
}
8 changes: 5 additions & 3 deletions apps/web/src/lib/managedRunDelivery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import * as Schema from "effect/Schema";

import { fetchDeliverySidecar } from "~/lib/deliverySidecarFetch";

const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
const CommitSha = Schema.String.check(Schema.isPattern(/^[0-9a-f]{40}$/));
const Tokens = Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: Number.MAX_SAFE_INTEGER }));
Expand Down Expand Up @@ -59,10 +61,10 @@ export async function readManagedRun(
signal: AbortSignal,
): Promise<ManagedRun | null> {
try {
const response = await fetch(`/delivery-sidecar/v1/managed-runs/${encodeURIComponent(runId)}`, {
cache: "no-store",
const response = await fetchDeliverySidecar(
`/delivery-sidecar/v1/managed-runs/${encodeURIComponent(runId)}`,
signal,
});
);
return response.ok ? parseManagedRun(await response.json(), runId) : null;
} catch {
return null;
Expand Down
28 changes: 21 additions & 7 deletions apps/web/src/routes/_chat.delivery.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { createFileRoute, useNavigate, useRouter, useRouterState } from "@tanstack/react-router";
import {
Link,
createFileRoute,
useNavigate,
useRouter,
useRouterState,
} from "@tanstack/react-router";

import type { ReactNode } from "react";

import { ManagedRunEvidence } from "~/components/ManagedRunEvidence";
import { deliveryCiRun, parseDeliveryPullRequestUrl } from "~/lib/deliveryPullRequest";
import { fetchDeliverySidecar } from "~/lib/deliverySidecarFetch";
import { parseManagedRunId, readManagedRun } from "~/lib/managedRunDelivery";

interface Delivery {
Expand Down Expand Up @@ -57,10 +64,10 @@ function readDeliveryShape(value: unknown, ticket: string): Delivery | null {

async function readDelivery(ticket: string, signal: AbortSignal): Promise<Delivery | null> {
try {
const response = await fetch(`/delivery-sidecar/v1/${encodeURIComponent(ticket)}`, {
cache: "no-store",
const response = await fetchDeliverySidecar(
`/delivery-sidecar/v1/${encodeURIComponent(ticket)}`,
signal,
});
);
return response.ok ? readDeliveryShape(await response.json(), ticket) : null;
} catch {
return null;
Expand All @@ -71,6 +78,7 @@ interface PullRequestDelivery {
version: 1;
pullRequest: { repository: string; number: number; head: string; url: string };
candidate: string | null;
managedRunId?: string;
qa: { status: string; head?: string; freshness?: string };
ci: { status: string; head?: string; runId?: number };
previousCi?: { status: string; head: string; runId?: number } | null;
Expand All @@ -81,10 +89,10 @@ async function readPullRequestDelivery(value: string, signal: AbortSignal) {
if (!link) return null;
const segments = link.repository.split("/").map(encodeURIComponent).join("/");
try {
const response = await fetch(`/delivery-sidecar/v1/pull-requests/${segments}/${link.number}`, {
cache: "no-store",
const response = await fetchDeliverySidecar(
`/delivery-sidecar/v1/pull-requests/${segments}/${link.number}`,
signal,
});
);
if (!response.ok) return null;
const row = (await response.json()) as Partial<PullRequestDelivery> | null;
if (
Expand Down Expand Up @@ -121,6 +129,7 @@ function CiRunLink({ repository, runId }: { repository: string; runId?: number |

function PullRequestEvidence({ delivery }: { delivery: PullRequestDelivery }) {
const { pullRequest, candidate, qa, ci } = delivery;
const run = parseManagedRunId(delivery.managedRunId);
const fields: ReadonlyArray<readonly [string, ReactNode]> = [
["Current PR commit", pullRequest.head],
["Verified candidate", candidate ?? "No managed candidate"],
Expand Down Expand Up @@ -152,6 +161,11 @@ function PullRequestEvidence({ delivery }: { delivery: PullRequestDelivery }) {
<h2 className="font-medium">
{pullRequest.repository} #{pullRequest.number}
</h2>
{run && (
<Link className="mt-2 inline-block text-sm underline" to="/delivery" search={{ run }}>
Open managed run
</Link>
)}
<dl className="mt-3 grid grid-cols-[max-content_1fr] gap-x-6 gap-y-2 text-sm">
{fields.map(([label, value]) => (
<div className="contents" key={label}>
Expand Down
Loading