Skip to content

fix(api): strip ANTHROPIC_AUTH_TOKEN in subscription mode to prevent OAuth override #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bucolicwalker-ops wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(api): strip ANTHROPIC_AUTH_TOKEN in subscription mode to prevent OAuth override #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b80aef
fix(api): strip ANTHROPIC_AUTH_TOKEN in subscription mode to prevent …
bucolicwalker-ops Jun 9, 2026
da7da6f
Merge branch 'main' into fix/subscription-strip-auth-token
bucolicwalker-ops Jun 9, 2026
e802a60
Merge branch 'main' into fix/subscription-strip-auth-token
bucolicwalker-ops Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/api/src/domains/cats/services/agents/providers/ClaudeAgentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ export function buildClaudeEnvOverrides(callbackEnv?: Record<string, string>): R
// Subscription mode must not inherit shell-level Anthropic credentials.
// Claude CLI should read auth from ~/.claude/settings.json instead.
env.ANTHROPIC_API_KEY = null;
// ANTHROPIC_AUTH_TOKEN is sent as `Authorization: Bearer` and overrides the
// CLI's native OAuth/Keychain login. If the daemon was launched with a
// proxy token (e.g. a DashScope key in ANTHROPIC_AUTH_TOKEN), leaking it
// here makes the subscription child send that token to api.anthropic.com →
// 401 Invalid Bearer Token. Strip it so native auth is used.
env.ANTHROPIC_AUTH_TOKEN = null;
env.ANTHROPIC_BASE_URL = null;
env.ANTHROPIC_MODEL = null;
env.ANTHROPIC_DEFAULT_OPUS_MODEL = null;
Expand Down
10 changes: 10 additions & 0 deletions packages/api/test/claude-agent-service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,15 @@ test('preserves inherited Anthropic credentials when no profile mode override is
test('F062: subscription profile clears inherited ANTHROPIC env vars', async () => {
const prevApiKey = process.env.ANTHROPIC_API_KEY;
const prevBaseUrl = process.env.ANTHROPIC_BASE_URL;
const prevAuthToken = process.env.ANTHROPIC_AUTH_TOKEN;
process.env.ANTHROPIC_API_KEY = 'sk-inherited';
process.env.ANTHROPIC_BASE_URL = 'https://inherited.example.com';
// Regression: a daemon launched with a proxy token in ANTHROPIC_AUTH_TOKEN
// (e.g. a DashScope key + DashScope base URL) must NOT leak that token into
// a subscription-mode child. ANTHROPIC_AUTH_TOKEN is sent as `Authorization:
// Bearer`; leaking it makes the child send the proxy token to
// api.anthropic.com → 401 Invalid Bearer Token, overriding native OAuth.
process.env.ANTHROPIC_AUTH_TOKEN = 'sk-proxy-token';

const proc = createMockProcess();
const spawnFn = createMockSpawnFn(proc);
Expand All @@ -597,11 +604,14 @@ test('F062: subscription profile clears inherited ANTHROPIC env vars', async ()
const spawnOpts = spawnFn.mock.calls[0].arguments[2];
assert.equal(spawnOpts.env.ANTHROPIC_API_KEY, undefined);
assert.equal(spawnOpts.env.ANTHROPIC_BASE_URL, undefined);
assert.equal(spawnOpts.env.ANTHROPIC_AUTH_TOKEN, undefined);
} finally {
if (prevApiKey === undefined) delete process.env.ANTHROPIC_API_KEY;
else process.env.ANTHROPIC_API_KEY = prevApiKey;
if (prevBaseUrl === undefined) delete process.env.ANTHROPIC_BASE_URL;
else process.env.ANTHROPIC_BASE_URL = prevBaseUrl;
if (prevAuthToken === undefined) delete process.env.ANTHROPIC_AUTH_TOKEN;
else process.env.ANTHROPIC_AUTH_TOKEN = prevAuthToken;
}
});

Expand Down
Loading