Skip to content

fix: include provider credentials in preflight probes #25

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

Closed
rudijetson wants to merge 1 commit into from
Closed

fix: include provider credentials in preflight probes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions dist/index.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32501,10 +32501,10 @@ var MCP_AGENT_IDS = Object.freeze({ claude: "claude-code" });
function commandArgs(configuredCommand) {
return Array.isArray(configuredCommand) ? configuredCommand.slice(1) : [];
}
function runCheck(binaryPath, args, spawnSyncImpl, timeout = 5e3) {
function runCheck(binaryPath, args, spawnSyncImpl, providerEnvironment, timeout = 5e3) {
const result = spawnSyncImpl(binaryPath, args, {
encoding: "utf8",
env: buildAgentExecutableEnvironment(binaryPath),
env: buildAgentExecutableEnvironment(binaryPath, providerEnvironment),
timeout
});
return {
Expand Down Expand Up @@ -32548,11 +32548,20 @@ async function inspectAgentHost(provider, dependencies = {}) {
version: null
};
}
const version = runCheck(binaryPath, commandArgs(config.binary.checkCommand), spawnSyncImpl);
const providerEnvironment = buildProviderEnvironment(config, {
baseEnvironment: dependencies.baseEnvironment,
rudiHome: dependencies.rudiHome
});
const version = runCheck(
binaryPath,
commandArgs(config.binary.checkCommand),
spawnSyncImpl,
providerEnvironment
);
const authArgs = commandArgs(config.binary.authCheck);
const versionArgs = commandArgs(config.binary.checkCommand);
const authIsObservable = JSON.stringify(authArgs) !== JSON.stringify(versionArgs);
const auth = authIsObservable ? runCheck(binaryPath, authArgs, spawnSyncImpl) : { ok: null };
const auth = authIsObservable ? runCheck(binaryPath, authArgs, spawnSyncImpl, providerEnvironment) : { ok: null };
return {
authenticated: auth.ok,
authentication: auth.ok == null ? "unknown" : auth.ok ? "authenticated" : "unauthenticated",
Expand Down
27 changes: 27 additions & 0 deletions src/__tests__/unit/agent-host-preflight.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, test } from 'node:test';
import assert from 'node:assert/strict';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';

import { inspectAgentHost } from '../../agent-host/preflight.js';
Expand All @@ -22,4 +24,29 @@ describe('Agent Host preflight', () => {
assert.equal(pathEntries.includes(path.dirname(binaryPath)), true);
assert.equal(pathEntries.includes(path.dirname(process.execPath)), true);
});

test('injects only provider-declared RUDI credentials into the authentication probe', async (t) => {
const rudiHome = fs.mkdtempSync(path.join(os.tmpdir(), 'rudi-agent-auth-'));
t.after(() => fs.rmSync(rudiHome, { force: true, recursive: true }));
fs.writeFileSync(path.join(rudiHome, 'secrets.json'), JSON.stringify({
CLAUDE_CODE_OAUTH_TOKEN: 'oauth-test-token',
UNRELATED_SECRET: 'must-not-be-forwarded',
}), { mode: 0o600 });

const calls = [];
const inspected = await inspectAgentHost('claude', {
baseEnvironment: { PATH: '/usr/bin:/bin' },
binaryPath: '/Users/example/.local/bin/claude',
rudiHome,
spawnSyncImpl(command, args, options) {
calls.push({ args, command, options });
return { status: 0, stdout: args.includes('--version') ? 'claude 1.0.0' : 'Logged in' };
},
});

const authCall = calls.find(call => call.args.join(' ') === 'auth status');
assert.equal(inspected.authenticated, true);
assert.equal(authCall.options.env.CLAUDE_CODE_OAUTH_TOKEN, 'oauth-test-token');
assert.equal(authCall.options.env.UNRELATED_SECRET, undefined);
});
});
22 changes: 17 additions & 5 deletions src/agent-host/preflight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@ import {
resolveAgentProviderBinary,
resolveAgentProviderId,
} from './providers/index.js';
import { buildAgentExecutableEnvironment } from './providers/common.js';
import {
buildAgentExecutableEnvironment,
buildProviderEnvironment,
} from './providers/common.js';

const MCP_AGENT_IDS = Object.freeze({ claude: 'claude-code' });

function commandArgs(configuredCommand) {
return Array.isArray(configuredCommand) ? configuredCommand.slice(1) : [];
}

function runCheck(binaryPath, args, spawnSyncImpl, timeout = 5000) {
function runCheck(binaryPath, args, spawnSyncImpl, providerEnvironment, timeout = 5000) {
const result = spawnSyncImpl(binaryPath, args, {
encoding: 'utf8',
env: buildAgentExecutableEnvironment(binaryPath),
env: buildAgentExecutableEnvironment(binaryPath, providerEnvironment),
timeout,
});
return {
Expand Down Expand Up @@ -74,12 +77,21 @@ export async function inspectAgentHost(provider, dependencies = {}) {
};
}

const version = runCheck(binaryPath, commandArgs(config.binary.checkCommand), spawnSyncImpl);
const providerEnvironment = buildProviderEnvironment(config, {
baseEnvironment: dependencies.baseEnvironment,
rudiHome: dependencies.rudiHome,
});
const version = runCheck(
binaryPath,
commandArgs(config.binary.checkCommand),
spawnSyncImpl,
providerEnvironment,
);
const authArgs = commandArgs(config.binary.authCheck);
const versionArgs = commandArgs(config.binary.checkCommand);
const authIsObservable = JSON.stringify(authArgs) !== JSON.stringify(versionArgs);
const auth = authIsObservable
? runCheck(binaryPath, authArgs, spawnSyncImpl)
? runCheck(binaryPath, authArgs, spawnSyncImpl, providerEnvironment)
: { ok: null };

return {
Expand Down