Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,25 @@ describe("Claude Code provider maintenance", () => {
"https://claude.ai/install.sh",
);
});

it("decodes hex-encoded Claude Code keychain credentials", () => {
const credentials = {
claudeAiOauth: {
accessToken: "sk-ant-test",
expiresAt: 1_788_350_959_477,
subscriptionType: "team",
rateLimitTier: "default_claude_max_5x",
},
};
const hex = Buffer.from(JSON.stringify(credentials), "utf8").toString(
"hex",
);
expect(__testing.parseClaudeCredentials(hex)).toEqual(
credentials.claudeAiOauth,
);
expect(
__testing.parseClaudeCredentials(JSON.stringify(credentials)),
).toEqual(credentials.claudeAiOauth);
expect(__testing.parseClaudeCredentials("not-credentials")).toBeNull();
});
});
37 changes: 28 additions & 9 deletions plugins/provider-claude-code/src/bridge/provider-maintenance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,21 +257,39 @@ async function readKeychainCredentials(): Promise<string | null> {
return null;
}

async function readCredentials(): Promise<ClaudeCredentials | null> {
let raw = await readKeychainCredentials();
if (raw === null) {
function decodeCredentialBlob(raw: string): unknown {
try {
return JSON.parse(raw);
} catch {
if (raw.length === 0 || raw.length % 2 !== 0 || /[^0-9a-f]/i.test(raw)) {
return null;
}
try {
raw = await fs.readFile(
path.join(os.homedir(), ".claude", ".credentials.json"),
"utf8",
);
return JSON.parse(Buffer.from(raw, "hex").toString("utf8"));
} catch {
return null;
}
}
}

function parseClaudeCredentials(raw: string): ClaudeCredentials | null {
const parsed = claudeCredentialsSchema.safeParse(decodeCredentialBlob(raw));
return parsed.success ? parsed.data.claudeAiOauth : null;
}

async function readCredentials(): Promise<ClaudeCredentials | null> {
const keychain = await readKeychainCredentials();
if (keychain !== null) {
const fromKeychain = parseClaudeCredentials(keychain);
if (fromKeychain !== null) return fromKeychain;
}
try {
const parsed = claudeCredentialsSchema.safeParse(JSON.parse(raw));
return parsed.success ? parsed.data.claudeAiOauth : null;
return parseClaudeCredentials(
await fs.readFile(
path.join(os.homedir(), ".claude", ".credentials.json"),
"utf8",
),
);
} catch {
return null;
}
Expand Down Expand Up @@ -524,4 +542,5 @@ export async function getClaudeProviderUsage(): Promise<ProviderUsageResult> {
export const __testing = {
buildProviderInstallationRun: buildClaudeProviderInstallationRun,
normalizeUsage,
parseClaudeCredentials,
};