Multiplayer agent harness for work.
Support overlapping Sprites proxy hosts during migration (#1642)
Regan Bellb66109d59e78
diff --git a/deploy/egress-proxy/Dockerfile b/deploy/egress-proxy/Dockerfileindex b3f87e406..b88ba052f 100644--- a/deploy/egress-proxy/Dockerfile+++ b/deploy/egress-proxy/Dockerfile@@ -12,7 +12,9 @@ COPY .husky/install.mjs .husky/install.mjsRUN npm ci --omit=devCOPY src ./src+COPY plugins/chassis ./plugins/chassisCOPY tsconfig.json ./+RUN node --input-type=module -e "await import('./src/egress-authz-main.ts')"COPY deploy/egress-proxy/envoy.yaml deploy/egress-proxy/start.sh ./RUN chmod +x start.sh# A rejected config is a fleet-wide outage: start.sh kills the container when Envoy dies, so andiff --git a/src/config.ts b/src/config.tsindex accdf8d83..9694e7127 100644--- a/src/config.ts+++ b/src/config.ts@@ -349,6 +349,7 @@ interface SpritesSandboxEnv {baseUrl?: string;namePrefix?: string;egressProxyUrl?: string;+ egressProxyAdditionalUrls?: string[];snapshotS3Bucket?: string;memoryMb?: number;defaultTimeoutSec?: number;@@ -360,6 +361,13 @@ function spritesSandboxEnv(env: NodeJS.ProcessEnv): SpritesSandboxEnv {...(env.SPRITES_BASE_URL ? { baseUrl: env.SPRITES_BASE_URL } : {}),...(env.SPRITES_NAME_PREFIX ? { namePrefix: env.SPRITES_NAME_PREFIX } : {}),...(env.SPRITES_EGRESS_PROXY_URL ? { egressProxyUrl: env.SPRITES_EGRESS_PROXY_URL } : {}),+ ...(env.SPRITES_EGRESS_PROXY_ADDITIONAL_URLS?.trim()+ ? {+ egressProxyAdditionalUrls: env.SPRITES_EGRESS_PROXY_ADDITIONAL_URLS.split(",")+ .map((url) => url.trim())+ .filter(Boolean),+ }+ : {}),...(env.SPRITES_SNAPSHOT_S3_BUCKET ? { snapshotS3Bucket: env.SPRITES_SNAPSHOT_S3_BUCKET } : {}),...(numEnvStrict("SPRITES_MEMORY_MB", env.SPRITES_MEMORY_MB) !== undefined? { memoryMb: numEnvStrict("SPRITES_MEMORY_MB", env.SPRITES_MEMORY_MB) }diff --git a/src/sandbox/sprites-sandbox.ts b/src/sandbox/sprites-sandbox.tsindex f73d787b4..9c60b1432 100644--- a/src/sandbox/sprites-sandbox.ts+++ b/src/sandbox/sprites-sandbox.ts@@ -122,6 +122,7 @@ export interface SpritesSandboxOptions extends BlobStagingOptions {namePrefix?: string;defaultTimeoutSec?: number;egressProxyUrl?: string;+ egressProxyAdditionalUrls?: string[];memoryMb?: number;checkpointIntervalMs?: number;snapshots?: HomeSnapshotStore;@@ -284,18 +285,34 @@ export function createSpritesSandbox(workspace: WorkspaceStore, opts: SpritesSan}}- const egressProxyHost = opts.egressProxyUrl ? new URL(opts.egressProxyUrl).hostname : undefined;+ const norm = (domain?: string): string => (domain ?? "").toLowerCase().replace(/\.$/, "");+ const egressProxyHosts = opts.egressProxyUrl+ ? [+ ...new Set(+ [opts.egressProxyUrl, ...(opts.egressProxyAdditionalUrls ?? [])].map((value) => {+ const url = new URL(value);+ if (!["https:", "http:"].includes(url.protocol) || !url.hostname || url.username || url.password)+ throw new Error("sprites egress proxy URLs must be HTTP(S) URLs without credentials");+ return norm(url.hostname);+ }),+ ),+ ].sort()+ : [];+ if (!opts.egressProxyUrl && opts.egressProxyAdditionalUrls?.length)+ throw new Error("sprites additional egress proxy URLs require a primary proxy URL");async function ensureEgressPolicy(name: string): Promise<void> {- const rules = [{ domain: egressProxyHost!, action: "allow" as const }];+ const rules = egressProxyHosts.map((domain) => ({ domain, action: "allow" as const }));const want = JSON.stringify(rules);if (egressPolicyByName.get(name) === want) return;const s = sprite(name);await attempt(`egress policy ${name}`, () => retrySpritesControl(() => s.updateNetworkPolicy({ rules })));const got = await attempt(`egress policy readback ${name}`, () => retrySpritesControl(() => s.getNetworkPolicy()));- const norm = (d?: string) => (d ?? "").toLowerCase().replace(/\.$/, "");- const only = got.rules?.length === 1 ? got.rules[0] : undefined;- const bound = !!only && norm(only.domain) === norm(egressProxyHost) && only.action?.toLowerCase() === "allow";+ const actual = got.rules ?? [];+ const bound =+ actual.length === rules.length &&+ actual.every((rule) => rule.action?.toLowerCase() === "allow") &&+ JSON.stringify(actual.map((rule) => norm(rule.domain)).sort()) === JSON.stringify(egressProxyHosts);if (!bound)throw new Error(`sprites egress policy ${name}: readback mismatch (${JSON.stringify(got).slice(0, 200)})`);egressPolicyByName.set(name, want);diff --git a/test/config.test.ts b/test/config.test.tsindex d6447059f..4c54e5177 100644--- a/test/config.test.ts+++ b/test/config.test.ts@@ -21,6 +21,19 @@ const productionEnv = {SANDBOX_BACKEND: "local",} as const;+test("Sprites proxy transition URLs are optional and parsed independently of the primary", () => {+ assert.equal(loadConfig({}).spritesSandbox.egressProxyAdditionalUrls, undefined);+ const config = loadConfig({+ SPRITES_EGRESS_PROXY_URL: "https://primary.example.com",+ SPRITES_EGRESS_PROXY_ADDITIONAL_URLS: " https://old.example.com, ,https://next.example.com ",+ });+ assert.equal(config.spritesSandbox.egressProxyUrl, "https://primary.example.com");+ assert.deepEqual(config.spritesSandbox.egressProxyAdditionalUrls, [+ "https://old.example.com",+ "https://next.example.com",+ ]);+});+test("capability compression is explicitly enabled after verifier rollout", () => {assert.equal(loadConfig({}).capabilityTokenCompression, false);assert.equal(loadConfig({ CAPABILITY_TOKEN_COMPRESSION: "0" }).capabilityTokenCompression, false);diff --git a/test/sprites-sandbox.test.ts b/test/sprites-sandbox.test.tsindex 5f834f94d..42dccf234 100644--- a/test/sprites-sandbox.test.ts+++ b/test/sprites-sandbox.test.ts@@ -197,6 +197,39 @@ test("force-through pins the platform policy and injects proxy env", async () =>assert.equal(h.env?.NO_PROXY, "localhost,127.0.0.1,::1");});+test("proxy migration keeps both hosts reachable across cutover and rollback", async () => {+ const token = await proxyToken();+ const oldUrl = "https://old.example.com";+ const newUrl = "https://new.example.com";+ for (const [primary, additional] of [+ [oldUrl, newUrl],+ [newUrl, oldUrl],+ [oldUrl, newUrl],+ ]) {+ const s = make({ egressProxyUrl: primary, egressProxyAdditionalUrls: [additional, primary] });+ const h = await s.provision(layers, { egressToken: token });+ assert.deepEqual(fake.policy(h.id), [+ { domain: "new.example.com", action: "allow" },+ { domain: "old.example.com", action: "allow" },+ ]);+ assert.equal(new URL(h.env!.HTTPS_PROXY!).hostname, new URL(primary!).hostname);+ }+});++test("proxy migration rejects mismatched provider policy and invalid configuration", async () => {+ const s = make({+ egressProxyUrl: "https://new.example.com",+ egressProxyAdditionalUrls: ["https://old.example.com"],+ });+ fake.breakPolicyReadback(sandboxScopeName("qmt", scope));+ await assert.rejects(s.provision(layers, { egressToken: await proxyToken() }), /readback mismatch/);+ assert.throws(() => make({ egressProxyAdditionalUrls: ["https://old.example.com"] }), /require a primary/);+ assert.throws(+ () => make({ egressProxyUrl: "https://new.example.com", egressProxyAdditionalUrls: ["file:///tmp/x"] }),+ /HTTP\(S\)/,+ );+});+test("force-through strips agent-supplied proxy vars", async () => {const s = make({ egressProxyUrl: "https://proxy.example.com" });const h = await s.provision(layers, {