Skip to content

Commit cdcdc82

Browse files
jarrodwattsclaude
andcommitted
Rename AGW_MCP_CALLBACK_SIGNING_* to AGW_CALLBACK_SIGNING_*
Align server env var names with CLI convention. The MCP_ prefix was misleading — callback signing is not MCP-specific. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent dc09291 commit cdcdc82

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

app/.env.example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ PRIVY_APP_SECRET=
1010
PRIVY_DEFAULT_POLICY_ID=
1111

1212
# Callback attestation signing (optional in dev — ephemeral key auto-generated)
13-
AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY=
14-
AGW_MCP_CALLBACK_SIGNING_PUBLIC_KEY=
15-
AGW_MCP_CALLBACK_SIGNING_ISSUER=
13+
AGW_CALLBACK_SIGNING_PRIVATE_KEY=
14+
AGW_CALLBACK_SIGNING_PUBLIC_KEY=
15+
AGW_CALLBACK_SIGNING_ISSUER=

app/src/lib/__tests__/callback-attestation.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {
77
verifySignedServerPayload,
88
} from '../server/callback-attestation';
99

10-
const originalPrivateKey = process.env.AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY;
11-
const originalPublicKey = process.env.AGW_MCP_CALLBACK_SIGNING_PUBLIC_KEY;
12-
const originalIssuer = process.env.AGW_MCP_CALLBACK_SIGNING_ISSUER;
10+
const originalPrivateKey = process.env.AGW_CALLBACK_SIGNING_PRIVATE_KEY;
11+
const originalPublicKey = process.env.AGW_CALLBACK_SIGNING_PUBLIC_KEY;
12+
const originalIssuer = process.env.AGW_CALLBACK_SIGNING_ISSUER;
1313

1414
declare global {
1515
// eslint-disable-next-line no-var
@@ -24,29 +24,29 @@ declare global {
2424

2525
function resetSignerCache() {
2626
delete globalThis.__agwMcpCallbackSigner;
27-
delete process.env.AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY;
28-
delete process.env.AGW_MCP_CALLBACK_SIGNING_PUBLIC_KEY;
29-
delete process.env.AGW_MCP_CALLBACK_SIGNING_ISSUER;
27+
delete process.env.AGW_CALLBACK_SIGNING_PRIVATE_KEY;
28+
delete process.env.AGW_CALLBACK_SIGNING_PUBLIC_KEY;
29+
delete process.env.AGW_CALLBACK_SIGNING_ISSUER;
3030
}
3131

3232
afterEach(() => {
3333
resetSignerCache();
3434

3535
if (originalPrivateKey !== undefined) {
36-
process.env.AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY = originalPrivateKey;
36+
process.env.AGW_CALLBACK_SIGNING_PRIVATE_KEY = originalPrivateKey;
3737
}
3838
if (originalPublicKey !== undefined) {
39-
process.env.AGW_MCP_CALLBACK_SIGNING_PUBLIC_KEY = originalPublicKey;
39+
process.env.AGW_CALLBACK_SIGNING_PUBLIC_KEY = originalPublicKey;
4040
}
4141
if (originalIssuer !== undefined) {
42-
process.env.AGW_MCP_CALLBACK_SIGNING_ISSUER = originalIssuer;
42+
process.env.AGW_CALLBACK_SIGNING_ISSUER = originalIssuer;
4343
}
4444
});
4545

4646
describe('callback attestation', () => {
4747
it('signs and verifies init callback payloads with freshness metadata', () => {
4848
resetSignerCache();
49-
process.env.AGW_MCP_CALLBACK_SIGNING_ISSUER = 'agw-test';
49+
process.env.AGW_CALLBACK_SIGNING_ISSUER = 'agw-test';
5050

5151
const payload = buildSignedCallbackPayload({
5252
version: 2 as const,

app/src/lib/server/callback-attestation.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ function encodeBase64Url(input: Buffer | string): string {
2626
}
2727

2828
function resolveIssuer(): string {
29-
return process.env.AGW_MCP_CALLBACK_SIGNING_ISSUER?.trim() || DEFAULT_CALLBACK_ISSUER;
29+
return process.env.AGW_CALLBACK_SIGNING_ISSUER?.trim() || DEFAULT_CALLBACK_ISSUER;
3030
}
3131

3232
function loadConfiguredSigner(): CallbackSigner | null {
33-
const privateKeyBase64 = process.env.AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY?.trim();
33+
const privateKeyBase64 = process.env.AGW_CALLBACK_SIGNING_PRIVATE_KEY?.trim();
3434
if (!privateKeyBase64) {
3535
return null;
3636
}
@@ -44,7 +44,7 @@ function loadConfiguredSigner(): CallbackSigner | null {
4444
format: 'der',
4545
type: 'spki',
4646
}).toString('base64');
47-
const configuredPublicKey = process.env.AGW_MCP_CALLBACK_SIGNING_PUBLIC_KEY?.trim();
47+
const configuredPublicKey = process.env.AGW_CALLBACK_SIGNING_PUBLIC_KEY?.trim();
4848
if (configuredPublicKey && configuredPublicKey !== publicKeyBase64) {
4949
throw new Error('Configured callback signing public key does not match the provided private key.');
5050
}
@@ -87,7 +87,7 @@ function getCallbackSigner(): CallbackSigner {
8787
}
8888

8989
if (process.env.NODE_ENV === 'production') {
90-
throw new Error('Missing AGW_MCP_CALLBACK_SIGNING_PRIVATE_KEY in production environment.');
90+
throw new Error('Missing AGW_CALLBACK_SIGNING_PRIVATE_KEY in production environment.');
9191
}
9292

9393
cachedCallbackSigner = createEphemeralSigner();

0 commit comments

Comments
 (0)