`POST /renew` is authenticated by mTLS with the very leaf it renews, so once that leaf lapsed the host could never renew it and the tunnel stayed down until an operator re-paired by hand. Production hit exactly this: the Mac slept through its 8h renewal window, the 24h leaf expired, and the agent then logged `client certificate has expired; renew before dialling` 6380 times over 8 days without recovering. Three layers independently refused an expired leaf, so all three had to move: - agent `buildTlsOptions` gains an opt-in `expiredGraceMs`. Absent/0 keeps the historical fail-closed behaviour, and the TUNNEL dial never passes it — only the renew transport does. Past the window it throws the new `CertExpiredBeyondGraceError`. - agent rotator routes an already-expired leaf to a separate recovery endpoint and treats "beyond grace" as TERMINAL: report once via `onExhausted`, stop retrying, and name the fix (re-pair) instead of spamming warnings forever. - control-plane `assertPresentedCertTrusted` grants a bounded grace on `notAfter` only. Chain validation, SPIFFE identity, `notBefore`, and the registry `active`/account checks are all unchanged, so revocation still bites. - new `deploy/nginx/recover-mtls.conf` (:8472). The strict enroll vhost cannot host this: under `ssl_verify_client optional` nginx answers a bare 400 as soon as a presented cert fails verification, so an expired leaf never reaches the location — and the directive is server-level, not per-location. Grace defaults to 30 days on both ends and is configurable (`RECOVER_URL`, `expiredRenewGraceMs`). The honest trade is recorded in the code: a stale stolen leaf stays reusable for the window, which widens an existing exposure (an unexpired stolen leaf already renews indefinitely) rather than opening a new one. Verified: agent 296/296, control-plane 286/286, tsc clean on both.
282 lines
10 KiB
TypeScript
282 lines
10 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest'
|
|
import { mkdtempSync, rmSync } from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import type { AgentConfig } from '../src/config/agentConfig.js'
|
|
import { generateIdentity } from '../src/keys/identity.js'
|
|
import { openKeystore } from '../src/keys/keystore.js'
|
|
import {
|
|
computeRenewDelayMs,
|
|
createCertRotator,
|
|
recoveryRenewalUrlFor,
|
|
renewCert,
|
|
renewalUrlFor,
|
|
} from '../src/certs/rotation.js'
|
|
import { CertExpiredBeyondGraceError } from '../src/transport/dial.js'
|
|
import { createBackoff } from '../src/transport/backoff.js'
|
|
import { FakeTimer } from './fixtures/fakes.js'
|
|
|
|
const CFG: AgentConfig = {
|
|
relayUrl: 'wss://relay/agent',
|
|
enrollUrl: 'https://example.com/enroll',
|
|
stateDir: '/tmp/x',
|
|
localTargetUrl: 'ws://127.0.0.1:3000',
|
|
subdomain: 'host-42',
|
|
hostId: 'h-1',
|
|
}
|
|
|
|
function enrolledKs() {
|
|
const dir = mkdtempSync(join(tmpdir(), 'wta-rot-'))
|
|
const ks = openKeystore(dir)
|
|
ks.saveIdentity(generateIdentity())
|
|
ks.saveCert('OLDCERT', 'OLDCA')
|
|
return { dir, ks }
|
|
}
|
|
|
|
function jsonRes(status: number, body: unknown): Response {
|
|
return { ok: status >= 200 && status < 300, status, json: async () => body } as unknown as Response
|
|
}
|
|
|
|
describe('cert rotation math (T13)', () => {
|
|
it('derives P3 renewal URL from enrollUrl', () => {
|
|
expect(renewalUrlFor(CFG)).toBe('https://example.com/renew')
|
|
})
|
|
|
|
it('renews renewBeforeMs before expiry, clamped at 0', () => {
|
|
const now = new Date('2026-01-01T00:00:00Z')
|
|
const parse = () => new Date('2026-01-01T01:00:00Z') // expires in 1h
|
|
expect(computeRenewDelayMs('C', 5 * 60_000, now, parse)).toBe(55 * 60_000)
|
|
const parsePast = () => new Date('2025-01-01T00:00:00Z')
|
|
expect(computeRenewDelayMs('C', 5 * 60_000, now, parsePast)).toBe(0)
|
|
})
|
|
})
|
|
|
|
describe('renewCert (T13)', () => {
|
|
it('installs a fresh cert atomically on success (same key)', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const before = ks.loadIdentity()!.publicKey
|
|
const fetchImpl = vi.fn(async () => jsonRes(200, { cert: 'NEWCERT', caChain: ['NEWCA'] }))
|
|
const out = await renewCert(CFG, ks.loadIdentity()!, ks, fetchImpl as unknown as typeof fetch)
|
|
expect(out).toBe('rotated')
|
|
expect(ks.loadCert()!.certPem).toContain('NEWCERT'); expect(ks.loadCert()!.caChainPem).toContain('NEWCA')
|
|
// pubkey unchanged — only the cert rotated
|
|
expect(Buffer.from(ks.loadIdentity()!.publicKey).equals(Buffer.from(before))).toBe(true)
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('403 → revoked (⇒ T14 teardown, INV12)', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const fetchImpl = async () => jsonRes(403, {})
|
|
const out = await renewCert(CFG, ks.loadIdentity()!, ks, fetchImpl as unknown as typeof fetch)
|
|
expect(out).toBe('revoked')
|
|
expect(ks.loadCert()).toEqual({ certPem: 'OLDCERT', caChainPem: 'OLDCA' }) // untouched
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
})
|
|
|
|
const flush = () => new Promise((r) => setImmediate(r))
|
|
|
|
describe('createCertRotator (T13)', () => {
|
|
it('fires onRevoked when the scheduled renewal returns 403', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
const rotator = createCertRotator(CFG, ks.loadIdentity()!, ks, {
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
fetchImpl: (async () => jsonRes(403, {})) as unknown as typeof fetch,
|
|
now: () => new Date(0),
|
|
parseCert: () => new Date(2000), // expires 2s after epoch → delay ~1000ms
|
|
})
|
|
let revoked = false
|
|
rotator.onRevoked(() => {
|
|
revoked = true
|
|
})
|
|
rotator.start()
|
|
timer.advance(1000) // scheduled renewal fires
|
|
await flush()
|
|
expect(revoked).toBe(true)
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('rotates and reschedules on a successful renewal (seamless)', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
const rotator = createCertRotator(CFG, ks.loadIdentity()!, ks, {
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
fetchImpl: (async () => jsonRes(200, { cert: 'NEWCERT', caChain: ['NEWCA'] })) as unknown as typeof fetch,
|
|
now: () => new Date(0),
|
|
parseCert: () => new Date(2000),
|
|
})
|
|
let rotated = 0
|
|
rotator.onRotated(() => {
|
|
rotated += 1
|
|
})
|
|
rotator.start()
|
|
timer.advance(1000)
|
|
await flush()
|
|
expect(rotated).toBe(1)
|
|
expect(ks.loadCert()!.certPem).toContain('NEWCERT')
|
|
rotator.stop()
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('invokes onError and retries with backoff (not renewBeforeMs) when a renewal throws', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
let calls = 0
|
|
const fetchImpl = (async () => {
|
|
calls += 1
|
|
if (calls === 1) throw new Error('network down')
|
|
return jsonRes(200, { cert: 'NEWCERT', caChain: ['NEWCA'] })
|
|
}) as unknown as typeof fetch
|
|
const errors: unknown[] = []
|
|
let rotated = 0
|
|
const rotator = createCertRotator(CFG, ks.loadIdentity()!, ks, {
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
retryBackoff: createBackoff({ baseMs: 500, jitter: false }),
|
|
fetchImpl,
|
|
now: () => new Date(0),
|
|
parseCert: () => new Date(2000), // initial renewal scheduled at ~1000ms
|
|
})
|
|
rotator.onError((e) => errors.push(e))
|
|
rotator.onRotated(() => {
|
|
rotated += 1
|
|
})
|
|
rotator.start()
|
|
|
|
timer.advance(1000) // first attempt fires → throws
|
|
await flush()
|
|
expect(errors).toHaveLength(1)
|
|
expect(rotated).toBe(0)
|
|
|
|
// The retry is armed at the 500ms backoff delay, NOT renewBeforeMs (1000): advancing only 500
|
|
// must fire it. A crash-loop never escapes here (the supervisor keeps running).
|
|
timer.advance(500)
|
|
await flush()
|
|
expect(rotated).toBe(1)
|
|
expect(ks.loadCert()!.certPem).toContain('NEWCERT')
|
|
rotator.stop()
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
})
|
|
|
|
/**
|
|
* Expired-leaf recovery (production deadlock, 2026-07): `/renew` is mTLS-authenticated by the leaf
|
|
* it renews, so a lapsed leaf can never renew itself. Recovery needs BOTH a different endpoint (the
|
|
* strict nginx vhost rejects an expired client cert with a bare 400 before any location runs) and a
|
|
* terminal signal when even the grace window is spent, so the agent stops retrying forever.
|
|
*/
|
|
describe('expired-leaf recovery routing', () => {
|
|
it('derives the recovery endpoint from an `enroll.` host', () => {
|
|
expect(recoveryRenewalUrlFor({ ...CFG, enrollUrl: 'https://enroll.terminal.example.com/enroll' })).toBe(
|
|
'https://recover.terminal.example.com/renew',
|
|
)
|
|
})
|
|
|
|
it('honours an explicit recoverUrl over the derivation', () => {
|
|
expect(
|
|
recoveryRenewalUrlFor({
|
|
...CFG,
|
|
enrollUrl: 'https://enroll.terminal.example.com/enroll',
|
|
recoverUrl: 'https://elsewhere.example.com/renew',
|
|
}),
|
|
).toBe('https://elsewhere.example.com/renew')
|
|
})
|
|
|
|
it('is null when the enroll host carries no `enroll.` label (nothing to derive)', () => {
|
|
expect(recoveryRenewalUrlFor(CFG)).toBeNull()
|
|
})
|
|
|
|
it('posts to the NORMAL endpoint while the leaf is still valid', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
const urls: string[] = []
|
|
const rotator = createCertRotator(
|
|
{ ...CFG, enrollUrl: 'https://enroll.terminal.example.com/enroll' },
|
|
ks.loadIdentity()!,
|
|
ks,
|
|
{
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
fetchImpl: (async (u: string) => {
|
|
urls.push(u)
|
|
return jsonRes(200, { cert: 'NEWCERT', caChain: ['NEWCA'] })
|
|
}) as unknown as typeof fetch,
|
|
now: () => new Date(0),
|
|
parseCert: () => new Date(2000), // still valid at now=0
|
|
},
|
|
)
|
|
rotator.start()
|
|
timer.advance(1000)
|
|
await flush()
|
|
expect(urls).toEqual(['https://enroll.terminal.example.com/renew'])
|
|
rotator.stop()
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('posts to the RECOVERY endpoint once the leaf has already expired', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
const urls: string[] = []
|
|
const rotator = createCertRotator(
|
|
{ ...CFG, enrollUrl: 'https://enroll.terminal.example.com/enroll' },
|
|
ks.loadIdentity()!,
|
|
ks,
|
|
{
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
fetchImpl: (async (u: string) => {
|
|
urls.push(u)
|
|
return jsonRes(200, { cert: 'NEWCERT', caChain: ['NEWCA'] })
|
|
}) as unknown as typeof fetch,
|
|
now: () => new Date(10_000),
|
|
parseCert: () => new Date(2000), // expired 8s ago ⇒ delay clamps to 0
|
|
},
|
|
)
|
|
rotator.start()
|
|
timer.advance(0)
|
|
await flush()
|
|
expect(urls).toEqual(['https://recover.terminal.example.com/renew'])
|
|
rotator.stop()
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
|
|
it('fires onExhausted and STOPS retrying when the grace window is spent', async () => {
|
|
const { dir, ks } = enrolledKs()
|
|
const timer = new FakeTimer()
|
|
let attempts = 0
|
|
const rotator = createCertRotator(CFG, ks.loadIdentity()!, ks, {
|
|
timer,
|
|
renewBeforeMs: 1000,
|
|
retryBackoff: createBackoff({ baseMs: 500, jitter: false }),
|
|
fetchImpl: (async () => {
|
|
attempts += 1
|
|
throw new CertExpiredBeyondGraceError(40 * 86_400_000, 30 * 86_400_000)
|
|
}) as unknown as typeof fetch,
|
|
now: () => new Date(0),
|
|
parseCert: () => new Date(2000),
|
|
})
|
|
const errors: unknown[] = []
|
|
let exhausted: CertExpiredBeyondGraceError | null = null
|
|
rotator.onError((e) => errors.push(e))
|
|
rotator.onExhausted((e) => {
|
|
exhausted = e
|
|
})
|
|
rotator.start()
|
|
timer.advance(1000)
|
|
await flush()
|
|
|
|
expect(attempts).toBe(1)
|
|
expect(exhausted).toBeInstanceOf(CertExpiredBeyondGraceError)
|
|
// Terminal: no retry is armed, because only a re-pair can help — retrying forever is the log
|
|
// spam that buried the real signal in production (6380 identical warnings).
|
|
expect(errors).toHaveLength(0)
|
|
timer.advance(60_000)
|
|
await flush()
|
|
expect(attempts).toBe(1)
|
|
rmSync(dir, { recursive: true, force: true })
|
|
})
|
|
})
|