Files
gbrain/test/mcp-dispatch-summarize.test.ts
T
cb02932388 v0.26.9 fix(oauth): RFC 6749 hardening + close HTTP MCP shell-job RCE (#628)
* fix(mcp): close HTTP MCP shell-job RCE + tighten remote contract

The HTTP MCP transport in serve-http.ts inlined its own OperationContext
literal and forgot to set `remote: true`. With the field undefined at the
operations.ts protected-job-name guard (line 1391), an HTTP MCP caller
holding a write-scoped OAuth token could submit `submit_job {name: "shell"}`
and execute arbitrary commands on the gbrain host (RCE-class).

Two-layer fix:

1. F7 — explicit `remote: true` on the inlined /mcp OperationContext.
   Stdio MCP at src/mcp/dispatch.ts:61 already set this; the HTTP path
   was the regression.

2. F7b — fail-closed contract on the four ctx.remote consumer sites in
   operations.ts (auto-link skip, telemetry x2, protected-job guard).
   The protected-job guard flips from `if (ctx.remote && ...)` to
   `if (ctx.remote !== false && ...)` and the trusted-marker site flips
   from `!ctx.remote && ...` to `ctx.remote === false && ...`. Anything
   that isn't strictly `false` now treats the caller as remote/untrusted.

3. D12 — `OperationContext.remote` becomes REQUIRED in the TypeScript
   type. The compiler now catches future transports that forget the field.
   The runtime fail-closed defaults are belt+suspenders for any caller
   that bypasses the type via `as` cast or `Partial<>` spread.

Tests:

- New `test/trust-boundary-contract.test.ts` (4 cases) pins the
  fail-closed semantics: undefined-via-cast rejects, remote=true rejects,
  remote=false allowed (only path that escalates protected-name jobs).

- `test/e2e/serve-http-oauth.test.ts` adds 2 cases asserting HTTP MCP
  cannot submit `shell` or `subagent` jobs even with read+write scope.

- `test/e2e/graph-quality.test.ts` adds the now-required `remote: false`
  to its fixture (e2e graph quality simulates local-CLI writes).

Verification: bun test -> 3742 pass / 0 fail. typecheck clean.

Thanks to @ElectricSheepIO on X for the security review that surfaced
this trust-boundary regression.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(oauth): RFC 6749 hardening + serve-http defense in depth

OAuth provider hardening pass that brings the provider into RFC compliance
on auth code, refresh token, and revocation flows, and tightens the
serve-http surface around request logging and admin cookies.

Provider (src/core/oauth-provider.ts):

- F1: bind client_id atomically into the auth code DELETE WHERE clause for
  exchangeAuthorizationCode + challengeForAuthorizationCode. Previous
  pattern (DELETE...RETURNING then post-hoc client compare) burned codes
  on the wrong-client path so the legitimate client could not retry.
  RFC 6749 §10.5.

- F2: same atomic predicate on exchangeRefreshToken. The pre-fix shape
  defeated RFC 6749 §10.4's stolen-token detection by letting attacker +
  victim both succeed.

- F3: refresh token rejects requested scopes that are not a subset of the
  ORIGINAL grant on the row. Codex C9: subset is checked against the
  recorded grant, not the client's currently-allowed scopes (which can
  expand later); omitted scope inherits the original verbatim and stays
  distinct from explicit-empty. RFC 6749 §6.

- F4: revokeToken adds AND client_id to the DELETE so a client cannot
  revoke another client's tokens by guessing the hash. RFC 7009 §2.1.

- F5: deleted_at and token_ttl column probes use a new
  isUndefinedColumnError helper (extracted to src/core/utils.ts per D14)
  that matches SQLSTATE 42703 or column-name-in-message. Bare catch{}
  used to swallow lock timeouts, network blips, and auth failures as
  "column missing" — fail-open posture in a security path.

- F6: sweepExpiredTokens uses RETURNING 1 + array length. Pre-fix
  (result as any).count returned 0 on at least one engine even when
  rows were deleted, and codes were never counted.

