mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-20 04:20:38 +09:00
fix(agent-auth): fall back to BETTER_AUTH_SECRET when PAPERCLIP_AGENT_JWT_SECRET is absent
`jwtConfig()` in `agent-auth-jwt.ts` only read `PAPERCLIP_AGENT_JWT_SECRET`. Deployments that set `BETTER_AUTH_SECRET` (required for authenticated mode) but omit the separate `PAPERCLIP_AGENT_JWT_SECRET` variable received the warning "local agent jwt secret missing or invalid; running without injected PAPERCLIP_API_KEY" on every `claude_local` / `codex_local` heartbeat run, leaving agents unable to call the API. Every other auth path in the server (`better-auth.ts`, `index.ts`) already falls back from `BETTER_AUTH_SECRET` to cover this case — align `jwtConfig()` with the same pattern. Adds a test for the fallback path. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
parent
9d6d159209
commit
81ff9fb311
2 changed files with 22 additions and 1 deletions
|
|
@ -3,12 +3,14 @@ import { createLocalAgentJwt, verifyLocalAgentJwt } from "../agent-auth-jwt.js";
|
||||||
|
|
||||||
describe("agent local JWT", () => {
|
describe("agent local JWT", () => {
|
||||||
const secretEnv = "PAPERCLIP_AGENT_JWT_SECRET";
|
const secretEnv = "PAPERCLIP_AGENT_JWT_SECRET";
|
||||||
|
const betterAuthSecretEnv = "BETTER_AUTH_SECRET";
|
||||||
const ttlEnv = "PAPERCLIP_AGENT_JWT_TTL_SECONDS";
|
const ttlEnv = "PAPERCLIP_AGENT_JWT_TTL_SECONDS";
|
||||||
const issuerEnv = "PAPERCLIP_AGENT_JWT_ISSUER";
|
const issuerEnv = "PAPERCLIP_AGENT_JWT_ISSUER";
|
||||||
const audienceEnv = "PAPERCLIP_AGENT_JWT_AUDIENCE";
|
const audienceEnv = "PAPERCLIP_AGENT_JWT_AUDIENCE";
|
||||||
|
|
||||||
const originalEnv = {
|
const originalEnv = {
|
||||||
secret: process.env[secretEnv],
|
secret: process.env[secretEnv],
|
||||||
|
betterAuthSecret: process.env[betterAuthSecretEnv],
|
||||||
ttl: process.env[ttlEnv],
|
ttl: process.env[ttlEnv],
|
||||||
issuer: process.env[issuerEnv],
|
issuer: process.env[issuerEnv],
|
||||||
audience: process.env[audienceEnv],
|
audience: process.env[audienceEnv],
|
||||||
|
|
@ -16,6 +18,7 @@ describe("agent local JWT", () => {
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
process.env[secretEnv] = "test-secret";
|
process.env[secretEnv] = "test-secret";
|
||||||
|
delete process.env[betterAuthSecretEnv];
|
||||||
process.env[ttlEnv] = "3600";
|
process.env[ttlEnv] = "3600";
|
||||||
delete process.env[issuerEnv];
|
delete process.env[issuerEnv];
|
||||||
delete process.env[audienceEnv];
|
delete process.env[audienceEnv];
|
||||||
|
|
@ -26,6 +29,8 @@ describe("agent local JWT", () => {
|
||||||
vi.useRealTimers();
|
vi.useRealTimers();
|
||||||
if (originalEnv.secret === undefined) delete process.env[secretEnv];
|
if (originalEnv.secret === undefined) delete process.env[secretEnv];
|
||||||
else process.env[secretEnv] = originalEnv.secret;
|
else process.env[secretEnv] = originalEnv.secret;
|
||||||
|
if (originalEnv.betterAuthSecret === undefined) delete process.env[betterAuthSecretEnv];
|
||||||
|
else process.env[betterAuthSecretEnv] = originalEnv.betterAuthSecret;
|
||||||
if (originalEnv.ttl === undefined) delete process.env[ttlEnv];
|
if (originalEnv.ttl === undefined) delete process.env[ttlEnv];
|
||||||
else process.env[ttlEnv] = originalEnv.ttl;
|
else process.env[ttlEnv] = originalEnv.ttl;
|
||||||
if (originalEnv.issuer === undefined) delete process.env[issuerEnv];
|
if (originalEnv.issuer === undefined) delete process.env[issuerEnv];
|
||||||
|
|
@ -57,6 +62,22 @@ describe("agent local JWT", () => {
|
||||||
expect(verifyLocalAgentJwt("abc.def.ghi")).toBeNull();
|
expect(verifyLocalAgentJwt("abc.def.ghi")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("falls back to BETTER_AUTH_SECRET when PAPERCLIP_AGENT_JWT_SECRET is absent", () => {
|
||||||
|
delete process.env[secretEnv];
|
||||||
|
process.env[betterAuthSecretEnv] = "fallback-secret";
|
||||||
|
vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
|
||||||
|
const token = createLocalAgentJwt("agent-1", "company-1", "claude_local", "run-1");
|
||||||
|
expect(typeof token).toBe("string");
|
||||||
|
|
||||||
|
const claims = verifyLocalAgentJwt(token!);
|
||||||
|
expect(claims).toMatchObject({
|
||||||
|
sub: "agent-1",
|
||||||
|
company_id: "company-1",
|
||||||
|
adapter_type: "claude_local",
|
||||||
|
run_id: "run-1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("rejects expired tokens", () => {
|
it("rejects expired tokens", () => {
|
||||||
process.env[ttlEnv] = "1";
|
process.env[ttlEnv] = "1";
|
||||||
vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
|
vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ function parseNumber(value: string | undefined, fallback: number) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function jwtConfig() {
|
function jwtConfig() {
|
||||||
const secret = process.env.PAPERCLIP_AGENT_JWT_SECRET;
|
const secret = process.env.PAPERCLIP_AGENT_JWT_SECRET?.trim() || process.env.BETTER_AUTH_SECRET?.trim();
|
||||||
if (!secret) return null;
|
if (!secret) return null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue