smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ai): ignored bedrock auth sentinel

Browse Source 
Ignored the agent auth sentinel when selecting Bedrock bearer auth so AWS credential sources still use SigV4.

Added regression coverage for sentinel forwarding with AWS_BEARER_TOKEN_BEDROCK and static AWS credentials.

Fixes #1399
This commit is contained in:
roboomp
2026-05-26 11:44:31 +02:00
committed by can1357
parent 7bea138322
commit 2590bd4e28
2 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ai/src/providers/amazon-bedrock.ts
+7 -1
View File
@@ -65,6 +65,12 @@ export interface BedrockOptions extends StreamOptions {
*/
thinkingDisplay?: BedrockThinkingDisplay;
}
const AUTHENTICATED_API_KEY_SENTINEL = "<authenticated>";
function resolveBearerToken(options: BedrockOptions): string | undefined {
const apiKey = options.apiKey === AUTHENTICATED_API_KEY_SENTINEL ? undefined : options.apiKey;
return options.bearerToken || apiKey || $env.AWS_BEARER_TOKEN_BEDROCK;
}
type Block = (TextContent | ThinkingContent | ToolCall) & { index?: number; partialJson?: string };
@@ -234,7 +240,7 @@ export const streamBedrock: StreamFunction<"bedrock-converse-stream"> = (
accept: "application/vnd.amazon.eventstream",
};
const bearerToken = options.bearerToken || options.apiKey || $env.AWS_BEARER_TOKEN_BEDROCK;
const bearerToken = resolveBearerToken(options);
let requestHeaders: Record<string, string>;
if (bearerToken) {
requestHeaders = { ...baseHeaders, Authorization: `Bearer ${bearerToken}` };
packages/ai/test/issue-1399-repro.test.ts
+82 -8
View File
@@ -38,11 +38,22 @@ const awsEnvKeys = [
"AWS_BEARER_TOKEN_BEDROCK",
"AWS_BEDROCK_SKIP_AUTH",
] as const;
function snapshotAwsEnv(): () => void {
const previous = new Map<string, string | undefined>();
for (const key of awsEnvKeys) previous.set(key, process.env[key]);
return () => {
for (const key of awsEnvKeys) {
const value = previous.get(key);
if (value === undefined) delete process.env[key];
else process.env[key] = value;
}
clearAwsCredentialCache();
};
}
describe("issue #1399: Bedrock bearer token precedence", () => {
it("uses AWS_BEARER_TOKEN_BEDROCK without invoking profile credential_process", async () => {
const previous = new Map<string, string | undefined>();
for (const key of awsEnvKeys) previous.set(key, process.env[key]);
const restoreAwsEnv = snapshotAwsEnv();
const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "omp-bedrock-auth-"));
try {
@@ -84,13 +95,76 @@ describe("issue #1399: Bedrock bearer token precedence", () => {
expect(result.errorMessage).toContain("Bedrock HTTP 401");
expect(result.errorMessage).not.toContain("credential_process");
} finally {
for (const key of awsEnvKeys) {
const value = previous.get(key);
if (value === undefined) delete process.env[key];
else process.env[key] = value;
}
clearAwsCredentialCache();
restoreAwsEnv();
await fs.rm(tempDir, { recursive: true, force: true });
}
});
it("ignores agent sentinel apiKey when AWS_BEARER_TOKEN_BEDROCK is available", async () => {
const restoreAwsEnv = snapshotAwsEnv();
try {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_PROFILE;
delete process.env.AWS_CONFIG_FILE;
delete process.env.AWS_DEFAULT_REGION;
delete process.env.AWS_BEDROCK_SKIP_AUTH;
process.env.AWS_REGION = "us-west-2";
process.env.AWS_SHARED_CREDENTIALS_FILE = path.join(os.tmpdir(), "missing-aws-credentials");
process.env.AWS_EC2_METADATA_DISABLED = "true";
process.env.AWS_BEARER_TOKEN_BEDROCK = "bedrock-api-key";
clearAwsCredentialCache();
let requestHeaders: Headers | undefined;
using _hook = hookFetch((_input, init) => {
requestHeaders = new Headers(init?.headers);
return new Response('{"message":"unauthorized"}', { status: 401 });
});
const result = await streamBedrock(model, context, { apiKey: "<authenticated>" }).result();
expect(requestHeaders?.get("authorization")).toBe("Bearer bedrock-api-key");
expect(requestHeaders?.get("authorization")).not.toBe("Bearer <authenticated>");
expect(requestHeaders?.has("x-amz-date")).toBe(false);
expect(result.stopReason).toBe("error");
} finally {
restoreAwsEnv();
}
});
it("ignores agent sentinel apiKey when signing with AWS credentials", async () => {
const restoreAwsEnv = snapshotAwsEnv();
try {
process.env.AWS_ACCESS_KEY_ID = "AKIDEXAMPLE";
process.env.AWS_SECRET_ACCESS_KEY = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY";
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_PROFILE;
delete process.env.AWS_CONFIG_FILE;
delete process.env.AWS_SHARED_CREDENTIALS_FILE;
delete process.env.AWS_DEFAULT_REGION;
delete process.env.AWS_BEARER_TOKEN_BEDROCK;
delete process.env.AWS_BEDROCK_SKIP_AUTH;
process.env.AWS_REGION = "us-west-2";
process.env.AWS_EC2_METADATA_DISABLED = "true";
clearAwsCredentialCache();
let requestHeaders: Headers | undefined;
using _hook = hookFetch((_input, init) => {
requestHeaders = new Headers(init?.headers);
return new Response('{"message":"unauthorized"}', { status: 401 });
});
const result = await streamBedrock(model, context, { apiKey: "<authenticated>" }).result();
const authorization = requestHeaders?.get("authorization");
expect(authorization).toStartWith("AWS4-HMAC-SHA256 ");
expect(authorization).toContain("Credential=AKIDEXAMPLE/");
expect(authorization).not.toBe("Bearer <authenticated>");
expect(requestHeaders?.has("x-amz-date")).toBe(true);
expect(result.stopReason).toBe("error");
} finally {
restoreAwsEnv();
}
});
});