Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Send git proxy credentials up front in sandbox commands (#2426)

Regan Belld3bddd71506e
diff --git a/src/sandbox/agent37-sandbox.ts b/src/sandbox/agent37-sandbox.ts
index 196560627..ac5fd128b 100644
--- a/src/sandbox/agent37-sandbox.ts
+++ b/src/sandbox/agent37-sandbox.ts
@@ -521,10 +521,7 @@ export function createAgent37Sandbox(workspace: WorkspaceStore, opts: Agent37San
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
const handle: SandboxHandle = {
id: name,
rootDir: workspaceDir,
diff --git a/src/sandbox/e2b-sandbox.ts b/src/sandbox/e2b-sandbox.ts
index 60a14e614..239253f6a 100644
--- a/src/sandbox/e2b-sandbox.ts
+++ b/src/sandbox/e2b-sandbox.ts
@@ -430,10 +430,7 @@ export function createE2bSandbox(workspace: WorkspaceStore, opts: E2bSandboxOpti
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
const handle: SandboxHandle = {
id: name,
rootDir: workspaceDir,
diff --git a/src/sandbox/exec-sandbox-base.ts b/src/sandbox/exec-sandbox-base.ts
index e22e6ae55..fa6c8eb62 100644
--- a/src/sandbox/exec-sandbox-base.ts
+++ b/src/sandbox/exec-sandbox-base.ts
@@ -187,10 +187,7 @@ export function createExecSandboxBase(deps: ExecSandboxBaseDeps): ExecSandboxBas
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(deps.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(deps.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
if (Object.keys(env).length) handle.env = env;
const credLinks = scratch ? "" : ` && ${ephemeralCredLinkScript(homeDir, deps.credentialPaths)}`;
const prepare = `mkdir -p ${shq(workspaceDir)}${credLinks}`;
diff --git a/src/sandbox/managed-agents-sandbox.ts b/src/sandbox/managed-agents-sandbox.ts
index 84a5302ba..8d344dcb4 100644
--- a/src/sandbox/managed-agents-sandbox.ts
+++ b/src/sandbox/managed-agents-sandbox.ts
@@ -425,10 +425,7 @@ export function createManagedAgentsSandbox(workspace: WorkspaceStore, opts: Mana
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
const handle: SandboxHandle = {
id: name,
rootDir: workspaceDir,
diff --git a/src/sandbox/modal-sandbox.ts b/src/sandbox/modal-sandbox.ts
index ca6d29358..465878e18 100644
--- a/src/sandbox/modal-sandbox.ts
+++ b/src/sandbox/modal-sandbox.ts
@@ -707,10 +707,7 @@ export function createModalSandbox(workspace: WorkspaceStore, opts: ModalSandbox
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
const handle: SandboxHandle = {
id: name,
rootDir: workspaceDir,
diff --git a/src/sandbox/porter-sandbox.ts b/src/sandbox/porter-sandbox.ts
index ff7b0ed21..f6eb50239 100644
--- a/src/sandbox/porter-sandbox.ts
+++ b/src/sandbox/porter-sandbox.ts
@@ -301,10 +301,7 @@ export function createPorterSandbox(workspace: WorkspaceStore, opts: PorterSandb
const turnEnv = Object.fromEntries(
Object.entries(provOpts?.env ?? {}).filter(([k]) => !DROPPED_PROXY_ENV.has(k)),
);
- const env = {
- ...turnEnv,
- ...(forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!) : {}),
- };
+ const env = forceEgress ? forceThroughProxyEnv(opts.egressProxyUrl!, provOpts!.egressToken!, turnEnv) : turnEnv;
const handle: SandboxHandle = {
id: name,
rootDir: workspaceDir,
diff --git a/src/sandbox/sandbox-env.ts b/src/sandbox/sandbox-env.ts
index 9980cf05a..30dd2e0c0 100644
--- a/src/sandbox/sandbox-env.ts
+++ b/src/sandbox/sandbox-env.ts
@@ -27,11 +27,16 @@ export const DROPPED_PROXY_ENV = new Set([
"NO_PROXY",
]);
-export function forceThroughProxyEnv(egressProxyUrl: string, token: string): Record<string, string> {
+export function forceThroughProxyEnv(
+ egressProxyUrl: string,
+ token: string,
+ base: Record<string, string>,
+): Record<string, string> {
const u = new URL(egressProxyUrl);
const url = `${u.protocol}//x:${token}@${u.host}`;
const noProxy = "localhost,127.0.0.1,::1";
- return {
+ const env: Record<string, string> = {
+ ...base,
HTTPS_PROXY: url,
HTTP_PROXY: url,
NO_PROXY: noProxy,
@@ -39,6 +44,12 @@ export function forceThroughProxyEnv(egressProxyUrl: string, token: string): Rec
http_proxy: url,
no_proxy: noProxy,
};
+ const count = Number(base.GIT_CONFIG_COUNT);
+ const index = Number.isSafeInteger(count) && count > 0 ? count : 0;
+ env[`GIT_CONFIG_KEY_${index}`] = "http.proxyAuthMethod";
+ env[`GIT_CONFIG_VALUE_${index}`] = "basic";
+ env.GIT_CONFIG_COUNT = String(index + 1);
+ return env;
}
export function proxyExportPrefix(handle: SandboxHandle): string {
diff --git a/test/modal-sandbox.test.ts b/test/modal-sandbox.test.ts
index b1fe5113e..1f1c1e74c 100644
--- a/test/modal-sandbox.test.ts
+++ b/test/modal-sandbox.test.ts
@@ -113,8 +113,9 @@ test("force-through proxy env is set when a proxy url and token are present", as
"secret",
);
const h = await s.provision(layers, { egressToken: token });
- const r = await s.run(h, "echo PROXY=$HTTPS_PROXY");
+ const r = await s.run(h, "echo PROXY=$HTTPS_PROXY; git config --get http.proxyAuthMethod");
assert.match(r.stdout, /PROXY=https?:\/\/[^ ]*proxy\.example\.com/);
+ assert.match(r.stdout, /^basic$/m);
});
test("large command output survives intact", async () => {
diff --git a/test/sprites-sandbox.test.ts b/test/sprites-sandbox.test.ts
index 340a8e3aa..a51de01f3 100644
--- a/test/sprites-sandbox.test.ts
+++ b/test/sprites-sandbox.test.ts
@@ -264,6 +264,26 @@ test("force-through strips agent-supplied proxy vars", async () => {
assert.equal(h.env?.FOO, "keep");
});
+test("force-through makes git send proxy credentials up front, keeping turn git config", async () => {
+ const s = make({ egressProxyUrl: "https://proxy.example.com" });
+ const h = await s.provision(layers, {
+ egressToken: await proxyToken(),
+ env: { GIT_CONFIG_COUNT: "1", GIT_CONFIG_KEY_0: "user.name", GIT_CONFIG_VALUE_0: "Turn User" },
+ });
+ const r = await s.run(h, "git config --get http.proxyAuthMethod; git config --get user.name");
+ assert.equal(r.code, 0, r.stderr);
+ assert.deepEqual(r.stdout.trim().split("\n"), ["basic", "Turn User"]);
+});
+
+test("git config from the proxy env stays off when egress is not forced", async () => {
+ const h = await sandbox.provision(layers, { egressToken: "ignored" });
+ const r = await sandbox.run(
+ h,
+ "GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_NOSYSTEM=1 git config --get http.proxyAuthMethod || echo unset",
+ );
+ assert.equal(r.stdout.trim(), "unset");
+});
+
test("force-through fails closed if the policy readback doesn't bind", async () => {
const s = make({ egressProxyUrl: "https://proxy.example.com" });
fake.breakPolicyReadback(sandboxScopeName("qmt", scope));