Skip to content

fix: reject inline secrets across runtime and identity credential commands #2080

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

Merged
jariy17 merged 2 commits into from
Aug 24, 2026
Merged

fix: reject inline secrets across runtime and identity credential commands #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aebf7f7
fix(project): resolve runtime --api-key through SourceResolver.resolv…
tejaskash Aug 24, 2026
eaf11b5
fix(identity): reject inline secrets in credential-provider commands
tejaskash Aug 24, 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
11 changes: 7 additions & 4 deletions src/handlers/identity/api-key-credential-provider/create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ export const createCreateApiKeyCredentialProviderHandler = (core: Core, io: AppI
description: "create an API key credential provider",
flags: [
flag("name", "the name of the API key credential provider", z.string().optional()),
flag("api-key", "the API key value (inline, file://path, or -)", z.string().optional(), {
sensitive: true,
}),
flag(
"api-key",
"the API key (file://path or - for stdin; inline values are rejected)",
z.string().optional(),
{ sensitive: true },
),
flag(
"api-key-secret-reference",
'external secret reference JSON: {"secretId":"<arn>","jsonKey":"<key>"}',
Expand Down Expand Up @@ -44,7 +47,7 @@ export const createCreateApiKeyCredentialProviderHandler = (core: Core, io: AppI
}

const resolver = new SourceResolver({ stdin: io.stdin });
const apiKey = await resolver.resolveText("api-key", flags["api-key"]);
const apiKey = await resolver.resolveSecret("api-key", flags["api-key"]);
const apiKeySecretConfig = hasSecretRef
? parseSecretReference("api-key-secret-reference", flags["api-key-secret-reference"]!)
: undefined;
Expand Down
11 changes: 7 additions & 4 deletions src/handlers/identity/api-key-credential-provider/update/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ export const createUpdateApiKeyCredentialProviderHandler = (core: Core, io: AppI
description: "update an API key credential provider",
flags: [
flag("name", "the name of the API key credential provider", z.string().optional()),
flag("api-key", "the new API key value (inline, file://path, or -)", z.string().optional(), {
sensitive: true,
}),
flag(
"api-key",
"the new API key (file://path or - for stdin; inline values are rejected)",
z.string().optional(),
{ sensitive: true },
),
flag(
"api-key-secret-reference",
'external secret reference JSON: {"secretId":"<arn>","jsonKey":"<key>"}',
Expand Down Expand Up @@ -57,7 +60,7 @@ export const createUpdateApiKeyCredentialProviderHandler = (core: Core, io: AppI
}

const resolver = new SourceResolver({ stdin: io.stdin });
const apiKey = await resolver.resolveText("api-key", flags["api-key"]);
const apiKey = await resolver.resolveSecret("api-key", flags["api-key"]);
const apiKeySecretConfig = hasSecretRef
? parseSecretReference("api-key-secret-reference", flags["api-key-secret-reference"]!)
: undefined;
Expand Down
74 changes: 48 additions & 26 deletions src/handlers/identity/identity.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function createFixtureCore(): CoreClient {
});
}

async function run(args: string[]): Promise<string> {
const io = testIO();
async function run(args: string[], stdin?: string): Promise<string> {
const io = testIO({ stdin });
const root = createRootHandler(createFixtureCore(), {
io: io.io,
logger: createSilentLogger(),
Expand Down Expand Up @@ -101,29 +101,35 @@ describe("api-key-credential-provider TUI dispatch", () => {

describe("api-key-credential-provider CRUDL", () => {
test("creates an API key credential provider", async () => {
const stdout = await run([
"identity",
"api-key-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME,
"--api-key",
const stdout = await run(
[
"identity",
"api-key-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME,
"--api-key",
"-",
],
"test-api-key-value",
]);
);

matchGolden(FIXTURES, "create.golden.json", stdout);
});

test("creates a second API key credential provider for pagination", async () => {
const stdout = await run([
"identity",
"api-key-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME_2,
"--api-key",
const stdout = await run(
[
"identity",
"api-key-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME_2,
"--api-key",
"-",
],
"test-api-key-value-2",
]);
);

matchGolden(FIXTURES, "create-2.golden.json", stdout);
});
Expand Down Expand Up @@ -176,15 +182,18 @@ describe("api-key-credential-provider CRUDL", () => {
});

test("updates an API key credential provider", async () => {
const stdout = await run([
"identity",
"api-key-credential-provider",
"update",
"--name",
FIXTURE_PROVIDER_NAME,
"--api-key",
const stdout = await run(
[
"identity",
"api-key-credential-provider",
"update",
"--name",
FIXTURE_PROVIDER_NAME,
"--api-key",
"-",
],
"updated-api-key-value",
]);
);

matchGolden(FIXTURES, "update.golden.json", stdout);
expect(JSON.parse(stdout).name).toBe(FIXTURE_PROVIDER_NAME);
Expand Down Expand Up @@ -301,6 +310,19 @@ describe("api-key-credential-provider CRUDL", () => {
],
/mutually exclusive/,
],
[
"create: --api-key with an inline value",
[
"identity",
"api-key-credential-provider",
"create",
"--name",
"x",
"--api-key",
"sk-inline",
],
/file:\/\//,
],
] as const)("rejects invalid secret input for `%s`", async (_label, args, message) => {
expect(run([...args])).rejects.toThrow(message);
});
Expand Down
8 changes: 3 additions & 5 deletions src/handlers/identity/oauth2-credential-provider/create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ export const createCreateOauth2CredentialProviderHandler = (core: Core, io: AppI
flag("vendor", "the OAuth2 vendor (e.g. CustomOauth2, GithubOauth2)", z.string().optional()),
flag(
"client-secret",
"the client secret (inline, file://path, or -)",
"the client secret (file://path or - for stdin; inline values are rejected)",
z.string().optional(),
{
sensitive: true,
},
{ sensitive: true },
),
flag(
"client-secret-reference",
Expand Down Expand Up @@ -81,7 +79,7 @@ export const createCreateOauth2CredentialProviderHandler = (core: Core, io: AppI
validateProviderConfigMode(providerConfigMode, vendor);

const resolver = new SourceResolver({ stdin: io.stdin });
const clientSecret = await resolver.resolveText("client-secret", flags["client-secret"]);
const clientSecret = await resolver.resolveSecret("client-secret", flags["client-secret"]);

const clientSecretConfig = hasSecretRef
? parseSecretReference("client-secret-reference", flags["client-secret-reference"]!)
Expand Down
97 changes: 53 additions & 44 deletions src/handlers/identity/oauth2-credential-provider/oauth2.fixture.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function createFixtureCore(): CoreClient {
});
}

async function run(args: string[]): Promise<string> {
const io = testIO();
async function run(args: string[], stdin?: string): Promise<string> {
const io = testIO({ stdin });
const root = createRootHandler(createFixtureCore(), {
io: io.io,
logger: createSilentLogger(),
Expand All @@ -46,41 +46,47 @@ async function run(args: string[]): Promise<string> {

describe("oauth2-credential-provider CRUDL", () => {
test("creates an OAuth2 credential provider", async () => {
const stdout = await run([
"identity",
"oauth2-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME,
"--vendor",
"CustomOauth2",
"--client-id",
"fixture-client-id",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
const stdout = await run(
[
"identity",
"oauth2-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME,
"--vendor",
"CustomOauth2",
"--client-id",
"fixture-client-id",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
"-",
],
"fixture-secret",
]);
);

matchGolden(FIXTURES, "create.golden.json", stdout);
});

test("creates a second OAuth2 credential provider for pagination", async () => {
const stdout = await run([
"identity",
"oauth2-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME_2,
"--vendor",
"CustomOauth2",
"--client-id",
"fixture-client-id-2",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
const stdout = await run(
[
"identity",
"oauth2-credential-provider",
"create",
"--name",
FIXTURE_PROVIDER_NAME_2,
"--vendor",
"CustomOauth2",
"--client-id",
"fixture-client-id-2",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
"-",
],
"fixture-secret-2",
]);
);

matchGolden(FIXTURES, "create-2.golden.json", stdout);
});
Expand Down Expand Up @@ -133,21 +139,24 @@ describe("oauth2-credential-provider CRUDL", () => {
});

test("updates an OAuth2 credential provider", async () => {
const stdout = await run([
"identity",
"oauth2-credential-provider",
"update",
"--name",
FIXTURE_PROVIDER_NAME,
"--vendor",
"CustomOauth2",
"--client-id",
"updated-client-id",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
const stdout = await run(
[
"identity",
"oauth2-credential-provider",
"update",
"--name",
FIXTURE_PROVIDER_NAME,
"--vendor",
"CustomOauth2",
"--client-id",
"updated-client-id",
"--discovery-url",
"https://example.com/.well-known/openid-configuration",
"--client-secret",
"-",
],
"updated-secret",
]);
);

matchGolden(FIXTURES, "update.golden.json", stdout);
expect(JSON.parse(stdout).name).toBe(FIXTURE_PROVIDER_NAME);
Expand Down
23 changes: 21 additions & 2 deletions src/handlers/identity/oauth2-credential-provider/oauth2.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ const UPDATE_RESPONSE = {
async function run(
args: string[],
core = new TestCoreClient(),
stdin?: string,
): Promise<{ core: TestCoreClient; stdout: string }> {
const io = testIO();
const io = testIO({ stdin });
const root = createRootHandler(core, {
io: io.io,
logger: createSilentLogger(),
Expand Down Expand Up @@ -287,6 +288,23 @@ describe("oauth2-credential-provider flag validation", () => {
],
/requires one of --discovery-url or --authorization-server-metadata/,
],
[
"create: --client-secret with an inline value",
[
"identity",
"oauth2-credential-provider",
"create",
"--name",
"x",
"--vendor",
"CustomOauth2",
"--discovery-url",
"https://example.com",
"--client-secret",
"s-inline",
],
/file:\/\//,
],
] as const)("enforces vendor/config-mode rules for `%s`", async (_label, args, message) => {
expect(run([...args])).rejects.toThrow(message);
});
Expand Down Expand Up @@ -477,9 +495,10 @@ describe("OAuth2 update handler", () => {
PROVIDER_NAME,
...vendorArgs,
"--client-secret",
"updated-secret",
"-",
],
core,
"updated-secret",
);

const updateCall = core.identity.calls[1];
Expand Down
8 changes: 3 additions & 5 deletions src/handlers/identity/oauth2-credential-provider/update/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ export const createUpdateOauth2CredentialProviderHandler = (core: Core, io: AppI
flag("vendor", "the OAuth2 vendor", z.string().optional()),
flag(
"client-secret",
"the client secret (inline, file://path, or -)",
"the client secret (file://path or - for stdin; inline values are rejected)",
z.string().optional(),
{
sensitive: true,
},
{ sensitive: true },
),
flag(
"client-secret-reference",
Expand Down Expand Up @@ -131,7 +129,7 @@ export const createUpdateOauth2CredentialProviderHandler = (core: Core, io: AppI
validateCompleteConfigKey(providerConfigMode, existing.oauth2ProviderConfigOutput);

const resolver = new SourceResolver({ stdin: io.stdin });
const clientSecret = await resolver.resolveText("client-secret", flags["client-secret"]);
const clientSecret = await resolver.resolveSecret("client-secret", flags["client-secret"]);

const clientSecretConfig = hasSecretRef
? parseSecretReference("client-secret-reference", flags["client-secret-reference"]!)
Expand Down
4 changes: 4 additions & 0 deletions src/handlers/project/add/runtime/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ describe("project add runtime", () => {
"--api-key is only available on template path",
["--name", "my_agent", ...byo, "--api-key", "-"],
],
[
"--api-key rejects an inline secret value",
["--name", "my_agent", ...template, "--api-key", "sk-inline"],
],
[
"invalid memory JSON schema",
["--name", "my_agent", ...template, "--memory", '{"mode":"invalid"}'],
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/project/add/runtime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const createAddRuntimeHandler = (config: AddProjectResourceConfig) =>
const entrypoint = flags.entrypoint ?? "main.py";

const source = new SourceResolver({ stdin: config.io.stdin });
const apiKey = await source.resolveText("api-key", flags["api-key"]);
const apiKey = await source.resolveSecret("api-key", flags["api-key"]);

if (flags["custom-docker-build-args"] && !flags.dockerfile && !flags["build-context-path"])
throw new InputValidationError(
Expand Down
Loading