- F7c: NEW finding eva-brain missed. exchangeAuthorizationCode now folds
  redirect_uri into the atomic DELETE predicate when the parameter is
  provided. Stored on /authorize, never compared on /token before this
  commit. RFC 6749 §4.1.3 violation. Back-compat: when caller omits the
  parameter the predicate is skipped, preserving SDK consumers that
  haven't adopted the parameter yet.

- F12 (cleanup, not security): dcrDisabled constructor option replaces
  the prior monkey-patch of _clientsStore in serve-http.ts. The SDK's
  mcpAuthRouter only wires up /register when the store exposes
  registerClient, so omitting the method via the constructor is
  sufficient. Reframed as cleanup per codex C10 — the monkey-patch
  happened before mcpAuthRouter ran, so the prior shape did not have
  a real security regression to claim.

Dispatch (src/mcp/dispatch.ts):

- F8: new summarizeMcpParams(opName, params) intersects submitted keys
  against the operation's declared params allow-list. Returns
  {redacted, kind, declared_keys, unknown_key_count, approx_bytes}.
  Closes the codex C8 leak: a naive "dump all submitted keys" summary
  still echoed attacker-controlled key names like
  put_page {"wiki/people/sensitive_name": "..."} into mcp_request_log
  + the SSE feed. Allow-list pattern keeps debug visibility on declared
  keys while counting unknowns without naming them.

Serve-http (src/commands/serve-http.ts) + serve (src/commands/serve.ts):

- F8 wiring: mcp_request_log + SSE broadcast routed through
  summarizeMcpParams by default. New --log-full-params flag bypasses
  redaction with a loud stderr warning at startup. Default privacy-
  positive; flag is the documented escape hatch for self-hosted
  operators debugging on their own laptop.

- F9: admin cookies set Secure when req.secure OR issuerUrl.protocol
  is https. Cloudflare-tunnel + reverse-proxy deployments where the
  inside-tunnel hop looks like http but the public URL is https now
  tag cookies correctly.

- F10: bound magicLinkNonces with NONCE_LRU_CAP. Previously only the
  consumed-nonces map was capped; an attacker (or misbehaving agent)
  with the bootstrap token could mint nonces faster than they expired
  and grow the live store unbounded.

- F12: dcrDisabled flows through to the provider constructor instead of
  monkey-patching _clientsStore after construction.

- F14: try/catch wraps StreamableHTTPServerTransport setup +
  handleRequest. SDK-level throws no longer fall through to express's
  default HTML error page; clients expecting JSON-RPC envelopes get a
  JSON 500 instead.

- F15: error envelope unified via buildError + serializeError from
  src/core/errors.ts. OperationError and unexpected exceptions both
  emit the same {class, code, message, hint} shape so clients can
  pattern-match a single envelope.

Tests:

