diff --git a/hub/client/application/hub/copilot-connection-contracts/index.ts b/hub/client/application/hub/copilot-connection-contracts/index.ts index e5912ef49..2ffaf5d2e 100644 --- a/hub/client/application/hub/copilot-connection-contracts/index.ts +++ b/hub/client/application/hub/copilot-connection-contracts/index.ts @@ -17,3 +17,28 @@ export const copilotConnectionStatusSchema = z verifiedAt: z.iso.datetime({ offset: true }).nullable(), }) .strict() + +export const copilotAuthorizationStartResponseSchema = z + .object({ + authorizationId: z.uuid(), + authorizationUrl: z.url({ protocol: /^https?$/ }), + expiresAt: z.iso.datetime({ offset: true }), + }) + .strict() + +export const copilotAuthorizationResponseSchema = z + .object({ + authorization: z + .object({ + expiresAt: z.iso.datetime({ offset: true }), + operation: z.enum(["CONNECT_COPILOT", "DISCONNECT_COPILOT"]), + verifiedAt: z.iso.datetime({ offset: true }), + }) + .strict(), + }) + .strict() + +export const copilotContinuationResponseSchema = z.union([ + z.object({ connectionId: z.uuid() }).strict(), + z.object({ disconnected: z.literal(true) }).strict(), +]) diff --git a/hub/client/application/hub/requests/cancel-copilot-authorization/index.ts b/hub/client/application/hub/requests/cancel-copilot-authorization/index.ts new file mode 100644 index 000000000..df7b73ae9 --- /dev/null +++ b/hub/client/application/hub/requests/cancel-copilot-authorization/index.ts @@ -0,0 +1,14 @@ +import { requestJson } from "../request-json" +import { z } from "zod" + +export function cancelCopilotAuthorization(request: Request, authorizationId: string) { + return requestJson( + new URL("/api/copilot-connection/authorizations/cancel", request.url), + z.undefined(), + { + body: JSON.stringify({ authorizationId }), + method: "POST", + signal: request.signal, + }, + ) +} diff --git a/hub/client/application/hub/requests/change-copilot-connection/index.ts b/hub/client/application/hub/requests/change-copilot-connection/index.ts deleted file mode 100644 index adf9a81cd..000000000 --- a/hub/client/application/hub/requests/change-copilot-connection/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { z } from "zod" - -import { requestJson } from "../request-json" - -export function changeCopilotConnection(request: Request, operation: "connect" | "disconnect") { - return requestJson( - new URL( - operation === "connect" ? "/api/copilot-connection/connect" : "/api/copilot-connection", - request.url, - ), - z.undefined(), - { - body: JSON.stringify({ confirmed: true }), - method: operation === "connect" ? "POST" : "DELETE", - signal: request.signal, - }, - ) -} diff --git a/hub/client/application/hub/requests/continue-copilot-authorization/index.ts b/hub/client/application/hub/requests/continue-copilot-authorization/index.ts new file mode 100644 index 000000000..6c9f36f46 --- /dev/null +++ b/hub/client/application/hub/requests/continue-copilot-authorization/index.ts @@ -0,0 +1,21 @@ +import { copilotContinuationResponseSchema } from "@application/hub/copilot-connection-contracts" + +import { requestJson } from "../request-json" + +export function continueCopilotAuthorization( + request: Request, + input: { + authorizationId: string + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + }, +) { + return requestJson( + new URL("/api/copilot-connection/authorizations/continue", request.url), + copilotContinuationResponseSchema, + { + body: JSON.stringify(input), + method: "POST", + signal: request.signal, + }, + ) +} diff --git a/hub/client/application/hub/requests/get-copilot-authorization/index.ts b/hub/client/application/hub/requests/get-copilot-authorization/index.ts new file mode 100644 index 000000000..88dd036cd --- /dev/null +++ b/hub/client/application/hub/requests/get-copilot-authorization/index.ts @@ -0,0 +1,11 @@ +import { copilotAuthorizationResponseSchema } from "@application/hub/copilot-connection-contracts" + +import { requestJson } from "../request-json" + +export function getCopilotAuthorization(request: Request, authorizationId: string) { + return requestJson( + new URL(`/api/copilot-connection/authorizations/${authorizationId}`, request.url), + copilotAuthorizationResponseSchema, + { signal: request.signal }, + ) +} diff --git a/hub/client/application/hub/requests/start-copilot-authorization/index.ts b/hub/client/application/hub/requests/start-copilot-authorization/index.ts new file mode 100644 index 000000000..d7991febc --- /dev/null +++ b/hub/client/application/hub/requests/start-copilot-authorization/index.ts @@ -0,0 +1,21 @@ +import { copilotAuthorizationStartResponseSchema } from "@application/hub/copilot-connection-contracts" + +import { requestJson } from "../request-json" + +export function startCopilotAuthorization( + request: Request, + input: { + confirmed: true + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + }, +) { + return requestJson( + new URL("/api/copilot-connection/authorizations/start", request.url), + copilotAuthorizationStartResponseSchema, + { + body: JSON.stringify(input), + method: "POST", + signal: request.signal, + }, + ) +} diff --git a/hub/client/application/hub/routes/administrator-flow.test.tsx b/hub/client/application/hub/routes/administrator-flow.test.tsx index 0f21f7044..ad2f74751 100644 --- a/hub/client/application/hub/routes/administrator-flow.test.tsx +++ b/hub/client/application/hub/routes/administrator-flow.test.tsx @@ -1,5 +1,5 @@ import type { RouteConfigEntry } from "@react-router/dev/routes" -import { act, fireEvent, render, screen, waitFor, within } from "@testing-library/react" +import { act, fireEvent, render, screen, within } from "@testing-library/react" import { http, HttpResponse } from "msw" import { setupServer } from "msw/node" import type { ComponentType } from "react" @@ -111,10 +111,30 @@ function administrator(login = "octocat", membershipId = actorMembershipId) { } } +function workspace() { + return http.get(`${window.location.origin}/api/workspace`, () => + HttpResponse.json({ + viewer: { + id: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa", + provider: "github", + login: "octocat", + name: "The Octocat", + avatarUrl: null, + }, + capabilities: { + createPrototypes: false, + reviewPrototypes: false, + manageSharing: false, + administerHub: true, + }, + repositories: [], + }), + ) +} + describe("administrator frontend integration", () => { it("does not intercept account-menu sign-out on the Copilot page", async () => { - const connect = vi.fn() - const disconnect = vi.fn() + const startAuthorization = vi.fn() await renderApplication("/settings/copilot", [ authenticatedSession(), http.get(`${window.location.origin}/api/copilot-connection`, () => @@ -127,8 +147,10 @@ describe("administrator frontend integration", () => { verifiedAt: null, }), ), - http.post(`${window.location.origin}/api/copilot-connection/connect`, connect), - http.delete(`${window.location.origin}/api/copilot-connection`, disconnect), + http.post( + `${window.location.origin}/api/copilot-connection/authorizations/start`, + startAuthorization, + ), ]) await screen.findByRole("heading", { name: "Copilot is not connected" }) @@ -138,157 +160,7 @@ describe("administrator frontend integration", () => { if (!signOutForm) throw new Error("Sign out must belong to a form.") expect(fireEvent.submit(signOutForm)).toBe(true) - expect(connect).not.toHaveBeenCalled() - expect(disconnect).not.toHaveBeenCalled() - }, 10_000) - - it("allows an administrator to disconnect an inactive saved Copilot connection", async () => { - const disconnect = vi.fn(() => new HttpResponse(null, { status: 204 })) - await renderApplication("/settings/copilot", [ - authenticatedSession(), - http.get(`${window.location.origin}/api/copilot-connection`, () => - HttpResponse.json({ - configured: true, - connected: false, - savedConnection: true, - connectedBy: null, - refusedAt: "2026-11-11T13:00:00.000Z", - verifiedAt: null, - }), - ), - http.delete(`${window.location.origin}/api/copilot-connection`, disconnect), - ]) - - expect(await screen.findByRole("button", { name: "Disconnect Copilot" })).toBeVisible() - fireEvent.click( - screen.getByRole("checkbox", { - name: "I understand and confirm disconnecting Copilot for this Hub.", - }), - ) - fireEvent.click(screen.getByRole("button", { name: "Disconnect Copilot" })) - - await waitFor(() => expect(disconnect).toHaveBeenCalledTimes(1)) - }, 10_000) - - it("revalidates a connected page after Copilot refuses a recheck", async () => { - let refused = false - let statusRequests = 0 - await renderApplication("/settings/copilot", [ - authenticatedSession(), - http.get(`${window.location.origin}/api/copilot-connection`, () => { - statusRequests += 1 - return HttpResponse.json({ - configured: true, - connected: !refused, - savedConnection: true, - connectedBy: refused - ? null - : { - login: "octocat", - membershipId: actorMembershipId, - name: "The Octocat", - }, - refusedAt: refused ? "2026-11-11T13:00:00.000Z" : null, - verifiedAt: "2026-11-10T23:00:00.000Z", - }) - }), - http.post(`${window.location.origin}/api/copilot-connection/connect`, () => { - refused = true - return HttpResponse.json( - { error: "Copilot refused the configured credential." }, - { status: 422 }, - ) - }), - ]) - - expect(await screen.findByRole("heading", { name: "Copilot is connected" })).toBeVisible() - fireEvent.click( - screen.getByRole("checkbox", { - name: "I understand and confirm connecting Copilot for this Hub.", - }), - ) - fireEvent.click(screen.getByRole("button", { name: "Check Copilot connection" })) - - expect(await screen.findByText("Copilot refused the configured credential.")).toBeVisible() - expect(await screen.findByRole("heading", { name: "Copilot is not connected" })).toBeVisible() - expect(screen.getByText(/Copilot refused the configured credential on/)).toBeVisible() - expect(screen.getByRole("button", { name: "Check and connect Copilot" })).toBeVisible() - expect(screen.getByRole("button", { name: "Disconnect Copilot" })).toBeVisible() - expect(statusRequests).toBeGreaterThan(1) - }, 10_000) - - it("uses the real Copilot status and mutation APIs with visible action results", async () => { - const mutations: Array<{ body: unknown; method: string; path: string }> = [] - let connected = false - await renderApplication("/settings/copilot", [ - authenticatedSession(), - http.get(`${window.location.origin}/api/copilot-connection`, () => - HttpResponse.json({ - configured: true, - connected, - savedConnection: connected, - connectedBy: connected - ? { - login: "octocat", - membershipId: actorMembershipId, - name: "The Octocat", - } - : null, - refusedAt: null, - verifiedAt: connected ? "2026-11-10T23:00:00.000Z" : null, - }), - ), - http.post(`${window.location.origin}/api/copilot-connection/connect`, async ({ request }) => { - mutations.push({ - body: await request.json(), - method: request.method, - path: new URL(request.url).pathname, - }) - connected = true - return new HttpResponse(null, { status: 204 }) - }), - http.delete(`${window.location.origin}/api/copilot-connection`, async ({ request }) => { - mutations.push({ - body: await request.json(), - method: request.method, - path: new URL(request.url).pathname, - }) - return HttpResponse.json({ error: "Copilot is temporarily unavailable." }, { status: 503 }) - }), - ]) - - expect(await screen.findByRole("heading", { name: "Copilot is not connected" })).toBeVisible() - fireEvent.click( - screen.getByRole("checkbox", { - name: "I understand and confirm connecting Copilot for this Hub.", - }), - ) - fireEvent.click(screen.getByRole("button", { name: "Connect Copilot" })) - - expect(await screen.findByText("Copilot connected.")).toBeVisible() - expect(await screen.findByRole("heading", { name: "Copilot is connected" })).toBeVisible() - fireEvent.click( - screen.getByRole("checkbox", { - name: "I understand and confirm disconnecting Copilot for this Hub.", - }), - ) - fireEvent.click(screen.getByRole("button", { name: "Disconnect Copilot" })) - - expect(await screen.findByText("Copilot is temporarily unavailable.")).toBeVisible() - await waitFor(() => - expect(mutations).toEqual([ - { - body: { confirmed: true }, - method: "POST", - path: "/api/copilot-connection/connect", - }, - { - body: { confirmed: true }, - method: "DELETE", - path: "/api/copilot-connection", - }, - ]), - ) + expect(startAuthorization).not.toHaveBeenCalled() }, 10_000) it("uses the real administrator contract and retains its opaque cursor", async () => { @@ -767,4 +639,129 @@ describe("administrator frontend integration", () => { expect(`${router.state.location.pathname}${router.state.location.search}`).toBe(canonicalPath) }) }) + + describe("Copilot connection frontend integration", () => { + it("loads the real connection API and starts the confirmed provider authorization", async () => { + const bodies: unknown[] = [] + await renderApplication("/settings/copilot", [ + authenticatedSession(), + workspace(), + http.get(`${window.location.origin}/api/copilot-connection`, () => + HttpResponse.json({ + configured: true, + connected: false, + savedConnection: false, + connectedBy: null, + refusedAt: null, + verifiedAt: null, + }), + ), + http.post( + `${window.location.origin}/api/copilot-connection/authorizations/start`, + async ({ request }) => { + bodies.push(await request.json()) + return HttpResponse.json({ + authorizationId, + authorizationUrl: "https://github.com/login/oauth/authorize", + expiresAt: "2026-11-09T20:06:00.000Z", + }) + }, + ), + ]) + + fireEvent.click( + await screen.findByRole("checkbox", { + name: /confirm connecting Copilot for this Hub/i, + }), + ) + fireEvent.click(screen.getByRole("button", { name: "Connect Copilot" })) + + await vi.waitFor(() => + expect(bodies).toEqual([{ confirmed: true, operation: "CONNECT_COPILOT" }]), + ) + expect(navigateToExternalUrl).toHaveBeenCalledWith("https://github.com/login/oauth/authorize") + }) + + it("continues the server-owned callback operation and returns to the live connection page", async () => { + const continuationBodies: unknown[] = [] + const router = await renderApplication( + `/settings/copilot/confirm?authorizationId=${authorizationId}`, + [ + authenticatedSession(), + workspace(), + http.get( + `${window.location.origin}/api/copilot-connection/authorizations/${authorizationId}`, + () => + HttpResponse.json({ + authorization: { + operation: "DISCONNECT_COPILOT", + verifiedAt: "2026-11-09T20:01:00.000Z", + expiresAt: "2026-11-09T20:06:00.000Z", + }, + }), + ), + http.post( + `${window.location.origin}/api/copilot-connection/authorizations/continue`, + async ({ request }) => { + continuationBodies.push(await request.json()) + return HttpResponse.json({ disconnected: true }) + }, + ), + http.get(`${window.location.origin}/api/copilot-connection`, () => + HttpResponse.json({ + configured: true, + connected: false, + savedConnection: false, + connectedBy: null, + refusedAt: null, + verifiedAt: null, + }), + ), + ], + ) + + fireEvent.click(await screen.findByRole("button", { name: "Disconnect Copilot" })) + + await vi.waitFor(() => + expect(continuationBodies).toEqual([{ authorizationId, operation: "DISCONNECT_COPILOT" }]), + ) + await vi.waitFor(() => { + expect(`${router.state.location.pathname}${router.state.location.search}`).toBe( + "/settings/copilot?result=disconnected", + ) + }) + expect(await screen.findByRole("heading", { name: "Copilot is not connected" })).toBeVisible() + }) + + it("does not intercept sign-out from the Copilot confirmation page", async () => { + const continuations = vi.fn() + await renderApplication(`/settings/copilot/confirm?authorizationId=${authorizationId}`, [ + authenticatedSession(), + workspace(), + http.get( + `${window.location.origin}/api/copilot-connection/authorizations/${authorizationId}`, + () => + HttpResponse.json({ + authorization: { + operation: "CONNECT_COPILOT", + verifiedAt: "2026-11-09T20:01:00.000Z", + expiresAt: "2026-11-09T20:06:00.000Z", + }, + }), + ), + http.post( + `${window.location.origin}/api/copilot-connection/authorizations/continue`, + continuations, + ), + ]) + + const signOutForm = document.querySelector( + 'form[action="/api/auth/session/sign-out"]', + ) + if (!signOutForm) throw new Error("Sign out must belong to a form.") + + expect(fireEvent.submit(signOutForm)).toBe(true) + expect(continuations).not.toHaveBeenCalled() + }) + }) }) diff --git a/hub/client/application/hub/routes/settings-copilot-authorization/index.tsx b/hub/client/application/hub/routes/settings-copilot-authorization/index.tsx new file mode 100644 index 000000000..14d5bf68b --- /dev/null +++ b/hub/client/application/hub/routes/settings-copilot-authorization/index.tsx @@ -0,0 +1,102 @@ +import { useState } from "react" +import { useNavigate } from "react-router" +import { z } from "zod" + +import { FreshAuthorizationPage } from "@pages/fresh-authorization-page" +import { cancelCopilotAuthorization } from "@application/hub/requests/cancel-copilot-authorization" +import { continueCopilotAuthorization } from "@application/hub/requests/continue-copilot-authorization" +import { getCopilotAuthorization } from "@application/hub/requests/get-copilot-authorization" +import { getCurrentHubSession } from "@application/hub/requests/get-current-hub-session" +import { administratorWorkspace } from "@application/hub/view-models/administrator-workspace" +import { ApiContractError } from "@application/hub/requests/api-contract-error" +import { ApiRequestError } from "@application/hub/requests/api-request-error" + +import type { Route } from "./+types/index" + +const authorizationIdSchema = z.uuid() + +export async function clientLoader({ request }: Pick) { + const authorizationId = authorizationIdSchema.safeParse( + new URL(request.url).searchParams.get("authorizationId"), + ) + if (!authorizationId.success) { + throw new Response("The authorization identifier is invalid.", { status: 400 }) + } + const session = await getCurrentHubSession(request) + if (session.role !== "ADMINISTRATOR") { + throw new Response("Administrator access is required.", { status: 403 }) + } + const { authorization } = await getCopilotAuthorization(request, authorizationId.data) + const connect = authorization.operation === "CONNECT_COPILOT" + return { + authorization, + authorizationId: authorizationId.data, + page: { + administrationWorkspace: administratorWorkspace(session, "copilot"), + productName: "Replica Hub", + pageTitle: connect ? "Complete Copilot connection" : "Complete Copilot disconnection", + heading: connect ? "Complete Copilot connection" : "Complete Copilot disconnection", + description: connect + ? "Your provider verified this session. Continue to check the configured token and connect Copilot, or cancel without changing the connection." + : "Your provider verified this session. Continue to disconnect Copilot, or cancel without changing the connection.", + submitLabel: connect ? "Connect Copilot" : "Disconnect Copilot", + submitPath: request.url, + cancelLabel: "Cancel", + cancelPath: request.url, + authenticityToken: "", + continuation: { id: authorizationId.data, method: "post" }, + }, + } +} + +export function meta() { + return [{ title: "Complete Copilot connection change - Replica Hub" }] +} + +export default function SettingsCopilotAuthorization({ + loaderData, +}: Pick) { + const navigate = useNavigate() + const [result, setResult] = useState<{ pending: boolean; error: string | null }>({ + pending: false, + error: null, + }) + return ( +
{ + if (!(event.target instanceof HTMLFormElement)) return + if (event.target.action !== loaderData.page.submitPath) return + event.preventDefault() + if (result.pending) return + const form = new FormData(event.target) + const request = new Request(window.location.href) + setResult({ pending: true, error: null }) + const action = + form.get("_method") === "delete" + ? cancelCopilotAuthorization(request, loaderData.authorizationId).then( + () => "cancelled", + ) + : continueCopilotAuthorization(request, { + authorizationId: loaderData.authorizationId, + operation: loaderData.authorization.operation, + }).then((response) => ("connectionId" in response ? "connected" : "disconnected")) + void action + .then((outcome) => navigate(`/settings/copilot?result=${outcome}`)) + .catch((error: unknown) => { + if (!(error instanceof ApiRequestError) && !(error instanceof ApiContractError)) { + throw error + } + setResult({ + pending: false, + error: + error instanceof ApiRequestError + ? error.message + : "The API response was invalid. Copilot was not changed.", + }) + }) + }} + > + +
+ ) +} diff --git a/hub/client/application/hub/routes/settings-copilot/index.tsx b/hub/client/application/hub/routes/settings-copilot/index.tsx index e6c219f57..235ab444a 100644 --- a/hub/client/application/hub/routes/settings-copilot/index.tsx +++ b/hub/client/application/hub/routes/settings-copilot/index.tsx @@ -1,16 +1,14 @@ -import { useEffect, useRef } from "react" -import { data, useFetcher, useLocation, useRevalidator } from "react-router" +import { useState } from "react" import { CopilotConnectionPage } from "@pages/copilot-connection-page" import type { CopilotConnectionPageData } from "@pages/copilot-connection-page/types" import { ApiContractError } from "@application/hub/requests/api-contract-error" import { ApiRequestError } from "@application/hub/requests/api-request-error" -import { changeCopilotConnection } from "@application/hub/requests/change-copilot-connection" import { getCopilotConnection } from "@application/hub/requests/get-copilot-connection" import { getCurrentHubSession } from "@application/hub/requests/get-current-hub-session" +import { startCopilotAuthorization } from "@application/hub/requests/start-copilot-authorization" +import { navigateToExternalUrl } from "@application/hub/navigate-to-external-url" import { SettingsRouteScreen } from "@application/hub/screens/settings-route-screen" -import { SettingsFormBoundary } from "@application/hub/screens/settings-form-boundary" -import type { SettingsActionResult } from "@application/hub/settings-contracts/types" import { copilotConnectionPageData } from "@application/hub/view-models/copilot-connection-page-data" import { settingsController } from "../settings-controller" @@ -42,39 +40,10 @@ export async function clientLoader( export async function clientAction(args: Parameters[0]) { if (isMockMode()) return controller.clientAction(args) - if (args.request.method.toUpperCase() !== "POST") { - throw new Response("Method not allowed.", { status: 405, headers: { Allow: "POST" } }) - } - try { - const form = await args.request.formData() - if (form.get("confirmed") !== "1") { - return data( - { saved: false, error: "Confirm the Copilot connection change." }, - { status: 400 }, - ) - } - const operation = form.get("_method") === "delete" ? "disconnect" : "connect" - await changeCopilotConnection(args.request, operation) - return data({ - saved: true, - notice: `Copilot ${operation === "connect" ? "connected" : "disconnected"}.`, - revision: 0, - }) - } catch (error) { - if (error instanceof ApiRequestError) { - return data( - { saved: false, error: error.message }, - { status: error.status >= 400 && error.status <= 599 ? error.status : 503 }, - ) - } - if (error instanceof ApiContractError) { - return data( - { saved: false, error: "The API response was invalid. No change was saved." }, - { status: 502 }, - ) - } - throw error - } + throw new Response("Use fresh authorization to change the Copilot connection.", { + status: 405, + headers: { Allow: "GET" }, + }) } export function meta({ loaderData }: { loaderData?: SettingsRouteData | RealCopilotRouteData }) { @@ -96,35 +65,49 @@ export default function SettingsCopilot({ } function RealCopilotConnection({ page }: { page: CopilotConnectionPageData }) { - const fetcher = useFetcher() - const location = useLocation() - const revalidator = useRevalidator() - const revalidatedResult = useRef(undefined) - const busy = fetcher.state !== "idle" || revalidator.state !== "idle" - const result = fetcher.data - useEffect(() => { - if (!result || revalidatedResult.current === result) return - revalidatedResult.current = result - void revalidator.revalidate() - }, [result, revalidator]) + const [submission, setSubmission] = useState<{ pending: boolean; error: string | null }>({ + pending: false, + error: null, + }) return ( - { - if (busy) return - void fetcher.submit(input, { - method: "post", - action: `${location.pathname}${location.search}`, +
{ + if (!(event.target instanceof HTMLFormElement)) return + const action = new URL(event.target.action, window.location.href) + if (action.pathname !== "/settings/copilot") return + event.preventDefault() + if (submission.pending) return + const form = new FormData(event.target) + if (form.get("confirmed") !== "1") { + setSubmission({ + pending: false, + error: "Confirm the Copilot connection change.", + }) + return + } + const operation = + form.get("_method") === "delete" ? "DISCONNECT_COPILOT" : "CONNECT_COPILOT" + setSubmission({ pending: true, error: null }) + void startCopilotAuthorization(new Request(window.location.href), { + confirmed: true, + operation, }) - }} - shouldIntercept={(form) => { - const action = new URL(form.action, window.location.href) - return action.pathname === "/settings/copilot" + .then((started) => navigateToExternalUrl(started.authorizationUrl)) + .catch((error: unknown) => { + if (!(error instanceof ApiRequestError) && !(error instanceof ApiContractError)) { + throw error + } + setSubmission({ + pending: false, + error: + error instanceof ApiRequestError + ? error.message + : "The API response was invalid. Provider authorization could not start.", + }) + }) }} > - - + +
) } diff --git a/hub/client/application/hub/routes/settings-routes.ts b/hub/client/application/hub/routes/settings-routes.ts index 20dbf8704..dd5d2eec6 100644 --- a/hub/client/application/hub/routes/settings-routes.ts +++ b/hub/client/application/hub/routes/settings-routes.ts @@ -10,6 +10,7 @@ export const settingsWorkspaceRoutes: RouteConfigEntry[] = [ route("settings/canvas", "routes/settings-canvas/index.tsx"), route("settings/canvas/approve", "routes/settings-canvas-approval/index.tsx"), route("settings/copilot", "routes/settings-copilot/index.tsx"), + route("settings/copilot/confirm", "routes/settings-copilot-authorization/index.tsx"), route("settings/github", "routes/settings-github/index.tsx"), route("settings/admins", "routes/settings-admins/index.tsx"), route("settings/admins/:userId/:operation", "routes/settings-admin-confirmation/index.tsx"), diff --git a/hub/docs/README.md b/hub/docs/README.md index 6dd64fbb4..45d0caa3a 100644 --- a/hub/docs/README.md +++ b/hub/docs/README.md @@ -12,6 +12,7 @@ Hub is being rebuilt. The [Hub overview](../README.md) describes what the baseli - [Artifact storage](artifact-storage.md): provider selection and immutable byte storage. - [Database](database.md): Prisma schema conventions, migrations, and the shared client. - [Authentication and Hub sessions](authentication.md): provider-neutral proof, reusable administrator enrollment, admission, browser sessions, and existing-user administrator management. +- [Copilot connection](copilot.md): operator token configuration, fresh administrator authorization, durable connection state, and credential safety. - [Microsoft Entra OIDC](entra-oidc.md): single-tenant application, app-role, client-authentication, and manual setup contract. - [Logging](logging.md): application events, automatic request records, and payload safety. - [Telemetry](telemetry.md): explicit OpenTelemetry spans, safe attributes, and process lifetime. diff --git a/hub/docs/authentication.md b/hub/docs/authentication.md index 1130b635d..11866600b 100644 --- a/hub/docs/authentication.md +++ b/hub/docs/authentication.md @@ -80,6 +80,16 @@ Global session revocation exposes: - `POST /api/session-revocation/authorizations/continue` with the authorization UUID. Success atomically ends all sessions and clears the actor's session cookie. - `POST /api/session-revocation/authorizations/cancel` with the authorization UUID. +The Copilot connection reuses the same sensitive authorization boundary: + +- `GET /api/copilot-connection` returns the deployment connection state to a current administrator. +- `POST /api/copilot-connection/authorizations/start` binds `CONNECT_COPILOT` or `DISCONNECT_COPILOT` to the current session, actor membership, and connection generation. +- `GET /api/copilot-connection/authorizations/:id` returns the verified, unconsumed confirmation. +- `POST /api/copilot-connection/authorizations/continue` consumes the authorization and changes the connection. +- `POST /api/copilot-connection/authorizations/cancel` cancels it. + +The provider callback returns Copilot operations to `/settings/copilot/confirm`. A connection check runs outside the database transaction; the continuation then locks and compares the saved generation before committing, so a delayed result cannot restore or replace newer connection state. + The retained administrator frontend uses `/settings/administrators` for the roster and candidate search. Every selection and confirmation shows the stable membership UUID plus available provider presentation; a missing profile never hides the target identity. It starts authorization through the JSON API, validates the returned provider URL and then leaves the app through native browser navigation. The provider callback returns to `/settings/administrators/confirm?authorizationId=`, where the frontend displays the server-owned operation and targets before continuing or cancelling it through the JSON API. A successful self-removal immediately confirms that Hub ended the current session, removes administrator navigation, and keeps the signed-out completion result visible. The retained security-audit frontend uses `/settings/audit?scope=hub`. It restores the current administrator session, requests 50 records from `/api/security-audits`, and carries the server's opaque `nextCursor` only as the `before` URL parameter. It shows the stable actor membership UUID when available, action, outcome, UTC time, and the API's bounded allowlisted context. Unknown actions remain visible with no additional details. A `403` refreshes the current session before the route reports lost administrator access; malformed API responses and request failures remain visible. Repository audit in mock mode is a provisional fixture, not a production API. diff --git a/hub/docs/copilot.md b/hub/docs/copilot.md new file mode 100644 index 000000000..cb6e108b2 --- /dev/null +++ b/hub/docs/copilot.md @@ -0,0 +1,39 @@ +# Copilot connection + +A Hub administrator can connect one deployment-wide Copilot credential for learning work. Hub obtains the credential from the configured provider, verifies it through the separate `replica-learning copilot status` command, and stores only the provider key, stable provider-configuration digest, connector membership, verification time, and connection generation. It never stores, returns, or logs the credential. + +## Configure a provider + +No Copilot credential provider is enabled by default. Simple and local deployments can explicitly select one: + +- `REPLICA_COPILOT_AUTHENTICATION=ambient-cli` uses the Copilot account signed in where Hub runs. +- `REPLICA_COPILOT_AUTHENTICATION=environment-token` reads `REPLICA_COPILOT_TOKEN` from the deployment secret store. + +These providers attribute usage to the represented individual identity. Production deployments should supply a governed provider through the same provider boundary. Restart every Hub API and worker process together after changing provider configuration. + +See [Learning foundation](learning-foundation.md) for the command boundary, storage configuration, and current learning lifecycle. + +## Administrator flow + +1. A current Hub administrator opens `/settings/copilot`. +2. Hub returns the saved connection, connector membership, last successful check, refusal state, and whether a provider is configured. +3. The administrator explicitly confirms connect or disconnect. +4. Hub starts fresh authorization through the provider recorded on the current Hub session. +5. The callback verifies the same session and external identity, then returns to `/settings/copilot/confirm`. +6. Continuing a connection verifies the credential through `replica-learning` before one serializable transaction saves the connection and audits the change. Continuing a disconnection removes the saved connection without changing the provider's credential. + +The authorization is short-lived, one-use, and bound to the Hub session, operation, actor membership, and connection generation. Continuing atomically claims it before starting verification, so duplicate submissions do not start duplicate checks. Hub permits at most four deployment checks at once and releases that capacity after the command ends. An abandoned claim stops consuming deployment capacity after 30 seconds, but remains used; the administrator starts a new fresh authorization to retry. A connection change after authorization starts or while Copilot answers returns a conflict instead of overwriting newer state. + +Connect, disconnect, page access, and authorization phases write bounded security audits. Audit context contains membership IDs, operations, outcomes, provider keys, and safe reason codes. It never contains credentials or Copilot response payloads. + +## Failure and authority behavior + +- Without a configured provider, Hub shows the configuration requirement and does not offer connection. +- A refused credential produces a denied change and records refusal state without saving a connection. +- An unavailable command or Copilot service produces a failed change and no connection. +- A stale, cancelled, expired, reused, or mismatched authorization changes nothing. +- When the connector loses their final effective administrator assignment, the same authority transaction disconnects Copilot, advances the connection generation, and audits the automatic change. +- Ending all Hub sessions cancels open sensitive authorizations but intentionally leaves the Copilot connection unchanged. +- Disconnecting leaves the credential in its provider. The operator must revoke or remove it separately when required. + +Changing provider configuration changes its stable digest. Hub requires a new successful administrator connection before learning work can use the replacement credential. diff --git a/hub/schema/membership.prisma b/hub/schema/membership.prisma index d186d3828..10f52ec08 100644 --- a/hub/schema/membership.prisma +++ b/hub/schema/membership.prisma @@ -4,11 +4,11 @@ model Membership { userId String @unique @map("user_id") @db.Uuid // Relations - user User @relation(fields: [userId], references: [id], onDelete: Restrict) - assignments MembershipAssignment[] - sessions HubSession[] + user User @relation(fields: [userId], references: [id], onDelete: Restrict) + assignments MembershipAssignment[] + sessions HubSession[] sensitiveAuthorizations SensitiveAuthorization[] - copilotConnections CopilotConnection[] + copilotConnections CopilotConnection[] // Attribute columns lifecycle MembershipLifecycle @default(ACTIVE) diff --git a/hub/schema/migrations/20261112170000_copilot_connection/migration.sql b/hub/schema/migrations/20261112170000_copilot_connection/migration.sql new file mode 100644 index 000000000..648f6b45a --- /dev/null +++ b/hub/schema/migrations/20261112170000_copilot_connection/migration.sql @@ -0,0 +1,2 @@ +ALTER TYPE "SensitiveAuthorizationOperation" ADD VALUE 'CONNECT_COPILOT'; +ALTER TYPE "SensitiveAuthorizationOperation" ADD VALUE 'DISCONNECT_COPILOT'; diff --git a/hub/schema/migrations/20261112170100_copilot_connection_state/migration.sql b/hub/schema/migrations/20261112170100_copilot_connection_state/migration.sql new file mode 100644 index 000000000..69db17c75 --- /dev/null +++ b/hub/schema/migrations/20261112170100_copilot_connection_state/migration.sql @@ -0,0 +1,70 @@ +ALTER TABLE "sensitive_authorizations" +ADD COLUMN "expected_copilot_generation" BIGINT, +ADD COLUMN "check_started_at" TIMESTAMPTZ(3), +ADD COLUMN "check_finished_at" TIMESTAMPTZ(3); + +ALTER TABLE "sensitive_authorizations" +ADD CONSTRAINT "sensitive_authorizations_copilot_generation_check" CHECK ( + ( + "operation" IN ('CONNECT_COPILOT', 'DISCONNECT_COPILOT') + AND "expected_copilot_generation" IS NOT NULL + ) + OR ( + "operation" NOT IN ('CONNECT_COPILOT', 'DISCONNECT_COPILOT') + AND "expected_copilot_generation" IS NULL + ) +); + +ALTER TABLE "sensitive_authorizations" +DROP CONSTRAINT "sensitive_authorizations_targets_check"; + +ALTER TABLE "sensitive_authorizations" +ADD CONSTRAINT "sensitive_authorizations_targets_check" CHECK ( + ( + "operation" = 'END_ALL_HUB_SESSIONS' + AND cardinality("target_membership_ids") = 0 + ) + OR ( + "operation" IN ('CONNECT_COPILOT', 'DISCONNECT_COPILOT', 'REVOKE_ADMINISTRATOR') + AND cardinality("target_membership_ids") = 1 + ) + OR ( + "operation" = 'DESIGNATE_ADMINISTRATORS' + AND cardinality("target_membership_ids") BETWEEN 1 AND 50 + ) +); + +CREATE OR REPLACE FUNCTION protect_sensitive_authorization() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + RAISE EXCEPTION 'Sensitive authorization history cannot be deleted.'; + END IF; + IF TG_OP = 'UPDATE' AND ( + NEW."id" <> OLD."id" + OR NEW."hub_session_id" <> OLD."hub_session_id" + OR NEW."actor_membership_id" <> OLD."actor_membership_id" + OR NEW."external_identity_id" <> OLD."external_identity_id" + OR NEW."operation" <> OLD."operation" + OR NEW."target_membership_ids" <> OLD."target_membership_ids" + OR NEW."expected_copilot_generation" IS DISTINCT FROM OLD."expected_copilot_generation" + OR NEW."expires_at" <> OLD."expires_at" + OR NEW."created_at" <> OLD."created_at" + OR OLD."check_started_at" IS NOT NULL + AND NEW."check_started_at" IS DISTINCT FROM OLD."check_started_at" + OR OLD."check_finished_at" IS NOT NULL + AND NEW."check_finished_at" IS DISTINCT FROM OLD."check_finished_at" + OR OLD."verified_at" IS NOT NULL AND NEW."verified_at" IS DISTINCT FROM OLD."verified_at" + OR OLD."continued_at" IS NOT NULL AND NEW."continued_at" IS DISTINCT FROM OLD."continued_at" + OR OLD."cancelled_at" IS NOT NULL AND NEW."cancelled_at" IS DISTINCT FROM OLD."cancelled_at" + ) THEN + RAISE EXCEPTION 'Sensitive authorization binding and completed transitions are immutable.'; + END IF; + IF TG_OP = 'UPDATE' AND NEW."updated_at" <= OLD."updated_at" THEN + RAISE EXCEPTION 'Sensitive authorization updates must advance updated_at.'; + END IF; + RETURN NEW; +END; +$$; diff --git a/hub/schema/sensitive-authorization-operation.enum.prisma b/hub/schema/sensitive-authorization-operation.enum.prisma index a86738377..384804d79 100644 --- a/hub/schema/sensitive-authorization-operation.enum.prisma +++ b/hub/schema/sensitive-authorization-operation.enum.prisma @@ -1,5 +1,7 @@ enum SensitiveAuthorizationOperation { + CONNECT_COPILOT DESIGNATE_ADMINISTRATORS + DISCONNECT_COPILOT END_ALL_HUB_SESSIONS REVOKE_ADMINISTRATOR } diff --git a/hub/schema/sensitive-authorization.prisma b/hub/schema/sensitive-authorization.prisma index 604766fc3..bd67c9815 100644 --- a/hub/schema/sensitive-authorization.prisma +++ b/hub/schema/sensitive-authorization.prisma @@ -6,18 +6,21 @@ model SensitiveAuthorization { externalIdentityId String @map("external_identity_id") @db.Uuid // Relations - hubSession HubSession @relation(fields: [hubSessionId], references: [id], onDelete: Restrict) - actorMembership Membership @relation(fields: [actorMembershipId], references: [id], onDelete: Restrict) - externalIdentity ExternalIdentity @relation(fields: [externalIdentityId], references: [id], onDelete: Restrict) + hubSession HubSession @relation(fields: [hubSessionId], references: [id], onDelete: Restrict) + actorMembership Membership @relation(fields: [actorMembershipId], references: [id], onDelete: Restrict) + externalIdentity ExternalIdentity @relation(fields: [externalIdentityId], references: [id], onDelete: Restrict) authorizationAttempt AuthorizationAttempt? // Attribute columns - operation SensitiveAuthorizationOperation - targetMembershipIds String[] @map("target_membership_ids") @db.Uuid - expiresAt DateTime @map("expires_at") @db.Timestamptz(3) - verifiedAt DateTime? @map("verified_at") @db.Timestamptz(3) - continuedAt DateTime? @map("continued_at") @db.Timestamptz(3) - cancelledAt DateTime? @map("cancelled_at") @db.Timestamptz(3) + operation SensitiveAuthorizationOperation + targetMembershipIds String[] @map("target_membership_ids") @db.Uuid + expectedCopilotGeneration BigInt? @map("expected_copilot_generation") + expiresAt DateTime @map("expires_at") @db.Timestamptz(3) + checkStartedAt DateTime? @map("check_started_at") @db.Timestamptz(3) + checkFinishedAt DateTime? @map("check_finished_at") @db.Timestamptz(3) + verifiedAt DateTime? @map("verified_at") @db.Timestamptz(3) + continuedAt DateTime? @map("continued_at") @db.Timestamptz(3) + cancelledAt DateTime? @map("cancelled_at") @db.Timestamptz(3) // Timestamp columns createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz(3) diff --git a/hub/server/create-app/index.ts b/hub/server/create-app/index.ts index 6b6a0624f..fc6212923 100644 --- a/hub/server/create-app/index.ts +++ b/hub/server/create-app/index.ts @@ -28,8 +28,8 @@ export function createApp({ [ "/api/auth", "/api/administrators", - "/api/session-revocation", "/api/copilot-connection", + "/api/session-revocation", "/api/security-audits", "/api/workspace", "/api/repositories", diff --git a/hub/server/domains/administrator-authorization/administrator-authorization.db.test.ts b/hub/server/domains/administrator-authorization/administrator-authorization.db.test.ts index afc1321ec..5d41c02af 100644 --- a/hub/server/domains/administrator-authorization/administrator-authorization.db.test.ts +++ b/hub/server/domains/administrator-authorization/administrator-authorization.db.test.ts @@ -179,7 +179,7 @@ describe("administrator authorization persistence", () => { }, verificationDependencies(), ), - ).resolves.toBe(true) + ).resolves.toBe("DESIGNATE_ADMINISTRATORS") const verified = await prisma.sensitiveAuthorization.findUniqueOrThrow({ select: { verifiedAt: true }, where: { id: fixture.authorizationId }, @@ -255,6 +255,15 @@ describe("administrator authorization persistence", () => { targetMembershipIds: [membershipId], }, }) + await prisma.copilotConnection.create({ + data: { + connectedByMembershipId: membershipId, + credentialDigest: "c".repeat(64), + credentialProvider: "environment_token", + id: randomUUID(), + verifiedAt: new Date(), + }, + }) const authorizationAttemptId = await createConsumedAuthorizationAttempt({ authorizationId, providerRevisionId, @@ -278,7 +287,7 @@ describe("administrator authorization persistence", () => { }, verificationDependencies(), ), - ).resolves.toBe(false) + ).resolves.toBeNull() await expect( prisma.membershipAssignment.findUniqueOrThrow({ select: { lifecycle: true }, @@ -290,6 +299,24 @@ describe("administrator authorization persistence", () => { where: { id: hubSessionId }, }) expect(endedProviderSession.endedAt).toBeInstanceOf(Date) + await expect( + prisma.copilotConnection.findUnique({ + where: { key: "global" }, + }), + ).resolves.toBeNull() + await expect( + prisma.securityAudit.findFirstOrThrow({ + select: { context: true }, + where: { action: "copilot.connection.disconnected" }, + }), + ).resolves.toEqual({ + context: { + actorMembershipId: null, + credentialProvider: "environment_token", + phase: "disconnected", + reason: "connector_role_removed", + }, + }) }) it("binds one-use continuation to the exact session, operation, and ordered targets", async () => { @@ -407,18 +434,21 @@ describe("administrator authorization persistence", () => { cancelSensitiveAuthorization(prisma, { hubSessionId: randomUUID(), id: fixture.authorizationId, + scope: "administrator", }), ).resolves.toBeNull() await expect( cancelSensitiveAuthorization(prisma, { hubSessionId: fixture.hubSessionId, id: fixture.authorizationId, + scope: "administrator", }), ).resolves.toMatchObject({ id: fixture.authorizationId }) await expect( cancelSensitiveAuthorization(prisma, { hubSessionId: fixture.hubSessionId, id: fixture.authorizationId, + scope: "administrator", }), ).resolves.toBeNull() await expect( diff --git a/hub/server/domains/administrator-authorization/run-administrator-authorization-verification-transaction/index.ts b/hub/server/domains/administrator-authorization/run-administrator-authorization-verification-transaction/index.ts index 772eb4f88..0bc327115 100644 --- a/hub/server/domains/administrator-authorization/run-administrator-authorization-verification-transaction/index.ts +++ b/hub/server/domains/administrator-authorization/run-administrator-authorization-verification-transaction/index.ts @@ -15,6 +15,7 @@ import { createOrRestoreMembership } from "../../../repositories/memberships/cre import { lockMembership } from "../../../repositories/memberships/lock-membership/index.ts" import { claimProviderEvidence } from "../../../repositories/provider-evidence-states/claim-provider-evidence/index.ts" import { createSecurityAudit } from "../../../repositories/security-audits/create-security-audit/index.ts" +import { disconnectCopilotConnectionForMembership } from "../../../repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts" import { lockSessionRevocationState } from "../../../repositories/session-revocation-states/lock-session-revocation-state/index.ts" import { getSensitiveAuthorizationAuditData } from "../../../repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts" import { verifySensitiveAuthorization } from "../../../repositories/sensitive-authorizations/verify-sensitive-authorization/index.ts" @@ -42,6 +43,8 @@ export function runAdministratorAuthorizationVerificationTransaction( }, createOrRestoreMembership: (input) => createOrRestoreMembership(transaction, input), createSecurityAudit: (input) => createSecurityAudit(transaction, input), + disconnectCopilotConnection: (membershipId) => + disconnectCopilotConnectionForMembership(transaction, membershipId), endProviderAssignment: (input) => endProviderAssignment(transaction, input), endOpenHubSessionsForMembership: (membershipId) => endOpenHubSessionsForMembership(transaction, membershipId), diff --git a/hub/server/domains/administrator-authorization/verify-administrator-authorization/index.ts b/hub/server/domains/administrator-authorization/verify-administrator-authorization/index.ts index 711453d3d..ce5b22852 100644 --- a/hub/server/domains/administrator-authorization/verify-administrator-authorization/index.ts +++ b/hub/server/domains/administrator-authorization/verify-administrator-authorization/index.ts @@ -34,13 +34,25 @@ export async function verifyAdministratorAuthorization( getAuthorizationAuditData(id: string): Promise<{ actorMembershipId: string expired: boolean - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetCount: number } | null> runTransaction: AdministratorAuthorizationVerificationTransaction writeAudit(event: CreateSecurityAuditEvent): Promise }, -): Promise { +): Promise< + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" + | null +> { const parsed = inputSchema.parse(rawInput) const input = { ...parsed, @@ -110,7 +122,7 @@ export async function verifyAdministratorAuthorization( type: "administrator_authorization", }) } - return false + return null } } const verified = await repositories.verifySensitiveAuthorization({ @@ -135,7 +147,7 @@ export async function verifyAdministratorAuthorization( type: "administrator_authorization", }) } - return false + return null } await repositories.createSecurityAudit({ actorMembershipId: verified.actorMembershipId, @@ -146,7 +158,7 @@ export async function verifyAdministratorAuthorization( targetCount: verified.targetCount, type: "administrator_authorization", }) - return true + return verified.operation }), (error) => error instanceof AdmissionTransactionConflictError, ) diff --git a/hub/server/domains/administrator-management/administrator-management.db.test.ts b/hub/server/domains/administrator-management/administrator-management.db.test.ts index d7938d071..d7dd5c7a0 100644 --- a/hub/server/domains/administrator-management/administrator-management.db.test.ts +++ b/hub/server/domains/administrator-management/administrator-management.db.test.ts @@ -341,6 +341,15 @@ describe("administrator management", () => { membershipId: target.membershipId, source: "HUB_ADMINISTRATOR", }) + await prisma.copilotConnection.create({ + data: { + connectedByMembershipId: target.membershipId, + credentialDigest: "c".repeat(64), + credentialProvider: "environment_token", + id: randomUUID(), + verifiedAt: new Date(), + }, + }) await revokeHubAdministrator( { @@ -370,6 +379,12 @@ describe("administrator management", () => { ({ membershipId }) => membershipId, ), ).toContain(target.membershipId) + await expect( + prisma.copilotConnection.findUniqueOrThrow({ + select: { connectedByMembershipId: true }, + where: { key: "global" }, + }), + ).resolves.toEqual({ connectedByMembershipId: target.membershipId }) await expect( revokeHubAdministrator( { @@ -384,6 +399,52 @@ describe("administrator management", () => { ]) }) + it("disconnects Copilot when administrator-managed revocation removes the connector's final authority", async () => { + const actor = await createMembership({}) + const connector = await createMembership({}) + await createAssignment({ + externalIdentityId: actor.externalIdentityId!, + membershipId: actor.membershipId, + source: "BOOTSTRAP", + }) + await createAssignment({ + externalIdentityId: connector.externalIdentityId!, + membershipId: connector.membershipId, + source: "HUB_ADMINISTRATOR", + }) + await prisma.copilotConnection.create({ + data: { + connectedByMembershipId: connector.membershipId, + credentialDigest: "c".repeat(64), + credentialProvider: "environment_token", + id: randomUUID(), + verifiedAt: new Date(), + }, + }) + + await revokeHubAdministrator( + { + actorMembershipId: actor.membershipId, + targetMembershipId: connector.membershipId, + }, + dependencies(), + ) + + await expect( + prisma.copilotConnection.findUnique({ + where: { key: "global" }, + }), + ).resolves.toBeNull() + await expect( + prisma.copilotConnectionState.findUniqueOrThrow({ + select: { generation: true }, + where: { key: "global" }, + }), + ).resolves.toEqual({ + generation: 1n, + }) + }) + it("rereads live actor authority before designation", async () => { const staleActor = await createMembership({}) const target = await createMembership({}) diff --git a/hub/server/domains/administrator-management/create-administrator-management-repositories/index.ts b/hub/server/domains/administrator-management/create-administrator-management-repositories/index.ts index f75c9e423..68a1bafc7 100644 --- a/hub/server/domains/administrator-management/create-administrator-management-repositories/index.ts +++ b/hub/server/domains/administrator-management/create-administrator-management-repositories/index.ts @@ -9,6 +9,7 @@ import { revokeAdministratorAssignment } from "../../../repositories/membership- import { lockAdministratorManagementTargets } from "../../../repositories/memberships/lock-administrator-management-targets/index.ts" import { lockEffectiveAdministrators } from "../../../repositories/memberships/lock-effective-administrators/index.ts" import { createSecurityAudit } from "../../../repositories/security-audits/create-security-audit/index.ts" +import { disconnectCopilotConnectionForMembership } from "../../../repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts" import type { AdministratorManagementRepositories } from "../run-administrator-management-transaction/types.ts" export function createAdministratorManagementRepositories( @@ -17,6 +18,8 @@ export function createAdministratorManagementRepositories( return { createAssignment: (input) => createAdministratorAssignment(transaction, input), createSecurityAudit: (input) => createSecurityAudit(transaction, input), + disconnectCopilotConnection: (membershipId) => + disconnectCopilotConnectionForMembership(transaction, membershipId), endOpenSessions: (membershipId) => endOpenHubSessionsForMembership(transaction, membershipId), lockActiveAssignment: (membershipId) => lockActiveAdministratorAssignment(transaction, membershipId), diff --git a/hub/server/domains/administrator-management/designate-hub-administrators/index.test.ts b/hub/server/domains/administrator-management/designate-hub-administrators/index.test.ts index 09fc8e3d7..d9e452281 100644 --- a/hub/server/domains/administrator-management/designate-hub-administrators/index.test.ts +++ b/hub/server/domains/administrator-management/designate-hub-administrators/index.test.ts @@ -87,6 +87,7 @@ describe("designateHubAdministrators()", () => { const records = { createAssignment: vi.fn().mockResolvedValue({ id: randomUUID() }), createSecurityAudit: vi.fn().mockResolvedValue(undefined), + disconnectCopilotConnection: vi.fn().mockResolvedValue(false), endOpenSessions: vi.fn().mockResolvedValue([]), lockActiveAssignment: vi.fn(), lockEffectiveAdministratorAssignments: vi.fn().mockResolvedValue([]), diff --git a/hub/server/domains/administrator-management/revoke-hub-administrator-with-repositories/index.ts b/hub/server/domains/administrator-management/revoke-hub-administrator-with-repositories/index.ts index c1bc5e0d7..e144a78e1 100644 --- a/hub/server/domains/administrator-management/revoke-hub-administrator-with-repositories/index.ts +++ b/hub/server/domains/administrator-management/revoke-hub-administrator-with-repositories/index.ts @@ -35,6 +35,22 @@ export async function revokeHubAdministratorWithRepositories( if (remainingAdministrators.length === 0) { throw new AdministratorManagementDeniedError("last_administrator") } + const disconnected = !remainingAdministrators.some( + ({ membershipId }) => membershipId === input.targetMembershipId, + ) + ? await repositories.disconnectCopilotConnection(input.targetMembershipId) + : null + if (disconnected) { + await repositories.createSecurityAudit({ + actorMembershipId: input.actorMembershipId, + connectionId: disconnected.connectionId, + credentialProvider: disconnected.credentialProvider, + id: createId(), + phase: "disconnected", + reason: "connector_role_removed", + type: "copilot_connection", + }) + } await repositories.createSecurityAudit({ actorMembershipId: input.actorMembershipId, assignmentId: assignment.id, diff --git a/hub/server/domains/administrator-management/revoke-hub-administrator/index.test.ts b/hub/server/domains/administrator-management/revoke-hub-administrator/index.test.ts index 74f7f8157..b606c553f 100644 --- a/hub/server/domains/administrator-management/revoke-hub-administrator/index.test.ts +++ b/hub/server/domains/administrator-management/revoke-hub-administrator/index.test.ts @@ -55,6 +55,7 @@ describe("revokeHubAdministrator()", () => { const records = { createAssignment: vi.fn(), createSecurityAudit: vi.fn().mockResolvedValue(undefined), + disconnectCopilotConnection: vi.fn().mockResolvedValue(false), endOpenSessions: vi.fn().mockResolvedValue([]), lockActiveAssignment: vi.fn().mockResolvedValue({ id: assignmentId }), lockEffectiveAdministratorAssignments: vi.fn().mockResolvedValue([]), diff --git a/hub/server/domains/administrator-management/run-administrator-management-transaction/types.ts b/hub/server/domains/administrator-management/run-administrator-management-transaction/types.ts index 9fd71c855..5803c618f 100644 --- a/hub/server/domains/administrator-management/run-administrator-management-transaction/types.ts +++ b/hub/server/domains/administrator-management/run-administrator-management-transaction/types.ts @@ -8,6 +8,9 @@ export interface AdministratorManagementRepositories { membershipId: string }): Promise<{ id: string }> createSecurityAudit(input: CreateSecurityAuditEvent): Promise + disconnectCopilotConnection( + membershipId: string, + ): Promise<{ connectionId: string; credentialProvider: string } | null> endOpenSessions(membershipId: string): Promise> lockActiveAssignment(membershipId: string): Promise<{ id: string } | null> lockEffectiveAdministratorAssignments(membershipIds: string[]): Promise> diff --git a/hub/server/domains/admission/admit-authentication-proof/index.test.ts b/hub/server/domains/admission/admit-authentication-proof/index.test.ts index 118dbfe42..5946e1020 100644 --- a/hub/server/domains/admission/admit-authentication-proof/index.test.ts +++ b/hub/server/domains/admission/admit-authentication-proof/index.test.ts @@ -35,6 +35,7 @@ function repositories(overrides: Partial = {}) { transition: "created", }), createSecurityAudit: vi.fn().mockResolvedValue(undefined), + disconnectCopilotConnection: vi.fn().mockResolvedValue(false), endProviderAssignment: vi.fn().mockResolvedValue(undefined), endOpenHubSessionsForMembership: vi.fn().mockResolvedValue([]), lockActiveAssignments: vi diff --git a/hub/server/domains/admission/apply-provider-assignment-evidence/index.ts b/hub/server/domains/admission/apply-provider-assignment-evidence/index.ts index 17fb641f7..f1155f935 100644 --- a/hub/server/domains/admission/apply-provider-assignment-evidence/index.ts +++ b/hub/server/domains/admission/apply-provider-assignment-evidence/index.ts @@ -135,6 +135,21 @@ export async function applyProviderAssignmentEvidence( } } const assignments = await dependencies.repositories.lockActiveAssignments(membershipId) + const administrator = assignments.some((assignment) => assignment.role === "ADMINISTRATOR") + const disconnected = administrator + ? null + : await dependencies.repositories.disconnectCopilotConnection(membershipId) + if (disconnected) { + await dependencies.repositories.createSecurityAudit({ + actorMembershipId: null, + connectionId: disconnected.connectionId, + credentialProvider: disconnected.credentialProvider, + id: dependencies.createId(), + phase: "disconnected", + reason: "connector_role_removed", + type: "copilot_connection", + }) + } if (!assignments.length) { return { denied: true, @@ -144,8 +159,6 @@ export async function applyProviderAssignmentEvidence( return { denied: false, membershipId, - role: assignments.some((assignment) => assignment.role === "ADMINISTRATOR") - ? "ADMINISTRATOR" - : "MEMBER", + role: administrator ? "ADMINISTRATOR" : "MEMBER", } } diff --git a/hub/server/domains/admission/provider-role-loss.db.test.ts b/hub/server/domains/admission/provider-role-loss.db.test.ts index 5bf2e7ce9..c1d7b3ee6 100644 --- a/hub/server/domains/admission/provider-role-loss.db.test.ts +++ b/hub/server/domains/admission/provider-role-loss.db.test.ts @@ -7,7 +7,7 @@ import { withFailingSecurityAudit } from "../../../test/database/with-failing-se import { admitAuthenticationProof } from "./admit-authentication-proof" import { runAdmissionTransaction } from "./run-admission-transaction" -async function createProviderRoleSession() { +async function createProviderRoleSession(role: "MEMBER" | "ADMINISTRATOR" = "MEMBER") { const providerId = randomUUID() const providerRevisionId = randomUUID() const userId = randomUUID() @@ -52,7 +52,7 @@ async function createProviderRoleSession() { membershipId, providerAssignmentSubject: "22222222-2222-4222-8222-222222222222", providerRevisionId, - role: "MEMBER", + role, source: "AUTHENTICATION_PROVIDER", }, }) @@ -92,7 +92,10 @@ async function createProviderRoleSession() { } } -function revokeProviderRole(records: Awaited>) { +function applyProviderRole( + records: Awaited>, + role: "MEMBER" | null, +) { return admitAuthenticationProof( { proof: { @@ -100,10 +103,10 @@ function revokeProviderRole(records: Awaited>) { + return applyProviderRole(records, null) +} + describe("provider role-loss admission", () => { it("commits revocation, session termination, and denial audit together", async () => { const records = await createProviderRoleSession() @@ -180,4 +187,54 @@ describe("provider role-loss admission", () => { }), ).toBe(0) }) + + it.each([ + ["downgrades the connector to member", "MEMBER" as const, false, null], + ["removes the connector's provider authority", null, false, null], + ["retains another administrator source", null, true, "connected"], + ])( + "%s and updates the Copilot connection", + async (_case, role, withRemainingAdministratorSource, expectedConnection) => { + const records = await createProviderRoleSession("ADMINISTRATOR") + if (withRemainingAdministratorSource) { + await prisma.membershipAssignment.create({ + data: { + externalIdentityId: records.externalIdentityId, + id: randomUUID(), + membershipId: records.membershipId, + role: "ADMINISTRATOR", + source: "BOOTSTRAP", + }, + }) + } + await prisma.copilotConnection.create({ + data: { + connectedByMembershipId: records.membershipId, + credentialDigest: "c".repeat(64), + credentialProvider: "environment_token", + id: randomUUID(), + verifiedAt: new Date(), + }, + }) + + const admission = applyProviderRole(records, role) + if (role === null && !withRemainingAdministratorSource) { + await expect(admission).rejects.toMatchObject({ reason: "authority_missing" }) + } else { + await expect(admission).resolves.toMatchObject({ + role: withRemainingAdministratorSource ? "ADMINISTRATOR" : "MEMBER", + }) + } + + const connection = await prisma.copilotConnection.findUnique({ + select: { connectedByMembershipId: true }, + where: { key: "global" }, + }) + expect(connection).toEqual( + expectedConnection === "connected" + ? { connectedByMembershipId: records.membershipId } + : null, + ) + }, + ) }) diff --git a/hub/server/domains/admission/run-admission-transaction/index.ts b/hub/server/domains/admission/run-admission-transaction/index.ts index 87758b750..aee352ab5 100644 --- a/hub/server/domains/admission/run-admission-transaction/index.ts +++ b/hub/server/domains/admission/run-admission-transaction/index.ts @@ -8,6 +8,7 @@ import { endOpenHubSessionsForMembership } from "../../../repositories/hub-sessi import { createProviderAssignment } from "../../../repositories/membership-assignments/create-provider-assignment/index.ts" import { createOrRestoreBootstrapAssignment } from "../../../repositories/membership-assignments/create-or-restore-bootstrap-assignment/index.ts" import { endProviderAssignment } from "../../../repositories/membership-assignments/end-provider-assignment/index.ts" +import { disconnectCopilotConnectionForMembership } from "../../../repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts" import { lockActiveMembershipAssignments } from "../../../repositories/membership-assignments/lock-active-membership-assignments/index.ts" import { lockActiveProviderAssignment } from "../../../repositories/membership-assignments/lock-active-provider-assignment/index.ts" import { createMembership } from "../../../repositories/memberships/create-membership/index.ts" @@ -36,6 +37,8 @@ export function runAdmissionTransaction( createHubSession: (input) => createHubSession(transaction, input), createOrRestoreMembership: (input) => createOrRestoreMembership(transaction, input), createSecurityAudit: (input) => createSecurityAudit(transaction, input), + disconnectCopilotConnection: (membershipId) => + disconnectCopilotConnectionForMembership(transaction, membershipId), endProviderAssignment: (input) => endProviderAssignment(transaction, input), endOpenHubSessionsForMembership: (membershipId) => endOpenHubSessionsForMembership(transaction, membershipId), diff --git a/hub/server/domains/admission/run-admission-transaction/types.ts b/hub/server/domains/admission/run-admission-transaction/types.ts index 426d91e6e..da645c03d 100644 --- a/hub/server/domains/admission/run-admission-transaction/types.ts +++ b/hub/server/domains/admission/run-admission-transaction/types.ts @@ -36,6 +36,9 @@ export interface AdmissionRepositories { transition: "created" | "restored" | "unchanged" }> createSecurityAudit(input: CreateSecurityAuditEvent): Promise + disconnectCopilotConnection( + membershipId: string, + ): Promise<{ connectionId: string; credentialProvider: string } | null> endProviderAssignment(input: { id: string; lifecycle: "SUPERSEDED" | "REVOKED" }): Promise endOpenHubSessionsForMembership(membershipId: string): Promise> lockActiveAssignments(membershipId: string): Promise< diff --git a/hub/server/domains/copilot-connection/connect-copilot/index.ts b/hub/server/domains/copilot-connection/connect-copilot/index.ts index 63898622d..399b819ac 100644 --- a/hub/server/domains/copilot-connection/connect-copilot/index.ts +++ b/hub/server/domains/copilot-connection/connect-copilot/index.ts @@ -18,13 +18,17 @@ const statusSchema = z export async function connectCopilot( { + authorizationId, credentialProvider, + hubSessionId, sessionDigest, }: { + authorizationId?: string credentialProvider: { configurationDigest: string | null key: CopilotCredentialProviderKey } + hubSessionId?: string sessionDigest: string }, { @@ -143,6 +147,33 @@ export async function connectCopilot( "The Copilot connection changed while Hub checked the credential.", ) } + if ( + authorizationId && + (!hubSessionId || + !repositories.continueAuthorization || + !(await repositories.continueAuthorization({ + actorMembershipId: session.membershipId, + authorizationId, + hubSessionId, + operation: "CONNECT_COPILOT", + }))) + ) { + throw new CopilotConnectionError( + "not_authorized", + "The Copilot authorization is no longer available.", + ) + } + if (authorizationId) { + await repositories.writeAudit({ + actorMembershipId: session.membershipId, + authorizationId, + id: createId(), + operation: "CONNECT_COPILOT", + phase: "completed", + targetCount: 1, + type: "administrator_authorization", + }) + } const connectionId = createId() await repositories.replaceConnection({ connectedByMembershipId: session.membershipId, diff --git a/hub/server/domains/copilot-connection/continue-copilot-authorization/index.test.ts b/hub/server/domains/copilot-connection/continue-copilot-authorization/index.test.ts new file mode 100644 index 000000000..a97d50411 --- /dev/null +++ b/hub/server/domains/copilot-connection/continue-copilot-authorization/index.test.ts @@ -0,0 +1,38 @@ +import { randomUUID } from "node:crypto" +import { describe, expect, it, vi } from "vitest" + +import type { Prisma } from "../../../generated/prisma/client" +import { continueCopilotAuthorization } from "." + +describe("continueCopilotAuthorization()", () => { + it("accepts runtime fields while forwarding only the authorization binding", async () => { + const transaction = { $queryRaw: vi.fn().mockResolvedValue([{ id: randomUUID() }]) } + const database: Parameters[0] = { + $transaction: (operation: (value: Prisma.TransactionClient) => Promise) => + operation(transaction as unknown as Prisma.TransactionClient), + } + const mutate = vi.fn().mockResolvedValue({ disconnected: true }) + const authorizationId = randomUUID() + const hubSessionId = randomUUID() + + await expect( + continueCopilotAuthorization( + database, + { + authorizationId, + hubSessionId, + operation: "DISCONNECT_COPILOT", + sessionDigest: "a".repeat(64), + signal: AbortSignal.abort(), + }, + mutate, + ), + ).resolves.toEqual({ disconnected: true }) + + expect(mutate).toHaveBeenCalledWith({ + authorizationId, + hubSessionId, + operation: "DISCONNECT_COPILOT", + }) + }) +}) diff --git a/hub/server/domains/copilot-connection/continue-copilot-authorization/index.ts b/hub/server/domains/copilot-connection/continue-copilot-authorization/index.ts new file mode 100644 index 000000000..c760bc27e --- /dev/null +++ b/hub/server/domains/copilot-connection/continue-copilot-authorization/index.ts @@ -0,0 +1,79 @@ +import { randomUUID } from "node:crypto" +import { z } from "zod" +import type { Prisma } from "../../../generated/prisma/client.ts" + +import { createSecurityAudit } from "../../../repositories/security-audits/create-security-audit/index.ts" +import { claimCopilotAuthorizationCheck } from "../../../repositories/sensitive-authorizations/claim-copilot-authorization-check/index.ts" +import { finishCopilotAuthorizationCheck } from "../../../repositories/sensitive-authorizations/finish-copilot-authorization-check/index.ts" +import { getSensitiveAuthorizationAuditData } from "../../../repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts" +import { markSensitiveAuthorizationContinued } from "../../../repositories/sensitive-authorizations/mark-sensitive-authorization-continued/index.ts" +import { CopilotConnectionError } from "../errors.ts" + +const maximumConcurrentChecks = 4 +const inputSchema = z.object({ + authorizationId: z.uuid(), + hubSessionId: z.uuid(), + operation: z.enum(["CONNECT_COPILOT", "DISCONNECT_COPILOT"]), +}) + +interface Database { + $transaction( + operation: (transaction: Prisma.TransactionClient) => Promise, + ): Promise +} + +export async function continueCopilotAuthorization( + database: Database, + rawInput: unknown, + mutate: (input: { + authorizationId: string + hubSessionId: string + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + }) => Promise, +) { + const input = inputSchema.parse(rawInput) + const claimed = await database.$transaction((transaction) => + claimCopilotAuthorizationCheck(transaction, { + id: input.authorizationId, + hubSessionId: input.hubSessionId, + maximumConcurrentChecks, + operation: input.operation, + }), + ) + if (!claimed) { + throw new CopilotConnectionError( + "connection_changed", + "The Copilot authorization is no longer available.", + ) + } + try { + return await mutate(input) + } catch (error) { + await database.$transaction(async (transaction) => { + await finishCopilotAuthorizationCheck(transaction, input.authorizationId) + const authorization = await getSensitiveAuthorizationAuditData( + transaction, + input.authorizationId, + ) + if (!authorization || authorization.continued) return + await markSensitiveAuthorizationContinued(transaction, input.authorizationId) + await createSecurityAudit(transaction, { + actorMembershipId: authorization.actorMembershipId, + authorizationId: input.authorizationId, + id: randomUUID(), + operation: authorization.operation, + phase: authorization.expired ? "expired" : "denied", + reason: error instanceof CopilotConnectionError ? error.code : "transaction_error", + targetCount: authorization.targetCount, + type: "administrator_authorization", + }) + }) + throw error + } finally { + await database + .$transaction((transaction) => + finishCopilotAuthorizationCheck(transaction, input.authorizationId), + ) + .catch(() => undefined) + } +} diff --git a/hub/server/domains/copilot-connection/disconnect-copilot/index.ts b/hub/server/domains/copilot-connection/disconnect-copilot/index.ts index 0fc23213f..fd2411d89 100644 --- a/hub/server/domains/copilot-connection/disconnect-copilot/index.ts +++ b/hub/server/domains/copilot-connection/disconnect-copilot/index.ts @@ -2,7 +2,11 @@ import { CopilotConnectionError } from "../errors.ts" import type { CopilotConnectionTransactionRepositories } from "../types.ts" export async function disconnectCopilot( - { sessionDigest }: { sessionDigest: string }, + { + authorizationId, + hubSessionId, + sessionDigest, + }: { authorizationId?: string; hubSessionId?: string; sessionDigest: string }, { createId, runTransaction, @@ -23,6 +27,33 @@ export async function disconnectCopilot( if (!connection || !(await repositories.deleteConnection())) { throw new CopilotConnectionError("not_connected", "Copilot is not connected.") } + if ( + authorizationId && + (!hubSessionId || + !repositories.continueAuthorization || + !(await repositories.continueAuthorization({ + actorMembershipId: session.membershipId, + authorizationId, + hubSessionId, + operation: "DISCONNECT_COPILOT", + }))) + ) { + throw new CopilotConnectionError( + "not_authorized", + "The Copilot authorization is no longer available.", + ) + } + if (authorizationId) { + await repositories.writeAudit({ + actorMembershipId: session.membershipId, + authorizationId, + id: createId(), + operation: "DISCONNECT_COPILOT", + phase: "completed", + targetCount: 1, + type: "administrator_authorization", + }) + } await repositories.clearRefusal() await repositories.advanceState() await repositories.writeAudit({ diff --git a/hub/server/domains/copilot-connection/types.ts b/hub/server/domains/copilot-connection/types.ts index 81e3423d8..6f197294d 100644 --- a/hub/server/domains/copilot-connection/types.ts +++ b/hub/server/domains/copilot-connection/types.ts @@ -6,6 +6,12 @@ export interface CopilotConnectionSnapshot { export interface CopilotConnectionTransactionRepositories { advanceState: () => Promise clearRefusal: () => Promise + continueAuthorization?: (input: { + actorMembershipId: string + authorizationId: string + hubSessionId: string + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + }) => Promise deleteConnection: () => Promise lockAdministratorSession: (sessionDigest: string) => Promise<{ membershipId: string } | null> getConnection: () => Promise<{ @@ -26,13 +32,6 @@ export interface CopilotConnectionTransactionRepositories { credentialProvider: string refusedAt: Date }) => Promise - writeAudit: (input: { - actorMembershipId: string | null - connectionId?: string - credentialProvider: string - id: string - phase: "connected" | "disconnected" | "denied" | "failed" - reason?: string - type: "copilot_connection" - }) => Promise + writeAudit: (input: CreateSecurityAuditEvent) => Promise } +import type { CreateSecurityAuditEvent } from "../../repositories/security-audits/create-security-audit/types.ts" diff --git a/hub/server/domains/identity/reconcile-authentication-providers/index.test.ts b/hub/server/domains/identity/reconcile-authentication-providers/index.test.ts index 97a9894ea..1450c3910 100644 --- a/hub/server/domains/identity/reconcile-authentication-providers/index.test.ts +++ b/hub/server/domains/identity/reconcile-authentication-providers/index.test.ts @@ -22,6 +22,7 @@ function repositories( createAuthenticationProvider: vi.fn(), createAuthenticationProviderRevision: vi.fn(), createSecurityAudit: vi.fn(), + disconnectCopilotConnectionWithoutEffectiveAdministrator: vi.fn().mockResolvedValue(null), disableAuthenticationProvider: vi.fn(), enableAuthenticationProvider: vi.fn(), findAuthenticationProvider: vi.fn(), @@ -201,6 +202,99 @@ describe("reconcileAuthenticationProviders()", () => { ) }) + it("disconnects Copilot when provider removal ends the connector's final administrator source", async () => { + const records = repositories([ + { + configurationDigest: "a".repeat(64), + enabled: true, + id: randomUUID(), + key: "github", + revision: 1, + revisionId: randomUUID(), + }, + ]) + const membershipId = randomUUID() + const connectionId = randomUUID() + records.incrementSessionRevocation.mockResolvedValue({ revision: 1 }) + records.disconnectCopilotConnectionWithoutEffectiveAdministrator.mockResolvedValue({ + connectionId, + credentialProvider: "environment_token", + membershipId, + }) + + await reconcileAuthenticationProviders([], { + createId: randomUUID, + runTransaction: (operation) => operation(records), + writeAudit: vi.fn(), + }) + + expect(records.disconnectCopilotConnectionWithoutEffectiveAdministrator).toHaveBeenCalledOnce() + expect(records.createSecurityAudit).toHaveBeenCalledWith( + expect.objectContaining({ + actorMembershipId: null, + connectionId, + credentialProvider: "environment_token", + phase: "disconnected", + reason: "connector_role_removed", + type: "copilot_connection", + }), + ) + }) + + it("disconnects Copilot when provider revision replacement ends the connector's authority", async () => { + const providerId = randomUUID() + const records = repositories([ + { + configurationDigest: "a".repeat(64), + enabled: true, + id: providerId, + key: "github", + revision: 1, + revisionId: randomUUID(), + }, + ]) + const membershipId = randomUUID() + const connectionId = randomUUID() + records.createAuthenticationProviderRevision.mockResolvedValue({ + configurationDigest: "b".repeat(64), + id: randomUUID(), + providerId, + revision: 2, + }) + records.disconnectCopilotConnectionWithoutEffectiveAdministrator.mockResolvedValue({ + connectionId, + credentialProvider: "environment_token", + membershipId, + }) + + await reconcileAuthenticationProviders( + [ + { + canonicalPublicConfiguration: '{"provider":"github","revision":2}', + providerKey: "github", + revision: 2, + }, + ], + { + createId: randomUUID, + runTransaction: (operation) => operation(records), + writeAudit: vi.fn(), + }, + ) + + expect(records.disconnectCopilotConnectionWithoutEffectiveAdministrator).toHaveBeenCalledOnce() + expect(records.createSecurityAudit).toHaveBeenCalledWith( + expect.objectContaining({ + actorMembershipId: null, + connectionId, + credentialProvider: "environment_token", + phase: "disconnected", + reason: "connector_role_removed", + type: "copilot_connection", + }), + ) + }) + it("writes one terminal retry-exhaustion audit after the bounded transaction policy", async () => { const writeAudit = vi.fn() const runTransaction = vi.fn().mockRejectedValue(new IdentityTransactionConflictError()) diff --git a/hub/server/domains/identity/reconcile-authentication-providers/index.ts b/hub/server/domains/identity/reconcile-authentication-providers/index.ts index 3c4aab3b6..ced7ea258 100644 --- a/hub/server/domains/identity/reconcile-authentication-providers/index.ts +++ b/hub/server/domains/identity/reconcile-authentication-providers/index.ts @@ -174,6 +174,19 @@ export async function reconcileAuthenticationProviders( }) } } + const disconnected = + await repositories.disconnectCopilotConnectionWithoutEffectiveAdministrator() + if (disconnected) { + await repositories.createSecurityAudit({ + actorMembershipId: null, + connectionId: disconnected.connectionId, + credentialProvider: disconnected.credentialProvider, + id: dependencies.createId(), + phase: "disconnected", + reason: "connector_role_removed", + type: "copilot_connection", + }) + } return result }), (error) => error instanceof IdentityTransactionConflictError, diff --git a/hub/server/domains/identity/run-provider-revision-transaction/index.ts b/hub/server/domains/identity/run-provider-revision-transaction/index.ts index c5cfa1f57..32916ca3a 100644 --- a/hub/server/domains/identity/run-provider-revision-transaction/index.ts +++ b/hub/server/domains/identity/run-provider-revision-transaction/index.ts @@ -7,6 +7,7 @@ import { findAuthenticationProvider } from "../../../repositories/authentication import { lockAuthenticationProvidersForReconciliation } from "../../../repositories/authentication-providers/lock-authentication-providers-for-reconciliation/index.ts" import { selectAuthenticationProviderRevision } from "../../../repositories/authentication-providers/select-authentication-provider-revision/index.ts" import { createSecurityAudit } from "../../../repositories/security-audits/create-security-audit/index.ts" +import { disconnectCopilotConnectionWithoutEffectiveAdministrator } from "../../../repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.ts" import { incrementSessionRevocationState } from "../../../repositories/session-revocation-states/increment-session-revocation-state/index.ts" import { classifyPrismaTransactionError } from "../../../integrations/prisma/classify-transaction-error/index.ts" import { IdentityTransactionConflictError } from "../errors.ts" @@ -29,6 +30,8 @@ export function runProviderRevisionTransaction( createAuthenticationProviderRevision: (input) => createAuthenticationProviderRevision(transaction, input), createSecurityAudit: (input) => createSecurityAudit(transaction, input), + disconnectCopilotConnectionWithoutEffectiveAdministrator: () => + disconnectCopilotConnectionWithoutEffectiveAdministrator(transaction), disableAuthenticationProvider: (providerId) => disableAuthenticationProvider(transaction, providerId), enableAuthenticationProvider: (input) => enableAuthenticationProvider(transaction, input), diff --git a/hub/server/domains/identity/run-provider-revision-transaction/types.ts b/hub/server/domains/identity/run-provider-revision-transaction/types.ts index f7b8d2b95..12ab8f12d 100644 --- a/hub/server/domains/identity/run-provider-revision-transaction/types.ts +++ b/hub/server/domains/identity/run-provider-revision-transaction/types.ts @@ -37,6 +37,11 @@ export interface ProviderRevisionRepositories { } export interface AuthenticationProviderReconciliationRepositories extends ProviderRevisionRepositories { + disconnectCopilotConnectionWithoutEffectiveAdministrator(): Promise<{ + connectionId: string + credentialProvider: string + membershipId: string + } | null> disableAuthenticationProvider(providerId: string): Promise enableAuthenticationProvider(input: { providerId: string; revisionId: string }): Promise incrementSessionRevocation(): Promise<{ revision: number } | null> diff --git a/hub/server/index.test.ts b/hub/server/index.test.ts index 19746b026..8b1127bd1 100644 --- a/hub/server/index.test.ts +++ b/hub/server/index.test.ts @@ -124,7 +124,9 @@ describe("server runtime", () => { }) it("passes resolved local defaults to authentication composition", async () => { + const administrators = {} const authentication = { + administrators, currentSession: {}, local: { administratorEnrollment: {}, @@ -175,7 +177,11 @@ describe("server runtime", () => { }) expect(Buffer.from(environment.HUB_AUTHENTICATION_ENCRYPTION_KEY!, "base64")).toHaveLength(32) expect(Buffer.from(environment.HUB_BOOTSTRAP_SECRET!, "base64url")).toHaveLength(32) - expect(createCopilotConnectionRouteDependencies).toHaveBeenCalledWith(environment, logger) + expect(createCopilotConnectionRouteDependencies).toHaveBeenCalledWith( + environment, + logger, + administrators, + ) expect(runApi).toHaveBeenCalledWith( expect.objectContaining({ authentication, copilotConnection, product }), ) @@ -254,7 +260,9 @@ describe("server runtime", () => { const disableAuthenticationProviders = vi.fn() const product = { listRepositories: vi.fn(), findRepositoryIndex: vi.fn() } const createProductRouteDependencies = vi.fn().mockReturnValue(product) + const administrators = {} const authentication = { + administrators, currentSession: {}, github: { signIn: {}, @@ -290,7 +298,11 @@ describe("server runtime", () => { expect(createAuthenticationRouteDependencies).toHaveBeenCalledWith(process.env) expect(createProductRouteDependencies).toHaveBeenCalledOnce() - expect(createCopilotConnectionRouteDependencies).toHaveBeenCalledWith(process.env, logger) + expect(createCopilotConnectionRouteDependencies).toHaveBeenCalledWith( + process.env, + logger, + administrators, + ) expect(disableAuthenticationProviders).not.toHaveBeenCalled() expect(runApi).toHaveBeenCalledWith( expect.objectContaining({ authentication, copilotConnection, product }), diff --git a/hub/server/index.ts b/hub/server/index.ts index 6c86f4160..93eb5ca13 100644 --- a/hub/server/index.ts +++ b/hub/server/index.ts @@ -90,6 +90,7 @@ try { copilotConnection = await createCopilotConnectionRouteDependencies( authenticationEnvironment, logger, + authentication.administrators, ) } else { await disableAuthenticationProviders() diff --git a/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts new file mode 100644 index 000000000..0e5d96972 --- /dev/null +++ b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-for-membership/index.ts @@ -0,0 +1,18 @@ +import type { Prisma } from "../../../generated/prisma/client.ts" + +export async function disconnectCopilotConnectionForMembership( + database: Pick, + membershipId: string, +): Promise<{ connectionId: string; credentialProvider: string } | null> { + const connection = await database.copilotConnection.findFirst({ + select: { credentialProvider: true, id: true }, + where: { connectedByMembershipId: membershipId, key: "global" }, + }) + if (!connection) return null + await database.copilotConnection.delete({ where: { id: connection.id } }) + await database.copilotConnectionState.update({ + data: { generation: { increment: 1 } }, + where: { key: "global" }, + }) + return { connectionId: connection.id, credentialProvider: connection.credentialProvider } +} diff --git a/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.db.test.ts b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.db.test.ts new file mode 100644 index 000000000..54c27ea9c --- /dev/null +++ b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.db.test.ts @@ -0,0 +1,152 @@ +import { randomUUID } from "node:crypto" +import { describe, expect, it } from "vitest" + +import { reconcileAuthenticationProviders } from "../../../domains/identity/reconcile-authentication-providers" +import { runProviderRevisionTransaction } from "../../../domains/identity/run-provider-revision-transaction" +import { prisma } from "../../../integrations/prisma" +import { createSecurityAudit } from "../../security-audits/create-security-audit" + +function providerCandidate(revision: number) { + return { + canonicalPublicConfiguration: JSON.stringify({ clientId: `github-client-${revision}` }), + providerKey: "github", + revision, + } +} + +function reconcile(revision: number | null) { + return reconcileAuthenticationProviders(revision === null ? [] : [providerCandidate(revision)], { + createId: randomUUID, + runTransaction: (operation) => runProviderRevisionTransaction(prisma, operation), + writeAudit: (event) => createSecurityAudit(prisma, event), + }) +} + +async function createConnectedProviderAdministrator(withIndependentAdministratorSource = false) { + const [provider] = await reconcile(1) + const userId = randomUUID() + const externalIdentityId = randomUUID() + const membershipId = randomUUID() + await prisma.$transaction(async (transaction) => { + await transaction.user.create({ data: { id: userId } }) + await transaction.externalIdentity.create({ + data: { + id: externalIdentityId, + issuer: "https://github.com", + provider: "github", + subject: randomUUID(), + userId, + }, + }) + await transaction.membership.create({ data: { id: membershipId, userId } }) + await transaction.membershipAssignment.create({ + data: { + externalIdentityId, + id: randomUUID(), + membershipId, + providerAssignmentSubject: randomUUID(), + providerRevisionId: provider!.revisionId, + role: "ADMINISTRATOR", + source: "AUTHENTICATION_PROVIDER", + }, + }) + if (withIndependentAdministratorSource) { + await transaction.membershipAssignment.create({ + data: { + externalIdentityId, + id: randomUUID(), + membershipId, + role: "ADMINISTRATOR", + source: "BOOTSTRAP", + }, + }) + } + await transaction.copilotConnection.create({ + data: { + connectedByMembershipId: membershipId, + credentialDigest: "a".repeat(64), + credentialProvider: "environment_token", + id: randomUUID(), + verifiedAt: new Date(), + }, + }) + }) + return { membershipId, provider } +} + +async function expectAutomaticDisconnection() { + await expect( + prisma.copilotConnection.findUnique({ + where: { key: "global" }, + }), + ).resolves.toBeNull() + await expect( + prisma.copilotConnectionState.findUniqueOrThrow({ + select: { generation: true }, + where: { key: "global" }, + }), + ).resolves.toEqual({ generation: 1n }) + await expect( + prisma.securityAudit.findFirstOrThrow({ + select: { action: true, context: true, outcome: true }, + where: { action: "copilot.connection.disconnected" }, + }), + ).resolves.toEqual({ + action: "copilot.connection.disconnected", + context: { + actorMembershipId: null, + credentialProvider: "environment_token", + phase: "disconnected", + reason: "connector_role_removed", + }, + outcome: "SUCCESS", + }) +} + +describe("disconnectCopilotConnectionWithoutEffectiveAdministrator()", () => { + it("disconnects after provider removal returns no configured providers", async () => { + await createConnectedProviderAdministrator() + + await expect(reconcile(null)).resolves.toEqual([]) + + await expectAutomaticDisconnection() + }) + + it("disconnects when revision replacement makes the connector's provider assignment stale", async () => { + const { provider } = await createConnectedProviderAdministrator() + + await expect(reconcile(2)).resolves.toEqual([ + expect.objectContaining({ + providerId: provider!.providerId, + providerKey: "github", + revision: 2, + }), + ]) + + await expectAutomaticDisconnection() + }) + + it("preserves the connection when provider removal leaves an independent administrator source", async () => { + const { membershipId } = await createConnectedProviderAdministrator(true) + + await expect(reconcile(null)).resolves.toEqual([]) + + await expect( + prisma.copilotConnection.findUniqueOrThrow({ + select: { + connectedByMembershipId: true, + credentialDigest: true, + }, + where: { key: "global" }, + }), + ).resolves.toEqual({ + connectedByMembershipId: membershipId, + credentialDigest: "a".repeat(64), + }) + await expect( + prisma.securityAudit.count({ + where: { action: "copilot.connection.disconnected" }, + }), + ).resolves.toBe(0) + }) +}) diff --git a/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.ts b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.ts new file mode 100644 index 000000000..62f0f9fb8 --- /dev/null +++ b/hub/server/repositories/copilot-connection-state/disconnect-copilot-connection-without-effective-administrator/index.ts @@ -0,0 +1,56 @@ +import type { Prisma } from "../../../generated/prisma/client.ts" + +export async function disconnectCopilotConnectionWithoutEffectiveAdministrator( + database: Pick, +): Promise<{ + connectionId: string + credentialProvider: string + membershipId: string +} | null> { + const rows = await database.$queryRaw< + Array<{ + connectionId: string + credentialProvider: string + membershipId: string + }> + >` + WITH disconnected AS ( + DELETE FROM "copilot_connections" connection + WHERE connection."key" = 'global' + AND NOT EXISTS ( + SELECT 1 + FROM "membership_assignments" assignment + LEFT JOIN "authentication_provider_revisions" revision + ON revision."id" = assignment."provider_revision_id" + LEFT JOIN "authentication_providers" provider + ON provider."id" = revision."provider_id" + WHERE assignment."membership_id" = connection."connected_by_membership_id" + AND assignment."lifecycle" = 'ACTIVE' + AND assignment."role" = 'ADMINISTRATOR' + AND ( + assignment."source" IN ('BOOTSTRAP', 'HUB_ADMINISTRATOR') + OR ( + assignment."source" = 'AUTHENTICATION_PROVIDER' + AND provider."enabled" = true + AND provider."selected_revision_id" = assignment."provider_revision_id" + ) + ) + ) + RETURNING + connection."id", + connection."connected_by_membership_id", + connection."credential_provider" + ), + advanced AS ( + UPDATE "copilot_connection_states" + SET "generation" = "generation" + 1, "updated_at" = clock_timestamp() + WHERE "key" = 'global' AND EXISTS (SELECT 1 FROM disconnected) + ) + SELECT + disconnected."id" AS "connectionId", + disconnected."connected_by_membership_id" AS "membershipId", + disconnected."credential_provider" AS "credentialProvider" + FROM disconnected + ` + return rows[0] ?? null +} diff --git a/hub/server/repositories/security-audits/create-security-audit/types.ts b/hub/server/repositories/security-audits/create-security-audit/types.ts index 6b1c4963a..fdb11f4a1 100644 --- a/hub/server/repositories/security-audits/create-security-audit/types.ts +++ b/hub/server/repositories/security-audits/create-security-audit/types.ts @@ -86,7 +86,12 @@ export interface AdministratorAuthorizationAudit extends SecurityAuditEvent { type: "administrator_authorization" actorMembershipId: string authorizationId: string - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" phase: "requested" | "verified" | "completed" | "denied" | "expired" | "cancelled" reason?: string targetCount: number @@ -225,6 +230,7 @@ export type CreateSecurityAuditEvent = | AdministratorManagementDeniedAudit | AdministratorManagementFailedAudit | AdministratorAuthorizationAudit + | CopilotConnectionAudit | AllHubSessionsEndedAudit | AllHubSessionsEndFailedAudit | AdmissionDeniedAudit @@ -238,4 +244,3 @@ export type CreateSecurityAuditEvent = | AuthenticationProviderLifecycleAudit | AuthenticationProvidersReconcileFailedAudit | SessionRevocationAdvancedAudit - | CopilotConnectionAudit diff --git a/hub/server/repositories/security-audits/parse-security-audit-event/index.ts b/hub/server/repositories/security-audits/parse-security-audit-event/index.ts index 9e42d678f..7aea3bb62 100644 --- a/hub/server/repositories/security-audits/parse-security-audit-event/index.ts +++ b/hub/server/repositories/security-audits/parse-security-audit-event/index.ts @@ -65,7 +65,9 @@ const eventSchema = z.discriminatedUnion("type", [ authorizationId: z.uuid(), id: z.uuid(), operation: z.enum([ + "CONNECT_COPILOT", "DESIGNATE_ADMINISTRATORS", + "DISCONNECT_COPILOT", "END_ALL_HUB_SESSIONS", "REVOKE_ADMINISTRATOR", ]), diff --git a/hub/server/repositories/security-audits/parse-security-audit-event/types.ts b/hub/server/repositories/security-audits/parse-security-audit-event/types.ts index 107de7793..9f7d4cb42 100644 --- a/hub/server/repositories/security-audits/parse-security-audit-event/types.ts +++ b/hub/server/repositories/security-audits/parse-security-audit-event/types.ts @@ -22,11 +22,11 @@ import type { AdministratorManagementDeniedAudit, AdministratorManagementFailedAudit, AdministratorAuthorizationAudit, + CopilotConnectionAudit, AllHubSessionsEndFailedAudit, AllHubSessionsEndedAudit, SessionCreatedAudit, SessionEndedAudit, - CopilotConnectionAudit, } from "../create-security-audit/types.ts" export type ParsedSecurityAuditEvent = @@ -43,6 +43,7 @@ export type ParsedSecurityAuditEvent = | AdministratorManagementDeniedAudit | AdministratorManagementFailedAudit | AdministratorAuthorizationAudit + | CopilotConnectionAudit | AllHubSessionsEndFailedAudit | AllHubSessionsEndedAudit | SessionCreatedAudit @@ -64,4 +65,3 @@ export type ParsedSecurityAuditEvent = providerKeys: ProviderKey[] }) | SessionRevocationAdvancedAudit - | CopilotConnectionAudit diff --git a/hub/server/repositories/sensitive-authorizations/cancel-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/cancel-sensitive-authorization/index.ts index 421eebfc8..15b9e2e4e 100644 --- a/hub/server/repositories/sensitive-authorizations/cancel-sensitive-authorization/index.ts +++ b/hub/server/repositories/sensitive-authorizations/cancel-sensitive-authorization/index.ts @@ -2,13 +2,18 @@ import type { Prisma } from "../../../generated/prisma/client.ts" export async function cancelSensitiveAuthorization( database: Pick, - input: { id: string; hubSessionId: string }, + input: { id: string; hubSessionId: string; scope: "administrator" | "copilot" | "sessions" }, ) { const rows = await database.$queryRaw< Array<{ actorMembershipId: string id: string - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetCount: number }> >` @@ -22,6 +27,26 @@ export async function cancelSensitiveAuthorization( "authentication_providers" provider WHERE "sensitive_authorizations"."id" = ${input.id}::uuid AND "sensitive_authorizations"."hub_session_id" = ${input.hubSessionId}::uuid + AND ( + ( + ${input.scope} = 'administrator' + AND "sensitive_authorizations"."operation" IN ( + 'DESIGNATE_ADMINISTRATORS', + 'REVOKE_ADMINISTRATOR' + ) + ) + OR ( + ${input.scope} = 'copilot' + AND "sensitive_authorizations"."operation" IN ( + 'CONNECT_COPILOT', + 'DISCONNECT_COPILOT' + ) + ) + OR ( + ${input.scope} = 'sessions' + AND "sensitive_authorizations"."operation" = 'END_ALL_HUB_SESSIONS' + ) + ) AND session."id" = "sensitive_authorizations"."hub_session_id" AND session."ended_at" IS NULL AND session."expires_at" > clock_timestamp() diff --git a/hub/server/repositories/sensitive-authorizations/claim-copilot-authorization-check/index.ts b/hub/server/repositories/sensitive-authorizations/claim-copilot-authorization-check/index.ts new file mode 100644 index 000000000..91953d6ab --- /dev/null +++ b/hub/server/repositories/sensitive-authorizations/claim-copilot-authorization-check/index.ts @@ -0,0 +1,53 @@ +import { z } from "zod" + +import type { Prisma } from "../../../generated/prisma/client.ts" + +const inputSchema = z + .object({ + id: z.uuid(), + hubSessionId: z.uuid(), + maximumConcurrentChecks: z.number().int().min(1).max(20), + operation: z.enum(["CONNECT_COPILOT", "DISCONNECT_COPILOT"]), + }) + .strict() + +export async function claimCopilotAuthorizationCheck( + database: Pick, + input: z.input, +): Promise { + const parsed = inputSchema.parse(input) + const rows = await database.$queryRaw>` + WITH capacity AS ( + SELECT pg_advisory_xact_lock(hashtext('replica_copilot_authorization_checks')) + ) + UPDATE "sensitive_authorizations" authorization + SET "check_started_at" = clock_timestamp(), "updated_at" = clock_timestamp() + FROM capacity, "hub_sessions" session, "copilot_connection_states" state + WHERE authorization."id" = ${parsed.id}::uuid + AND authorization."hub_session_id" = ${parsed.hubSessionId}::uuid + AND authorization."operation" = ${parsed.operation}::"SensitiveAuthorizationOperation" + AND authorization."expected_copilot_generation" = state."generation" + AND state."key" = 'global' + AND authorization."verified_at" IS NOT NULL + AND authorization."check_started_at" IS NULL + AND authorization."continued_at" IS NULL + AND authorization."cancelled_at" IS NULL + AND authorization."expires_at" > clock_timestamp() + AND session."id" = authorization."hub_session_id" + AND session."ended_at" IS NULL + AND session."expires_at" > clock_timestamp() + AND ( + authorization."operation" = 'DISCONNECT_COPILOT' + OR ( + SELECT count(*) + FROM "sensitive_authorizations" + WHERE "operation" = 'CONNECT_COPILOT' + AND "check_started_at" IS NOT NULL + AND "check_finished_at" IS NULL + AND "check_started_at" > clock_timestamp() - interval '30 seconds' + ) < ${parsed.maximumConcurrentChecks} + ) + RETURNING authorization."id" + ` + return rows.length === 1 +} diff --git a/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.db.test.ts b/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.db.test.ts new file mode 100644 index 000000000..91f911b5e --- /dev/null +++ b/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.db.test.ts @@ -0,0 +1,90 @@ +import { randomUUID } from "node:crypto" +import { describe, expect, it } from "vitest" + +import { prisma } from "../../../integrations/prisma" +import { continueCopilotSensitiveAuthorization } from "." + +async function createAuthorization(expectedCopilotGeneration: bigint) { + const userId = randomUUID() + const membershipId = randomUUID() + const externalIdentityId = randomUUID() + const hubSessionId = randomUUID() + const authorizationId = randomUUID() + await prisma.$transaction(async (transaction) => { + await transaction.user.create({ data: { id: userId } }) + await transaction.membership.create({ data: { id: membershipId, userId } }) + await transaction.externalIdentity.create({ + data: { + id: externalIdentityId, + issuer: "https://github.com", + provider: "github", + subject: randomUUID(), + userId, + }, + }) + await transaction.hubSession.create({ + data: { + digest: randomUUID().replaceAll("-", "").repeat(2), + expiresAt: new Date(Date.now() + 60_000), + externalIdentityId, + id: hubSessionId, + membershipId, + revocationRevision: 0, + }, + }) + await transaction.sensitiveAuthorization.create({ + data: { + actorMembershipId: membershipId, + expectedCopilotGeneration, + expiresAt: new Date(Date.now() + 60_000), + externalIdentityId, + hubSessionId, + id: authorizationId, + operation: "DISCONNECT_COPILOT", + targetMembershipIds: [membershipId], + verifiedAt: new Date(), + }, + }) + }) + return { authorizationId, hubSessionId, membershipId } +} + +describe("continueCopilotSensitiveAuthorization()", () => { + it("rejects an authorization after the locked Copilot generation changes", async () => { + const state = await prisma.copilotConnectionState.findUniqueOrThrow({ + where: { key: "global" }, + }) + const authorization = await createAuthorization(state.generation) + await prisma.copilotConnectionState.update({ + data: { generation: { increment: 1 } }, + where: { key: "global" }, + }) + + await expect( + prisma.$transaction((transaction) => + continueCopilotSensitiveAuthorization(transaction, { + actorMembershipId: authorization.membershipId, + authorizationId: authorization.authorizationId, + hubSessionId: authorization.hubSessionId, + operation: "DISCONNECT_COPILOT", + }), + ), + ).resolves.toBe(false) + }) + + it("preserves sensitive authorization creation time as immutable history", async () => { + const state = await prisma.copilotConnectionState.findUniqueOrThrow({ + where: { key: "global" }, + }) + const authorization = await createAuthorization(state.generation) + + await expect( + prisma.$executeRaw` + UPDATE "sensitive_authorizations" + SET "created_at" = "created_at" - interval '1 second', + "updated_at" = clock_timestamp() + WHERE "id" = ${authorization.authorizationId}::uuid + `, + ).rejects.toThrow("Sensitive authorization binding and completed transitions are immutable.") + }) +}) diff --git a/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.ts new file mode 100644 index 000000000..8545d4ae3 --- /dev/null +++ b/hub/server/repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.ts @@ -0,0 +1,34 @@ +import type { Prisma } from "../../../generated/prisma/client.ts" + +export async function continueCopilotSensitiveAuthorization( + database: Pick, + input: { + actorMembershipId: string + authorizationId: string + hubSessionId: string + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + }, +): Promise { + const rows = await database.$queryRaw>` + UPDATE "sensitive_authorizations" AS sensitive_authorization + SET "continued_at" = clock_timestamp(), "updated_at" = clock_timestamp() + FROM "hub_sessions" session, "copilot_connection_states" state + WHERE sensitive_authorization."id" = ${input.authorizationId}::uuid + AND sensitive_authorization."hub_session_id" = ${input.hubSessionId}::uuid + AND sensitive_authorization."actor_membership_id" = ${input.actorMembershipId}::uuid + AND sensitive_authorization."operation" = ${input.operation}::"SensitiveAuthorizationOperation" + AND sensitive_authorization."expected_copilot_generation" = state."generation" + AND state."key" = 'global' + AND cardinality(sensitive_authorization."target_membership_ids") = 1 + AND sensitive_authorization."target_membership_ids"[1] = ${input.actorMembershipId}::uuid + AND sensitive_authorization."verified_at" IS NOT NULL + AND sensitive_authorization."continued_at" IS NULL + AND sensitive_authorization."cancelled_at" IS NULL + AND sensitive_authorization."expires_at" > clock_timestamp() + AND session."id" = sensitive_authorization."hub_session_id" + AND session."ended_at" IS NULL + AND session."expires_at" > clock_timestamp() + RETURNING sensitive_authorization."id" + ` + return rows.length === 1 +} diff --git a/hub/server/repositories/sensitive-authorizations/create-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/create-sensitive-authorization/index.ts index a3459b1bd..4b0c6d16d 100644 --- a/hub/server/repositories/sensitive-authorizations/create-sensitive-authorization/index.ts +++ b/hub/server/repositories/sensitive-authorizations/create-sensitive-authorization/index.ts @@ -5,18 +5,29 @@ import type { Prisma } from "../../../generated/prisma/client.ts" const inputSchema = z .object({ actorMembershipId: z.uuid(), + expectedCopilotGeneration: z.bigint().nonnegative().optional(), externalIdentityId: z.uuid(), hubSessionId: z.uuid(), id: z.uuid(), lifetimeSeconds: z.number().int().min(60).max(600), - operation: z.enum(["DESIGNATE_ADMINISTRATORS", "END_ALL_HUB_SESSIONS", "REVOKE_ADMINISTRATOR"]), + operation: z.enum([ + "CONNECT_COPILOT", + "DESIGNATE_ADMINISTRATORS", + "DISCONNECT_COPILOT", + "END_ALL_HUB_SESSIONS", + "REVOKE_ADMINISTRATOR", + ]), targetMembershipIds: z.array(z.uuid()).max(50), }) .strict() .superRefine((value, context) => { const targetCount = value.targetMembershipIds.length + const copilot = + value.operation === "CONNECT_COPILOT" || value.operation === "DISCONNECT_COPILOT" if ( + copilot !== (value.expectedCopilotGeneration !== undefined) || (value.operation === "END_ALL_HUB_SESSIONS" && targetCount !== 0) || + (copilot && targetCount !== 1) || (value.operation === "DESIGNATE_ADMINISTRATORS" && targetCount === 0) || (value.operation === "REVOKE_ADMINISTRATOR" && targetCount !== 1) ) { @@ -35,7 +46,8 @@ export async function createSensitiveAuthorization( const rows = await database.$queryRaw>` INSERT INTO "sensitive_authorizations" ( "id", "hub_session_id", "actor_membership_id", "external_identity_id", - "operation", "target_membership_ids", "expires_at", "created_at", "updated_at" + "operation", "target_membership_ids", "expected_copilot_generation", + "expires_at", "created_at", "updated_at" ) SELECT ${parsed.id}::uuid, @@ -44,6 +56,7 @@ export async function createSensitiveAuthorization( session."external_identity_id", ${parsed.operation}::"SensitiveAuthorizationOperation", ${parsed.targetMembershipIds}::uuid[], + ${parsed.expectedCopilotGeneration ?? null}::bigint, clock_timestamp() + make_interval(secs => ${parsed.lifetimeSeconds}), clock_timestamp(), clock_timestamp() diff --git a/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-check/index.ts b/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-check/index.ts new file mode 100644 index 000000000..76b84bb5a --- /dev/null +++ b/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-check/index.ts @@ -0,0 +1,16 @@ +import type { Prisma } from "../../../generated/prisma/client.ts" + +export async function finishCopilotAuthorizationCheck( + database: Pick, + id: string, +): Promise { + const result = await database.sensitiveAuthorization.updateMany({ + data: { checkFinishedAt: new Date() }, + where: { + checkFinishedAt: null, + checkStartedAt: { not: null }, + id, + }, + }) + return result.count === 1 +} diff --git a/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-with-failure/index.ts b/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-with-failure/index.ts new file mode 100644 index 000000000..9f2b8ef70 --- /dev/null +++ b/hub/server/repositories/sensitive-authorizations/finish-copilot-authorization-with-failure/index.ts @@ -0,0 +1,21 @@ +import type { Prisma } from "../../../generated/prisma/client.ts" + +export async function finishCopilotAuthorizationWithFailure( + database: Pick, + id: string, +): Promise { + const finishedAt = new Date() + const result = await database.sensitiveAuthorization.updateMany({ + data: { + checkFinishedAt: finishedAt, + continuedAt: finishedAt, + }, + where: { + checkFinishedAt: null, + checkStartedAt: { not: null }, + continuedAt: null, + id, + }, + }) + return result.count === 1 +} diff --git a/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts b/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts index 96c55eb50..78a6f6aae 100644 --- a/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts +++ b/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization-audit-data/index.ts @@ -7,9 +7,15 @@ export async function getSensitiveAuthorizationAuditData( const rows = await database.$queryRaw< Array<{ actorMembershipId: string + continued: boolean expiresAt: Date expired: boolean - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetCount: number }> >` @@ -18,6 +24,7 @@ export async function getSensitiveAuthorizationAuditData( "operation", "expires_at" AS "expiresAt", "expires_at" <= clock_timestamp() AS "expired", + "continued_at" IS NOT NULL AS "continued", cardinality("target_membership_ids") AS "targetCount" FROM "sensitive_authorizations" WHERE "id" = ${id}::uuid diff --git a/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization/index.ts index f938d2683..0941444f3 100644 --- a/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization/index.ts +++ b/hub/server/repositories/sensitive-authorizations/get-sensitive-authorization/index.ts @@ -10,7 +10,12 @@ export async function getSensitiveAuthorization( login: string | null membershipId: string | null name: string | null - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" provider: string | null verifiedAt: Date }> diff --git a/hub/server/repositories/sensitive-authorizations/lock-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/lock-sensitive-authorization/index.ts index 2394e2cb4..5636748a1 100644 --- a/hub/server/repositories/sensitive-authorizations/lock-sensitive-authorization/index.ts +++ b/hub/server/repositories/sensitive-authorizations/lock-sensitive-authorization/index.ts @@ -8,11 +8,19 @@ export async function lockSensitiveAuthorization( Array<{ actorMembershipId: string cancelledAt: Date | null + expectedCopilotGeneration: bigint | null + checkFinishedAt: Date | null + checkStartedAt: Date | null continuedAt: Date | null expiresAt: Date expired: boolean hubSessionId: string - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetMembershipIds: string[] verifiedAt: Date | null }> @@ -22,9 +30,12 @@ export async function lockSensitiveAuthorization( "actor_membership_id" AS "actorMembershipId", "operation", "target_membership_ids" AS "targetMembershipIds", + "expected_copilot_generation" AS "expectedCopilotGeneration", "expires_at" AS "expiresAt", "expires_at" <= clock_timestamp() AS "expired", "verified_at" AS "verifiedAt", + "check_finished_at" AS "checkFinishedAt", + "check_started_at" AS "checkStartedAt", "continued_at" AS "continuedAt", "cancelled_at" AS "cancelledAt" FROM "sensitive_authorizations" diff --git a/hub/server/repositories/sensitive-authorizations/verify-sensitive-authorization/index.ts b/hub/server/repositories/sensitive-authorizations/verify-sensitive-authorization/index.ts index 24bcea3ef..0487d6670 100644 --- a/hub/server/repositories/sensitive-authorizations/verify-sensitive-authorization/index.ts +++ b/hub/server/repositories/sensitive-authorizations/verify-sensitive-authorization/index.ts @@ -13,7 +13,12 @@ export async function verifySensitiveAuthorization( Array<{ actorMembershipId: string id: string - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetCount: number }> >` diff --git a/hub/server/routes/api/auth/callback/get/index.ts b/hub/server/routes/api/auth/callback/get/index.ts index 7945bfe81..2eec845d8 100644 --- a/hub/server/routes/api/auth/callback/get/index.ts +++ b/hub/server/routes/api/auth/callback/get/index.ts @@ -80,7 +80,9 @@ export function get(dependencies: AuthenticationCallbackDependencies): RequestHa 303, operation === "END_ALL_HUB_SESSIONS" ? `/settings/sessions/confirm?authorizationId=${completed.sensitiveAuthorizationId}` - : `/settings/administrators/confirm?authorizationId=${completed.sensitiveAuthorizationId}`, + : operation === "CONNECT_COPILOT" || operation === "DISCONNECT_COPILOT" + ? `/settings/copilot/confirm?authorizationId=${completed.sensitiveAuthorizationId}` + : `/settings/administrators/confirm?authorizationId=${completed.sensitiveAuthorizationId}`, ) return } diff --git a/hub/server/routes/api/auth/create-authentication-route-dependencies/index.ts b/hub/server/routes/api/auth/create-authentication-route-dependencies/index.ts index 98b281031..184af4231 100644 --- a/hub/server/routes/api/auth/create-authentication-route-dependencies/index.ts +++ b/hub/server/routes/api/auth/create-authentication-route-dependencies/index.ts @@ -342,12 +342,12 @@ export async function createAuthenticationRouteDependencies( writeAudit: (event) => createSecurityAudit(prisma, event), }, ) - if (!verified) return false + if (!verified) return null const authorization = await getSensitiveAuthorizationAuditData( prisma, input.sensitiveAuthorizationId, ) - return authorization?.operation ?? false + return authorization?.operation ?? null }, admit: (input) => admitAuthenticationProof( @@ -371,11 +371,15 @@ export async function createAuthenticationRouteDependencies( const github = githubContext ? createProviderDependencies(githubContext) : undefined const entra = entraContext ? createProviderDependencies(entraContext) : undefined const local = localContext ? createProviderDependencies(localContext) : undefined - async function cancelAuthorization(input: { authorizationId: string; hubSessionId: string }) { + async function cancelAuthorization( + input: { authorizationId: string; hubSessionId: string }, + scope: "administrator" | "copilot" | "sessions", + ) { return prisma.$transaction(async (transaction) => { const cancelled = await cancelSensitiveAuthorization(transaction, { id: input.authorizationId, hubSessionId: input.hubSessionId, + scope, }) if (!cancelled) return false await createSecurityAudit(transaction, { @@ -390,10 +394,20 @@ export async function createAuthenticationRouteDependencies( return true }) } + function findSession(sessionDigest: string) { + return findAdministratorHubSession(prisma, sessionDigest) + } + function getAuthorization(input: { authorizationId: string; hubSessionId: string }) { + return getSensitiveAuthorization(prisma, { + hubSessionId: input.hubSessionId, + id: input.authorizationId, + }) + } return { administrators: { applicationOrigin: sharedContext.applicationOrigin, - cancel: cancelAuthorization, + cancel: (input) => cancelAuthorization(input, "administrator"), + cancelCopilot: (input) => cancelAuthorization(input, "copilot"), continue: (input) => continueAdministratorAuthorization(prisma, { hubSessionId: input.hubSessionId, @@ -401,12 +415,8 @@ export async function createAuthenticationRouteDependencies( operation: input.operation, targetMembershipIds: input.targetMembershipIds, }), - findSession: (sessionDigest) => findAdministratorHubSession(prisma, sessionDigest), - getAuthorization: (input) => - getSensitiveAuthorization(prisma, { - hubSessionId: input.hubSessionId, - id: input.authorizationId, - }), + findSession, + getAuthorization, list: (input) => listEffectiveAdministrators(prisma, input), listSecurityAudits: (input) => listSecurityAudits(prisma, input), search: (input) => searchAdministratorCandidates(prisma, input), @@ -437,14 +447,10 @@ export async function createAuthenticationRouteDependencies( local, sessionRevocation: { applicationOrigin: sharedContext.applicationOrigin, - cancel: cancelAuthorization, + cancel: (input) => cancelAuthorization(input, "sessions"), continue: (input) => endAllHubSessions(prisma, input), - findSession: (sessionDigest) => findAdministratorHubSession(prisma, sessionDigest), - getAuthorization: (input) => - getSensitiveAuthorization(prisma, { - hubSessionId: input.hubSessionId, - id: input.authorizationId, - }), + findSession, + getAuthorization, getStatus: () => getSessionRevocationStatus(prisma), secureCookie: sharedContext.secureCookie, start: { diff --git a/hub/server/routes/api/auth/index.test.ts b/hub/server/routes/api/auth/index.test.ts index 90f5bab4f..22b6b0b20 100644 --- a/hub/server/routes/api/auth/index.test.ts +++ b/hub/server/routes/api/auth/index.test.ts @@ -375,7 +375,40 @@ describe("authenticationRoutes()", () => { }) }) - it("denies administrator authorization when callback verification returns false", async () => { + it("routes verified Copilot authorization to its confirmation page", async () => { + const { admitSession, completeProof, dependencies, verifyAdministratorAuthorization } = + routeDependencies() + const sensitiveAuthorizationId = "00000000-0000-4000-8000-000000000020" + completeProof.mockResolvedValue({ + purpose: "ADMINISTRATOR_MANAGEMENT", + sensitiveAuthorizationId, + proof: { + authorizationAttemptId: "00000000-0000-4000-8000-000000000010", + externalIdentityId: "00000000-0000-4000-8000-000000000012", + }, + }) + verifyAdministratorAuthorization.mockResolvedValue("CONNECT_COPILOT") + + await withServer(dependencies, async (baseUrl) => { + const response = await fetch( + `${baseUrl}/api/auth/github/callback?code=provider-code&state=${"s".repeat(32)}`, + { + headers: { + cookie: `hub_auth_browser=${"b".repeat(32)}; hub_session=retained-session`, + }, + redirect: "manual", + }, + ) + + expect(response.status).toBe(303) + expect(response.headers.get("location")).toBe( + `/settings/copilot/confirm?authorizationId=${sensitiveAuthorizationId}`, + ) + expect(admitSession).not.toHaveBeenCalled() + }) + }) + + it("denies administrator authorization when callback verification returns null", async () => { const { admitSession, completeProof, dependencies, verifyAdministratorAuthorization } = routeDependencies() completeProof.mockResolvedValue({ @@ -386,7 +419,7 @@ describe("authenticationRoutes()", () => { externalIdentityId: "00000000-0000-4000-8000-000000000012", }, }) - verifyAdministratorAuthorization.mockResolvedValue(false) + verifyAdministratorAuthorization.mockResolvedValue(null) await withServer(dependencies, async (baseUrl) => { const response = await fetch( diff --git a/hub/server/routes/api/auth/types.ts b/hub/server/routes/api/auth/types.ts index 9d29741a7..8230d6f27 100644 --- a/hub/server/routes/api/auth/types.ts +++ b/hub/server/routes/api/auth/types.ts @@ -48,7 +48,14 @@ export interface AuthenticationCallbackDependencies extends RateLimitDependencie } sessionDigest: string sensitiveAuthorizationId: string - }): Promise<"DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" | false> + }): Promise< + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" + | null + > admit(input: { proof: AuthenticationProofResult providerAssignment?: { @@ -103,9 +110,15 @@ export interface StartAdministratorAuthorizationDependencies extends RateLimitDe secureCookie: boolean start(input: { actorMembershipId: string + expectedCopilotGeneration?: bigint externalIdentityId: string hubSessionId: string - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targetMembershipIds: string[] }): Promise<{ authorizationId: string @@ -118,6 +131,7 @@ export interface StartAdministratorAuthorizationDependencies extends RateLimitDe export interface AdministratorRouteDependencies { applicationOrigin: string cancel(input: { authorizationId: string; hubSessionId: string }): Promise + cancelCopilot?(input: { authorizationId: string; hubSessionId: string }): Promise continue(input: { authorizationId: string hubSessionId: string @@ -132,7 +146,12 @@ export interface AdministratorRouteDependencies { } | null> getAuthorization(input: { authorizationId: string; hubSessionId: string }): Promise<{ expiresAt: Date - operation: "DESIGNATE_ADMINISTRATORS" | "END_ALL_HUB_SESSIONS" | "REVOKE_ADMINISTRATOR" + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" targets: Array<{ login: string | null membershipId: string diff --git a/hub/server/routes/api/copilot-connection/authorizations/cancel/post/index.ts b/hub/server/routes/api/copilot-connection/authorizations/cancel/post/index.ts new file mode 100644 index 000000000..b62ecf166 --- /dev/null +++ b/hub/server/routes/api/copilot-connection/authorizations/cancel/post/index.ts @@ -0,0 +1,44 @@ +import type { RequestHandler } from "express" +import { z } from "zod" + +import type { CopilotConnectionRouteDependencies } from "../../../types.ts" +import { readSessionDigest } from "../../../read-session-digest/index.ts" + +const bodySchema = z.object({ authorizationId: z.uuid() }).strict() + +export function post(dependencies: CopilotConnectionRouteDependencies): RequestHandler { + return async (request, response, next) => { + response.locals.omitLogPayload = true + const body = bodySchema.safeParse(request.body) + if (!body.success) { + response.status(400).json({ error: "The Copilot authorization cancellation is invalid." }) + return + } + try { + const sessionDigest = readSessionDigest(request) + const session = + sessionDigest && dependencies.authorization + ? await dependencies.authorization.findSession(sessionDigest) + : null + if (!session) { + response.status(403).json({ error: "Administrator access is required." }) + return + } + if (!dependencies.authorization) { + response.status(404).json({ error: "Copilot authorization is unavailable." }) + return + } + const cancelled = await dependencies.authorization.cancel({ + authorizationId: body.data.authorizationId, + hubSessionId: session.id, + }) + if (!cancelled) { + response.status(410).json({ error: "This Copilot authorization is unavailable." }) + return + } + response.status(204).end() + } catch (error) { + next(error) + } + } +} diff --git a/hub/server/routes/api/copilot-connection/authorizations/continue/post/index.ts b/hub/server/routes/api/copilot-connection/authorizations/continue/post/index.ts new file mode 100644 index 000000000..01c76b55a --- /dev/null +++ b/hub/server/routes/api/copilot-connection/authorizations/continue/post/index.ts @@ -0,0 +1,49 @@ +import type { RequestHandler } from "express" +import { z } from "zod" + +import { CopilotConnectionError } from "../../../../../../domains/copilot-connection/errors.ts" +import type { CopilotConnectionRouteDependencies } from "../../../types.ts" +import { readSessionDigest } from "../../../read-session-digest/index.ts" + +const bodySchema = z + .object({ + authorizationId: z.uuid(), + operation: z.enum(["CONNECT_COPILOT", "DISCONNECT_COPILOT"]), + }) + .strict() + +export function post(dependencies: CopilotConnectionRouteDependencies): RequestHandler { + return async (request, response, next) => { + response.locals.omitLogPayload = true + const body = bodySchema.safeParse(request.body) + if (!body.success) { + response.status(400).json({ error: "The Copilot authorization continuation is invalid." }) + return + } + const sessionDigest = readSessionDigest(request) + const session = + sessionDigest && dependencies.authorization && dependencies.continueAuthorization + ? await dependencies.authorization.findSession(sessionDigest) + : null + if (!sessionDigest || !session || !dependencies.continueAuthorization) { + response.status(403).json({ error: "Administrator access is required." }) + return + } + try { + const result = await dependencies.continueAuthorization({ + authorizationId: body.data.authorizationId, + hubSessionId: session.id, + operation: body.data.operation, + sessionDigest, + signal: request.signal, + }) + response.json(result) + } catch (error) { + if (error instanceof CopilotConnectionError) { + response.status(error.code === "unavailable" ? 503 : 409).json({ error: error.message }) + return + } + next(error) + } + } +} diff --git a/hub/server/routes/api/copilot-connection/authorizations/get/index.ts b/hub/server/routes/api/copilot-connection/authorizations/get/index.ts new file mode 100644 index 000000000..403db8108 --- /dev/null +++ b/hub/server/routes/api/copilot-connection/authorizations/get/index.ts @@ -0,0 +1,56 @@ +import type { RequestHandler } from "express" +import { z } from "zod" + +import type { CopilotConnectionRouteDependencies } from "../../types.ts" +import { readSessionDigest } from "../../read-session-digest/index.ts" + +const idSchema = z.uuid() + +export function get(dependencies: CopilotConnectionRouteDependencies): RequestHandler { + return async (request, response, next) => { + try { + const id = idSchema.safeParse(request.params.id) + if (!id.success) { + response.status(400).json({ error: "The authorization identifier is invalid." }) + return + } + const sessionDigest = readSessionDigest(request) + const session = + sessionDigest && dependencies.authorization + ? await dependencies.authorization.findSession(sessionDigest) + : null + if (!session) { + response.status(403).json({ error: "Administrator access is required." }) + return + } + if (!dependencies.authorization) { + response.status(404).json({ error: "Copilot authorization is unavailable." }) + return + } + const authorization = (await dependencies.authorization.getAuthorization({ + authorizationId: id.data, + hubSessionId: session.id, + })) as { + expiresAt: Date + operation: string + verifiedAt: Date + } | null + if ( + !authorization || + !["CONNECT_COPILOT", "DISCONNECT_COPILOT"].includes(authorization.operation) + ) { + response.status(410).json({ error: "This Copilot authorization is unavailable." }) + return + } + response.json({ + authorization: { + expiresAt: authorization.expiresAt.toISOString(), + operation: authorization.operation, + verifiedAt: authorization.verifiedAt.toISOString(), + }, + }) + } catch (error) { + next(error) + } + } +} diff --git a/hub/server/routes/api/copilot-connection/authorizations/start/post/index.ts b/hub/server/routes/api/copilot-connection/authorizations/start/post/index.ts new file mode 100644 index 000000000..7ddf35dde --- /dev/null +++ b/hub/server/routes/api/copilot-connection/authorizations/start/post/index.ts @@ -0,0 +1,90 @@ +import type { RequestHandler } from "express" +import { z } from "zod" + +import { AdministratorAuthorizationDeniedError } from "../../../../../../domains/administrator-authorization/errors.ts" +import { browserAuthenticationCookieName } from "../../../../../../integrations/express/browser-authentication-cookie-name/index.ts" +import { createAuthenticationCookie } from "../../../../../../integrations/express/create-authentication-cookie/index.ts" +import type { CopilotConnectionRouteDependencies } from "../../../types.ts" +import { readSessionDigest } from "../../../read-session-digest/index.ts" + +const bodySchema = z + .object({ + confirmed: z.literal(true), + operation: z.enum(["CONNECT_COPILOT", "DISCONNECT_COPILOT"]), + }) + .strict() + +export function post(dependencies: CopilotConnectionRouteDependencies): RequestHandler { + return async (request, response, next) => { + response.locals.omitLogPayload = true + try { + const sessionDigest = readSessionDigest(request) + const session = + sessionDigest && dependencies.authorization + ? await dependencies.authorization.findSession(sessionDigest) + : null + if (!session) { + response.status(403).json({ error: "Administrator access is required." }) + return + } + const body = bodySchema.safeParse(request.body) + if (!body.success) { + response.status(400).json({ error: "Confirm the Copilot connection change explicitly." }) + return + } + if (!dependencies.authorization || !dependencies.getGeneration) { + response.status(404).json({ error: "Copilot authorization is unavailable." }) + return + } + const state = await dependencies.status() + if (body.data.operation === "DISCONNECT_COPILOT" && !state.savedConnection) { + response.status(409).json({ error: "The Copilot connection changed. Review it again." }) + return + } + if (body.data.operation === "CONNECT_COPILOT" && !state.configured) { + response.status(409).json({ error: "Hub has no configured Copilot token." }) + return + } + const provider = + session.providerKey === "github" + ? dependencies.authorization.start.github + : session.providerKey === "entra" + ? dependencies.authorization.start.entra + : session.providerKey === "local" + ? dependencies.authorization.start.local + : undefined + if (!provider) { + response.status(409).json({ error: "The session authentication provider is unavailable." }) + return + } + const started = await provider.start({ + actorMembershipId: session.membershipId, + expectedCopilotGeneration: await dependencies.getGeneration(), + externalIdentityId: session.externalIdentityId, + hubSessionId: session.id, + operation: body.data.operation, + targetMembershipIds: [session.membershipId], + }) + response.setHeader( + "Set-Cookie", + createAuthenticationCookie({ + expiresAt: started.expiresAt, + name: browserAuthenticationCookieName, + secure: provider.secureCookie, + value: started.browserBinding, + }), + ) + response.json({ + authorizationId: started.authorizationId, + authorizationUrl: started.authorizationUrl, + expiresAt: started.expiresAt.toISOString(), + }) + } catch (error) { + if (error instanceof AdministratorAuthorizationDeniedError) { + response.status(403).json({ error: "Administrator access is required." }) + return + } + next(error) + } + } +} diff --git a/hub/server/routes/api/copilot-connection/connect/post/index.ts b/hub/server/routes/api/copilot-connection/connect/post/index.ts deleted file mode 100644 index 4570e3c22..000000000 --- a/hub/server/routes/api/copilot-connection/connect/post/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -import type { RequestHandler } from "express" -import { z } from "zod" - -import { CopilotConnectionError } from "../../../../../domains/copilot-connection/errors.ts" -import { LearningCommandError } from "../../../../../integrations/learning/run-learning-command/errors.ts" -import { readSessionDigest } from "../../read-session-digest/index.ts" -import type { CopilotConnectionRouteDependencies } from "../../types.ts" - -const bodySchema = z.object({ confirmed: z.literal(true) }).strict() -const reportedFailureCodes = new Set([ - "cancelled", - "invalid_request", - "learning_failed", - "not_installed", - "output_too_large", - "timeout", - "unreadable_output", -]) - -export function post(dependencies: CopilotConnectionRouteDependencies): RequestHandler { - return async (request, response, next) => { - try { - if (!bodySchema.safeParse(request.body).success) { - response.status(400).json({ error: "Confirm the Copilot connection change." }) - return - } - const sessionDigest = readSessionDigest(request) - if (!sessionDigest || !(await dependencies.findSession(sessionDigest))) { - response.status(403).json({ error: "Administrator access is required." }) - return - } - await dependencies.connect({ sessionDigest }) - response.status(204).end() - } catch (error) { - if (error instanceof CopilotConnectionError) { - const status = - error.code === "not_authorized" - ? 403 - : error.code === "busy" - ? 409 - : error.code === "credential_missing" - ? 409 - : error.code === "connection_changed" - ? 409 - : error.code === "credential_refused" - ? 422 - : 503 - if (status === 503) { - const failureCode = - error.cause instanceof LearningCommandError && - reportedFailureCodes.has(error.cause.code) - ? error.cause.code - : "unknown" - dependencies.reportFailure(failureCode) - } - response.status(status).json({ error: error.message }) - return - } - next(error) - } - } -} diff --git a/hub/server/routes/api/copilot-connection/create-copilot-connection-route-dependencies/index.ts b/hub/server/routes/api/copilot-connection/create-copilot-connection-route-dependencies/index.ts index 71f7929d9..3e15ab7d6 100644 --- a/hub/server/routes/api/copilot-connection/create-copilot-connection-route-dependencies/index.ts +++ b/hub/server/routes/api/copilot-connection/create-copilot-connection-route-dependencies/index.ts @@ -3,6 +3,7 @@ import type { Logger } from "pino" import type { Prisma } from "../../../../generated/prisma/client.ts" import { connectCopilot } from "../../../../domains/copilot-connection/connect-copilot/index.ts" +import { continueCopilotAuthorization } from "../../../../domains/copilot-connection/continue-copilot-authorization/index.ts" import { disconnectCopilot } from "../../../../domains/copilot-connection/disconnect-copilot/index.ts" import { getCopilotConnectionStatus } from "../../../../domains/copilot-connection/get-copilot-connection-status/index.ts" import { readCopilotConnectionSnapshot } from "../../../../domains/copilot-connection/read-copilot-connection-snapshot/index.ts" @@ -25,12 +26,15 @@ import { findAdministratorHubSession } from "../../../../repositories/hub-sessio import { lockAdministratorHubSession } from "../../../../repositories/hub-sessions/lock-administrator-hub-session/index.ts" import { isEffectiveAdministrator } from "../../../../repositories/memberships/is-effective-administrator/index.ts" import { createSecurityAudit } from "../../../../repositories/security-audits/create-security-audit/index.ts" +import { continueCopilotSensitiveAuthorization } from "../../../../repositories/sensitive-authorizations/continue-copilot-sensitive-authorization/index.ts" import type { CopilotConnectionTransactionRepositories } from "../../../../domains/copilot-connection/types.ts" import type { CopilotConnectionRouteDependencies } from "../types.ts" +import type { AdministratorRouteDependencies } from "../../auth/types.ts" export async function createCopilotConnectionRouteDependencies( environment: NodeJS.ProcessEnv, - logger: Logger, + _logger?: Logger, + authorization?: AdministratorRouteDependencies, ): Promise { const configuration = await readLearningConfiguration(environment) const applicationOrigin = environment.HUB_APPLICATION_ORIGIN @@ -48,6 +52,7 @@ export async function createCopilotConnectionRouteDependencies( return { advanceState: () => advanceCopilotConnectionState(transaction), clearRefusal: () => clearCopilotCredentialRefusal(transaction), + continueAuthorization: (input) => continueCopilotSensitiveAuthorization(transaction, input), deleteConnection: () => deleteCopilotConnection(transaction), lockAdministratorSession: (digest) => lockAdministratorHubSession(transaction, digest), getConnection: () => getCopilotConnection(transaction), @@ -67,49 +72,76 @@ export async function createCopilotConnectionRouteDependencies( return { applicationOrigin, + authorization: authorization + ? { + cancel: (input) => (authorization.cancelCopilot ?? authorization.cancel)(input), + findSession: (sessionDigest) => authorization.findSession(sessionDigest), + getAuthorization: (input) => authorization.getAuthorization(input), + start: authorization.start, + } + : undefined, + continueAuthorization: (input) => + continueCopilotAuthorization(prisma, input, ({ authorizationId, operation }) => + operation === "CONNECT_COPILOT" + ? withCopilotConnectionCheck(() => + connectCopilot( + { + authorizationId, + credentialProvider: configuration.copilotCredentialProvider, + hubSessionId: input.hubSessionId, + sessionDigest: input.sessionDigest, + }, + { + check: async () => { + const credential = await configuration.copilotCredentialProvider.getCredential() + if (!credential) { + throw new Error("The configured Copilot credential is unavailable.") + } + return runLearningCommand(["copilot", "status"], { + cliPath: configuration.cliPath, + githubToken: credential.githubToken, + nodePath: configuration.nodePath, + signal: input.signal, + }) + }, + createId: randomUUID, + findAdministratorSession: findSession, + now: () => new Date(), + readSnapshot: () => + readCopilotConnectionSnapshot({ + getConnection: () => getCopilotConnection(prisma), + getState: () => getCopilotConnectionState(prisma), + }), + recordFailure: (failure) => + recordCopilotConnectionFailure(failure, { + createId: randomUUID, + runTransaction, + }), + recordRefusal: (refusal) => + recordCopilotConnectionRefusal(refusal, { + createId: randomUUID, + runTransaction, + }), + runTransaction, + writeAudit: (event) => createSecurityAudit(prisma, event), + }, + ), + ) + : disconnectCopilot( + { + authorizationId, + hubSessionId: input.hubSessionId, + sessionDigest: input.sessionDigest, + }, + { createId: randomUUID, runTransaction }, + ), + ), findSession, - reportFailure: (code) => { - logger.warn({ copilotFailureCode: code }, "Copilot connection check failed") + getGeneration: async () => { + const state = await getCopilotConnectionState(prisma) + if (!state) throw new Error("The Copilot connection state is unavailable.") + return state.generation }, - connect: ({ sessionDigest, signal }) => - withCopilotConnectionCheck(() => - connectCopilot( - { - credentialProvider: configuration.copilotCredentialProvider, - sessionDigest, - }, - { - check: async () => { - const credential = await configuration.copilotCredentialProvider.getCredential() - if (!credential) { - throw new Error("The configured Copilot credential is unavailable.") - } - return runLearningCommand(["copilot", "status"], { - cliPath: configuration.cliPath, - githubToken: credential.githubToken, - nodePath: configuration.nodePath, - signal, - }) - }, - createId: randomUUID, - findAdministratorSession: findSession, - now: () => new Date(), - readSnapshot: () => - readCopilotConnectionSnapshot({ - getConnection: () => getCopilotConnection(prisma), - getState: () => getCopilotConnectionState(prisma), - }), - recordFailure: (input) => - recordCopilotConnectionFailure(input, { createId: randomUUID, runTransaction }), - recordRefusal: (input) => - recordCopilotConnectionRefusal(input, { createId: randomUUID, runTransaction }), - runTransaction, - writeAudit: (event) => createSecurityAudit(prisma, event), - }, - ), - ), - disconnect: ({ sessionDigest }) => - disconnectCopilot({ sessionDigest }, { createId: randomUUID, runTransaction }), status: async () => { const connection = await getCopilotConnection(prisma) const state = await getCopilotConnectionState(prisma) diff --git a/hub/server/routes/api/copilot-connection/disconnect/delete/index.ts b/hub/server/routes/api/copilot-connection/disconnect/delete/index.ts deleted file mode 100644 index 740f9954c..000000000 --- a/hub/server/routes/api/copilot-connection/disconnect/delete/index.ts +++ /dev/null @@ -1,40 +0,0 @@ -import type { RequestHandler } from "express" -import { z } from "zod" - -import { CopilotConnectionError } from "../../../../../domains/copilot-connection/errors.ts" -import { readSessionDigest } from "../../read-session-digest/index.ts" -import type { CopilotConnectionRouteDependencies } from "../../types.ts" - -const bodySchema = z.object({ confirmed: z.literal(true) }).strict() - -export function delete_(dependencies: CopilotConnectionRouteDependencies): RequestHandler { - return async (request, response, next) => { - try { - if (!bodySchema.safeParse(request.body).success) { - response.status(400).json({ error: "Confirm the Copilot connection change." }) - return - } - const sessionDigest = readSessionDigest(request) - if (!sessionDigest || !(await dependencies.findSession(sessionDigest))) { - response.status(403).json({ error: "Administrator access is required." }) - return - } - await dependencies.disconnect({ sessionDigest }) - response.status(204).end() - } catch (error) { - if (error instanceof CopilotConnectionError) { - response - .status( - error.code === "not_authorized" - ? 403 - : error.code === "not_connected" || error.code === "connection_changed" - ? 409 - : 503, - ) - .json({ error: error.message }) - return - } - next(error) - } - } -} diff --git a/hub/server/routes/api/copilot-connection/index.test.ts b/hub/server/routes/api/copilot-connection/index.test.ts index ed8adaa7a..bf4fe56c2 100644 --- a/hub/server/routes/api/copilot-connection/index.test.ts +++ b/hub/server/routes/api/copilot-connection/index.test.ts @@ -5,36 +5,92 @@ import type { AddressInfo } from "node:net" import { describe, expect, it, vi } from "vitest" import { createApp } from "../../../create-app" -import { CopilotConnectionError } from "../../../domains/copilot-connection/errors" -import { LearningCommandError } from "../../../integrations/learning/run-learning-command/errors" +import type { + AuthenticationRouteDependencies, + StartAdministratorAuthorizationDependencies, +} from "../auth/types" import type { CopilotConnectionRouteDependencies } from "./types" const applicationOrigin = "http://127.0.0.1:5173" const sessionValue = "current-session" +const session = { + externalIdentityId: randomUUID(), + id: randomUUID(), + membershipId: randomUUID(), + providerKey: "github", +} -function dependencies(): CopilotConnectionRouteDependencies { - return { +function startDependencies() { + const start = vi.fn().mockResolvedValue({ + authorizationId: randomUUID(), + authorizationUrl: "https://github.com/login/oauth/authorize", + browserBinding: "browser-binding-with-required-length", + expiresAt: new Date("2030-01-01T00:00:00Z"), + }) + const dependencies: StartAdministratorAuthorizationDependencies = { applicationOrigin, - connect: vi.fn().mockResolvedValue(undefined), - disconnect: vi.fn().mockResolvedValue(undefined), - findSession: vi.fn().mockResolvedValue({ membershipId: randomUUID() }), - reportFailure: vi.fn(), - status: vi.fn().mockResolvedValue({ - configured: true, - connected: false, - savedConnection: false, - connectedBy: null, - refusedAt: null, - verifiedAt: null, - }), + checkRateLimit: vi.fn().mockResolvedValue({ allowed: true, auditFailed: false }), + secureCookie: false, + start, + } + return { dependencies, start } +} + +function routeDependencies() { + const cancel = vi.fn().mockResolvedValue(true) + const continueAuthorization = vi + .fn>() + .mockResolvedValue({ connectionId: randomUUID() }) + const findSession = vi.fn().mockResolvedValue(session) + const getAuthorization = vi.fn().mockResolvedValue({ + expiresAt: new Date("2030-01-01T00:00:00Z"), + operation: "CONNECT_COPILOT", + verifiedAt: new Date("2029-12-31T23:59:00Z"), + }) + const status = vi.fn().mockResolvedValue({ + configured: true, + connected: false, + savedConnection: false, + connectedBy: null, + refusedAt: null, + verifiedAt: null, + }) + const github = startDependencies() + const copilotConnection: CopilotConnectionRouteDependencies = { + applicationOrigin, + authorization: { + cancel, + findSession, + getAuthorization, + start: { github: github.dependencies }, + }, + continueAuthorization, + findSession, + getGeneration: vi.fn().mockResolvedValue(7n), + status, + } + const authentication: AuthenticationRouteDependencies = { + currentSession: { restore: vi.fn() }, + signOut: { applicationOrigin, end: vi.fn(), secureCookie: false }, + } + return { + authentication, + cancel, + continueAuthorization, + copilotConnection, + findSession, + getAuthorization, + status, + github, } } async function withServer( + authentication: AuthenticationRouteDependencies, copilotConnection: CopilotConnectionRouteDependencies, operation: (baseUrl: string) => Promise, ) { - const server = createServer(createApp({ copilotConnection })) + const server = createServer(createApp({ authentication, copilotConnection })) server.listen(0, "127.0.0.1") await once(server, "listening") try { @@ -47,217 +103,218 @@ async function withServer( } } -function mutationHeaders() { - return { - "content-type": "application/json", - cookie: `hub_session=${sessionValue}`, - origin: applicationOrigin, - } +function sessionHeaders(headers: Record = {}) { + return { cookie: `hub_session=${sessionValue}`, ...headers } } describe("copilotConnectionRoutes()", () => { - it("reports saved connection presence separately from active connected state", async () => { - const copilotConnection = dependencies() - vi.mocked(copilotConnection.status).mockResolvedValueOnce({ + it("requires a live effective administrator before exposing connection state", async () => { + const { authentication, copilotConnection, findSession, status } = routeDependencies() + findSession.mockResolvedValueOnce(null) + + await withServer(authentication, copilotConnection, async (baseUrl) => { + const response = await fetch(`${baseUrl}/api/copilot-connection`, { + headers: sessionHeaders(), + }) + + expect(response.status).toBe(403) + expect(findSession).toHaveBeenCalledWith( + createHash("sha256").update(sessionValue).digest("hex"), + ) + expect(status).not.toHaveBeenCalled() + }) + }) + + it("returns connection provenance without returning the operator token or digest", async () => { + const { authentication, copilotConnection, status } = routeDependencies() + const verifiedAt = new Date("2029-12-30T12:00:01Z") + status.mockResolvedValueOnce({ configured: true, - connected: false, + connected: true, savedConnection: true, - connectedBy: null, - refusedAt: new Date("2026-11-11T13:00:00.000Z"), - verifiedAt: null, + connectedBy: { + login: "octocat", + membershipId: session.membershipId, + name: "The Octocat", + }, + refusedAt: null, + verifiedAt, }) - await withServer(copilotConnection, async (baseUrl) => { + await withServer(authentication, copilotConnection, async (baseUrl) => { const response = await fetch(`${baseUrl}/api/copilot-connection`, { - headers: { cookie: `hub_session=${sessionValue}` }, + headers: sessionHeaders(), }) + const body: unknown = await response.json() expect(response.status).toBe(200) - await expect(response.json()).resolves.toEqual({ + expect(response.headers.get("cache-control")).toBe("no-store") + expect(body).toEqual({ configured: true, - connected: false, + connected: true, savedConnection: true, - connectedBy: null, - refusedAt: "2026-11-11T13:00:00.000Z", - verifiedAt: null, + connectedBy: { + login: "octocat", + membershipId: session.membershipId, + name: "The Octocat", + }, + refusedAt: null, + verifiedAt: verifiedAt.toISOString(), }) }) }) - it.each([ - ["connect", "POST", "/api/copilot-connection/connect"], - ["disconnect", "DELETE", "/api/copilot-connection"], - ] as const)("requires a live administrator session before %s", async (_name, method, path) => { - const copilotConnection = dependencies() - vi.mocked(copilotConnection.findSession).mockResolvedValueOnce(null) + it("requires explicit confirmation and binds fresh authorization to the saved generation", async () => { + const { authentication, copilotConnection, github } = routeDependencies() - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}${path}`, { - method, - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), + await withServer(authentication, copilotConnection, async (baseUrl) => { + const denied = await fetch(`${baseUrl}/api/copilot-connection/authorizations/start`, { + method: "POST", + headers: sessionHeaders({ "content-type": "application/json", origin: applicationOrigin }), + body: JSON.stringify({ operation: "CONNECT_COPILOT" }), }) - expect(response.status).toBe(403) - expect(copilotConnection.findSession).toHaveBeenCalledWith( - createHash("sha256").update(sessionValue).digest("hex"), - ) - expect(copilotConnection.connect).not.toHaveBeenCalled() - expect(copilotConnection.disconnect).not.toHaveBeenCalled() - }) - }) - - it.each([ - ["connect", "POST", "/api/copilot-connection/connect"], - ["disconnect", "DELETE", "/api/copilot-connection"], - ] as const)("requires explicit confirmation to %s", async (_name, method, path) => { - const copilotConnection = dependencies() + expect(denied.status).toBe(400) + expect(github.start).not.toHaveBeenCalled() - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}${path}`, { - method, - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: false }), + const response = await fetch(`${baseUrl}/api/copilot-connection/authorizations/start`, { + method: "POST", + headers: sessionHeaders({ "content-type": "application/json", origin: applicationOrigin }), + body: JSON.stringify({ confirmed: true, operation: "CONNECT_COPILOT" }), }) - expect(response.status).toBe(400) - expect(copilotConnection.findSession).not.toHaveBeenCalled() - expect(copilotConnection.connect).not.toHaveBeenCalled() - expect(copilotConnection.disconnect).not.toHaveBeenCalled() + expect(response.status).toBe(200) + expect(github.start).toHaveBeenCalledWith({ + actorMembershipId: session.membershipId, + expectedCopilotGeneration: 7n, + externalIdentityId: session.externalIdentityId, + hubSessionId: session.id, + operation: "CONNECT_COPILOT", + targetMembershipIds: [session.membershipId], + }) }) }) it.each([ - ["connect", "POST", "/api/copilot-connection/connect"], - ["disconnect", "DELETE", "/api/copilot-connection"], - ] as const)( - "rejects cross-origin %s before parsing its mutation body", - async (_name, method, path) => { - const copilotConnection = dependencies() - - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}${path}`, { - method, - headers: { - "content-type": "application/json", - cookie: `hub_session=${sessionValue}`, - origin: "https://attacker.example", - }, - body: "{", - }) - - expect(response.status).toBe(403) - expect(copilotConnection.findSession).not.toHaveBeenCalled() - expect(copilotConnection.connect).not.toHaveBeenCalled() - expect(copilotConnection.disconnect).not.toHaveBeenCalled() - }) - }, - ) - - it("passes the live session digest to explicit connection mutations", async () => { - const copilotConnection = dependencies() - const digest = createHash("sha256").update(sessionValue).digest("hex") + [ + "rechecks a healthy saved connection", + "CONNECT_COPILOT" as const, + { connected: true, savedConnection: true }, + ], + [ + "disconnects an inactive saved connection", + "DISCONNECT_COPILOT" as const, + { connected: false, savedConnection: true }, + ], + ])("%s", async (_label, operation, statusOverride) => { + const { authentication, copilotConnection, github, status } = routeDependencies() + status.mockResolvedValue({ + configured: true, + connectedBy: null, + refusedAt: null, + verifiedAt: new Date(), + ...statusOverride, + }) - await withServer(copilotConnection, async (baseUrl) => { - const connectResponse = await fetch(`${baseUrl}/api/copilot-connection/connect`, { + await withServer(authentication, copilotConnection, async (baseUrl) => { + const response = await fetch(`${baseUrl}/api/copilot-connection/authorizations/start`, { method: "POST", - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), - }) - const disconnectResponse = await fetch(`${baseUrl}/api/copilot-connection`, { - method: "DELETE", - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), + headers: sessionHeaders({ "content-type": "application/json", origin: applicationOrigin }), + body: JSON.stringify({ confirmed: true, operation }), }) - expect(connectResponse.status).toBe(204) - expect(disconnectResponse.status).toBe(204) - expect(copilotConnection.connect).toHaveBeenCalledWith({ sessionDigest: digest }) - expect(copilotConnection.disconnect).toHaveBeenCalledWith({ sessionDigest: digest }) + expect(response.status).toBe(200) + expect(github.start).toHaveBeenCalledWith( + expect.objectContaining({ + operation, + }), + ) }) }) - it("returns conflict when the connection changes during disconnect", async () => { - const copilotConnection = dependencies() - vi.mocked(copilotConnection.disconnect).mockRejectedValue( - new CopilotConnectionError( - "connection_changed", - "The Copilot connection changed during this request.", - ), - ) + it("uses the local session provider for fresh authorization", async () => { + const { authentication, copilotConnection } = routeDependencies() + const local = startDependencies() + copilotConnection.authorization!.findSession = vi.fn().mockResolvedValue({ + ...session, + providerKey: "local", + }) + copilotConnection.authorization!.start.local = local.dependencies - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}/api/copilot-connection`, { - method: "DELETE", - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), + await withServer(authentication, copilotConnection, async (baseUrl) => { + const response = await fetch(`${baseUrl}/api/copilot-connection/authorizations/start`, { + method: "POST", + headers: sessionHeaders({ + "content-type": "application/json", + origin: applicationOrigin, + }), + body: JSON.stringify({ confirmed: true, operation: "CONNECT_COPILOT" }), }) - expect(response.status).toBe(409) - await expect(response.json()).resolves.toEqual({ - error: "The Copilot connection changed during this request.", - }) + expect(response.status).toBe(200) + expect(local.start).toHaveBeenCalledWith( + expect.objectContaining({ + actorMembershipId: session.membershipId, + operation: "CONNECT_COPILOT", + }), + ) }) }) - it("returns conflict when another connection check is already running", async () => { - const copilotConnection = dependencies() - vi.mocked(copilotConnection.connect).mockRejectedValue( - new CopilotConnectionError("busy", "Another Copilot connection check is still running."), - ) + it("continues and cancels only through the current administrator session", async () => { + const { authentication, cancel, continueAuthorization, copilotConnection } = routeDependencies() + const authorizationId = randomUUID() - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}/api/copilot-connection/connect`, { + await withServer(authentication, copilotConnection, async (baseUrl) => { + const continued = await fetch(`${baseUrl}/api/copilot-connection/authorizations/continue`, { + method: "POST", + headers: sessionHeaders({ + "content-type": "application/json", + origin: applicationOrigin, + }), + body: JSON.stringify({ authorizationId, operation: "DISCONNECT_COPILOT" }), + }) + const cancelled = await fetch(`${baseUrl}/api/copilot-connection/authorizations/cancel`, { method: "POST", - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), + headers: sessionHeaders({ "content-type": "application/json", origin: applicationOrigin }), + body: JSON.stringify({ authorizationId }), }) - expect(response.status).toBe(409) - await expect(response.json()).resolves.toEqual({ - error: "Another Copilot connection check is still running.", + expect(continued.status).toBe(200) + expect(continueAuthorization).toHaveBeenCalledOnce() + const continuation = continueAuthorization.mock.calls[0]![0] + expect(continuation).toMatchObject({ + authorizationId, + hubSessionId: session.id, + operation: "DISCONNECT_COPILOT", + sessionDigest: createHash("sha256").update(sessionValue).digest("hex"), }) + expect(continuation.signal).toBeInstanceOf(AbortSignal) + expect(cancelled.status).toBe(204) + expect(cancel).toHaveBeenCalledWith({ authorizationId, hubSessionId: session.id }) }) }) - it.each([ - [ - "the allowlisted command failure", - new CopilotConnectionError("unavailable", "Hub could not check Copilot.", { - cause: new LearningCommandError("timeout", "private command output"), - }), - "timeout", - ], - [ - "an unknown cause", - new CopilotConnectionError("unavailable", "Hub could not check Copilot.", { - cause: new Error("private command output"), - }), - "unknown", - ], - [ - "an unrecognized command failure", - new CopilotConnectionError("unavailable", "Hub could not check Copilot.", { - cause: new LearningCommandError("private_provider_detail", "private command output"), - }), - "unknown", - ], - ])("reports %s without exposing the raw error", async (_label, error, expectedCode) => { - const copilotConnection = dependencies() - vi.mocked(copilotConnection.connect).mockRejectedValue(error) + it("applies the authorization parser limit before case-insensitive route handling", async () => { + const { authentication, copilotConnection, github } = routeDependencies() - await withServer(copilotConnection, async (baseUrl) => { - const response = await fetch(`${baseUrl}/api/copilot-connection/connect`, { + await withServer(authentication, copilotConnection, async (baseUrl) => { + const response = await fetch(`${baseUrl}/API/COPILOT-CONNECTION/AUTHORIZATIONS/START`, { method: "POST", - headers: mutationHeaders(), - body: JSON.stringify({ confirmed: true }), + headers: sessionHeaders({ + "content-type": "application/json", + origin: applicationOrigin, + }), + body: JSON.stringify({ + confirmed: true, + operation: "CONNECT_COPILOT", + padding: "x".repeat(5_000), + }), }) - expect(response.status).toBe(503) - expect(copilotConnection.reportFailure).toHaveBeenCalledWith(expectedCode) - expect(JSON.stringify(vi.mocked(copilotConnection.reportFailure).mock.calls)).not.toContain( - "private command output", - ) + expect(response.status).toBe(413) + expect(response.headers.get("cache-control")).toBe("no-store") + expect(github.start).not.toHaveBeenCalled() }) }) }) diff --git a/hub/server/routes/api/copilot-connection/types.ts b/hub/server/routes/api/copilot-connection/types.ts index 3f8ef59ec..2656d1fa2 100644 --- a/hub/server/routes/api/copilot-connection/types.ts +++ b/hub/server/routes/api/copilot-connection/types.ts @@ -1,9 +1,55 @@ export interface CopilotConnectionRouteDependencies { applicationOrigin: string - connect: (input: { sessionDigest: string; signal?: AbortSignal }) => Promise - disconnect: (input: { sessionDigest: string }) => Promise + authorization?: { + cancel(input: { authorizationId: string; hubSessionId: string }): Promise + findSession: (sessionDigest: string) => Promise<{ + externalIdentityId: string + id: string + membershipId: string + providerKey: string + } | null> + getAuthorization(input: { authorizationId: string; hubSessionId: string }): Promise + start: Partial< + Record< + "entra" | "github" | "local", + { + applicationOrigin: string + secureCookie: boolean + checkRateLimit( + operation: "start" | "callback", + subjectDigest: string, + ): Promise<{ allowed: boolean; auditFailed: boolean }> + start(input: { + actorMembershipId: string + expectedCopilotGeneration?: bigint + externalIdentityId: string + hubSessionId: string + operation: + | "CONNECT_COPILOT" + | "DESIGNATE_ADMINISTRATORS" + | "DISCONNECT_COPILOT" + | "END_ALL_HUB_SESSIONS" + | "REVOKE_ADMINISTRATOR" + targetMembershipIds: string[] + }): Promise<{ + authorizationId: string + authorizationUrl: string + browserBinding: string + expiresAt: Date + }> + } + > + > + } + continueAuthorization?(input: { + authorizationId: string + hubSessionId: string + operation: "CONNECT_COPILOT" | "DISCONNECT_COPILOT" + sessionDigest: string + signal?: AbortSignal + }): Promise findSession: (sessionDigest: string) => Promise<{ membershipId: string } | null> - reportFailure: (code: string) => void + getGeneration?: () => Promise status: () => Promise<{ configured: boolean connected: boolean diff --git a/hub/server/routes/api/security-audits/present-security-audit/index.ts b/hub/server/routes/api/security-audits/present-security-audit/index.ts index b36a7e87a..997104619 100644 --- a/hub/server/routes/api/security-audits/present-security-audit/index.ts +++ b/hub/server/routes/api/security-audits/present-security-audit/index.ts @@ -171,7 +171,9 @@ function contextFor(record: SecurityAuditListRecord): Record { it("cancels a Copilot check and waits for its cleanup during shutdown", async () => { const cleanup = deferred() const started = deferred() - async function connect({ + async function continueAuthorization({ signal, - }: Parameters[0]) { + }: Parameters>[0]) { if (!signal) throw new Error("The API lifecycle signal is required.") started.resolve(signal) if (!signal.aborted) { @@ -144,12 +144,21 @@ describe("runApi()", () => { } const copilotConnection: CopilotConnectionRouteDependencies = { applicationOrigin: "http://127.0.0.1:5173", - connect: vi.fn(connect), - disconnect: vi.fn(), + authorization: { + cancel: vi.fn(), + findSession: vi.fn().mockResolvedValue({ + externalIdentityId: "github:1", + id: "22222222-2222-4222-8222-222222222222", + membershipId: "11111111-1111-4111-8111-111111111111", + providerKey: "github", + }), + getAuthorization: vi.fn(), + start: {}, + }, + continueAuthorization: vi.fn(continueAuthorization), findSession: vi.fn().mockResolvedValue({ membershipId: "11111111-1111-4111-8111-111111111111", }), - reportFailure: vi.fn(), status: vi.fn().mockResolvedValue({ configured: true, connected: false, @@ -162,15 +171,21 @@ describe("runApi()", () => { const { server, running, signal } = await startApi({ port: 0, copilotConnection }) await once(server, "listening") const { port } = server.address() as AddressInfo - const response = fetch(`http://127.0.0.1:${port}/api/copilot-connection/connect`, { - method: "POST", - headers: { - "content-type": "application/json", - cookie: "hub_session=current-session", - origin: copilotConnection.applicationOrigin, + const response = fetch( + `http://127.0.0.1:${port}/api/copilot-connection/authorizations/continue`, + { + method: "POST", + headers: { + "content-type": "application/json", + cookie: "hub_session=current-session", + origin: copilotConnection.applicationOrigin, + }, + body: JSON.stringify({ + authorizationId: "33333333-3333-4333-8333-333333333333", + operation: "CONNECT_COPILOT", + }), }, - body: JSON.stringify({ confirmed: true }), - }) + ) const operationSignal = await started.promise let settled = false void running.finally(() => { diff --git a/hub/server/run-api/index.ts b/hub/server/run-api/index.ts index 18194b6aa..058223b73 100644 --- a/hub/server/run-api/index.ts +++ b/hub/server/run-api/index.ts @@ -58,7 +58,13 @@ export async function runApi({ copilotConnection: copilotConnection ? { ...copilotConnection, - connect: (input) => copilotConnection.connect({ ...input, signal: operations.signal }), + continueAuthorization: copilotConnection.continueAuthorization + ? (input) => + copilotConnection.continueAuthorization!({ + ...input, + signal: operations.signal, + }) + : undefined, } : undefined, product,