- test/oauth.test.ts adds 11 cases:
  * F1+F2 wrong-client cannot consume / read PKCE / burn refresh,
    paired with owner-still-redeems atomically afterward (codex D6 —
    proves the predicate doesn't burn the row on attacker attempts).
  * F3 refresh scope subset enforced.
  * F4 wrong-client cannot revoke.
  * F5 non-schema SQL not swallowed by client_credentials soft-delete probe.
  * F6 sweepExpiredTokens returns count > 0 after deleting rows.
  * F7c redirect_uri match succeeds, mismatch rejects, omitted preserves
    back-compat for callers that don't pass the parameter.
  * F12 dcrDisabled constructor option exposes only getClient,
    registerClientManual still works.

- test/mcp-dispatch-summarize.test.ts (NEW, 6 cases): pins the F8
  privacy invariants. The codex-C8 attacker-key-name probe asserts that
  a sensitive name submitted as a key never appears anywhere in the
  redactor's output.

Verification: bun run typecheck clean. test/oauth.test.ts 55/55,
test/mcp-dispatch-summarize.test.ts 6/6,
test/trust-boundary-contract.test.ts 4/4 from commit A. The one
unrelated unit failure surfaces on master too — environment-sensitive
test that expects ~/.gbrain/config.json to be absent in the test env.

Out of scope: F11 (auth register-client --redirect-uri flag) and F13
(serve --http argv positive-int validator) per codex C11 — operator
UX gaps, not trust-boundary fixes. Filed as follow-up TODOs.

Thanks to @ElectricSheepIO on X for the security review that surfaced
this hardening pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: file F11 + F13 as OAuth hardening follow-up TODOs

Codex C11 flagged these as scope creep on the v0.26.7 OAuth hardening
PR (operator UX, not trust-boundary). Capturing them here so the
context survives — eva-brain has both implementations and the lift is
mechanical when we want to do them.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(oauth): close adversarial-review findings on F7c + F8

Two bugs surfaced by an adversarial subagent during /ship's pre-landing
review pass that the codex + plan-eng-review didn't catch.

D15 / F7c: `exchangeAuthorizationCode` used `redirectUri ? ...` ternary
to choose the with-redirect vs no-redirect SQL. Empty string fell
through to the no-redirect branch, so a caller submitting
`redirect_uri=""` at /token bypassed the binding entirely. RFC 6749
§4.1.3 spec violation. Switch to `redirectUri !== undefined`. Test:
empty-string redirect_uri must reject when /authorize stored a real URI.

D16 / F8: `summarizeMcpParams` published exact byte length via
`approx_bytes = JSON.stringify(params).length`. Submitting put_page with
a known prefix and observing the resulting log entry across repeated
probes lets an attacker binary-search the size of secret suffix content.
Bucket to 1KB resolution. The redacted summary keeps a coarse
"roughly how big" signal for operators while making size-based
side-channel attacks useless.

Test count: 65 → 67 across the three new test files.
Typecheck clean.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: bump version and changelog (v0.26.9)

OAuth 2.1 hardening + HTTP MCP shell-job RCE fix.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* docs: update project documentation for v0.26.9

Annotate CLAUDE.md key-files entries with v0.26.9 OAuth/MCP hardening pass:
- src/core/operations.ts: D12 (OperationContext.remote required) + F7b
  (4-site fail-closed flip), HTTP MCP shell-job RCE close
- src/core/utils.ts: D14 isUndefinedColumnError extracted helper
- src/mcp/dispatch.ts: F8 summarizeMcpParams privacy redactor with
  declared-keys allow-list + 1KB byte bucketing
- src/commands/serve-http.ts: F7+F8+F9+F10+F12+F14+F15 hardening
- src/core/oauth-provider.ts: F1+F2+F3+F4+F5+F6+F7c+F12 RFC 6749/7009
  hardening pass

Add new test-file entries for test/mcp-dispatch-summarize.test.ts
(7 cases) and test/trust-boundary-contract.test.ts (4 cases). Extend
test/oauth.test.ts (+14 cases) and test/e2e/serve-http-oauth.test.ts
(+2 RCE-close regressions) entries with v0.26.9 case counts.

README.md: added --log-full-params to gbrain serve --http surface.

SECURITY.md: documented mcp_request_log.params redaction default
({redacted, kind, declared_keys, unknown_key_count, approx_bytes}) +
--log-full-params opt-in.

docs/mcp/DEPLOY.md: operator-facing note on SSE feed + audit log
redaction default and when to flip --log-full-params on.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-04 21:11:15 -07:00

123 lines
5.5 KiB
TypeScript

/**
* Unit tests for `summarizeMcpParams` — the F8/codex-C8 redactor that strips
* raw values AND attacker-controlled key names from `mcp_request_log` + the
* admin SSE feed.
*
* Three invariants pinned:
* 1. Declared keys (the ones the operation accepts per its `params`
* definition) survive into `declared_keys` for debug visibility.
* 2. Unknown keys are counted but NOT named. A caller submitting a key
* like `wiki/people/sensitive_name` cannot leak that string into the
* log via the redactor's output.
* 3. The redactor never echoes raw values for any key. Privacy-positive
* default; --log-full-params is the documented escape hatch and lives
* in serve-http.ts, not here.
*/
import { describe, expect, test } from 'bun:test';
import { summarizeMcpParams, type ParamSummary } from '../src/mcp/dispatch.ts';
describe('summarizeMcpParams — declared-keys allow-list', () => {
test('declared keys are preserved alphabetically', () => {
// put_page declares params: slug, content (and a few others). The summary
// should list both, sorted, without any value bytes.
const summary = summarizeMcpParams('put_page', {
slug: 'people/alice',
content: '# Alice\n\nA private note.',
}) as ParamSummary;
expect(summary).not.toBeNull();
expect(summary.redacted).toBe(true);
expect(summary.kind).toBe('object');
expect(summary.declared_keys).toEqual(expect.arrayContaining(['slug', 'content']));
// Sorted property — fixed order across runs makes log diffs reviewable.
const sorted = [...(summary.declared_keys ?? [])].sort();
expect(summary.declared_keys).toEqual(sorted);
expect(summary.unknown_key_count).toBe(0);
expect(summary.approx_bytes).toBeGreaterThan(0);
});
test('unknown keys are counted but never named', () => {
// Codex C8 attacker scenario: attacker controls key names and stuffs
// sensitive data into them. Privacy posture requires we count them
// without echoing the names anywhere in the summary.
const sensitiveKey = 'wiki/people/SENSITIVE_TARGET_NAME';
const summary = summarizeMcpParams('put_page', {
slug: 'people/alice',
[sensitiveKey]: 'attacker-controlled value',
another_unknown: 'whatever',
}) as ParamSummary;
// Hard invariant: the sensitive name MUST NOT appear in any field of
// the summary.
const serialized = JSON.stringify(summary);
expect(serialized).not.toContain('SENSITIVE_TARGET_NAME');
expect(serialized).not.toContain('attacker-controlled value');
// unknown_key_count counts the keys we couldn't validate.
expect(summary.unknown_key_count).toBe(2);
// Declared keys still surface — slug is part of put_page's allow-list.
expect(summary.declared_keys).toContain('slug');
});
test('unknown op name produces all-unknown summary (zero declared keys)', () => {
// If the operation name doesn't resolve, the allow-list is empty and
// every submitted key is unknown. Privacy stays intact: no key names
// surface in the output.
const summary = summarizeMcpParams('this_op_does_not_exist', {
foo: 'a',
bar: 'b',
}) as ParamSummary;
expect(summary.declared_keys).toEqual([]);
expect(summary.unknown_key_count).toBe(2);
const serialized = JSON.stringify(summary);
expect(serialized).not.toContain('foo');
expect(serialized).not.toContain('bar');
});
test('null/undefined params return null (caller writes SQL NULL)', () => {
expect(summarizeMcpParams('put_page', null)).toBeNull();
expect(summarizeMcpParams('put_page', undefined)).toBeNull();
});
test('array params summarize length without elements', () => {
const summary = summarizeMcpParams('put_page', [1, 2, 3, 'sensitive']) as ParamSummary;
expect(summary.kind).toBe('array');
expect(summary.length).toBe(4);
const serialized = JSON.stringify(summary);
expect(serialized).not.toContain('sensitive');
});
test('primitive params summarize kind without value', () => {
const summary = summarizeMcpParams('put_page', 'a sensitive string') as ParamSummary;
expect(summary.kind).toBe('string');
const serialized = JSON.stringify(summary);
expect(serialized).not.toContain('sensitive');
});
test('approx_bytes is bucketed to 1KB to defeat size-based side-channels', () => {
// D16 / adversarial-review fix: the previous shape exposed exact byte
// length of every request, enabling an attacker to binary-search the
// size of secret content via repeated probes (submit put_page with a
// known prefix, observe approx_bytes, narrow the unknown-suffix size).
// Bucketing to 1KB resolution destroys the side-channel while keeping
// the operator-useful "roughly how big" signal.
const tiny = summarizeMcpParams('put_page', { slug: 'a' }) as ParamSummary;
// Tiny payload (~14 bytes) rounds up to the first 1KB bucket.
expect(tiny.approx_bytes).toBe(1024);
// 2KB payload should fall in either the 2KB or 3KB bucket depending on
// exact serialization length — the invariant is that it's a multiple of
// 1024, NOT the literal byte count.
const medium = summarizeMcpParams('put_page', {
slug: 'people/test',
content: 'x'.repeat(2000),
}) as ParamSummary;
expect(medium.approx_bytes).toBeDefined();
expect(medium.approx_bytes! % 1024).toBe(0);
// Bucket cannot be less than the actual size and must round UP, so
// a ~2KB payload lands in the 2KB or 3KB bucket.
expect(medium.approx_bytes!).toBeGreaterThanOrEqual(2048);
});
});