mirror of
https://github.com/Sea-Haven-Industries/sh-mcp.git
synced 2026-09-30 18:13:18 +00:00
Some checks are pending
deploy / deploy (push) Waiting to run
* Add shared transport: dispatch, MCP + OpenAPI adapters, local auth
Add the single authoritative tool-execution path (executeTool) plus the two
universal interfaces over it (design.md §2.5, §7.3):
- dispatch.ts: scope enforcement, ajv input validation, rate limiting, finance
egress redaction (redactDeep), and structured audit emission on one path.
- audit.ts / rate-limit.ts: injected AuditLogger + RateLimiter abstractions.
- mcp.ts: low-level MCP Server with scope-filtered tools/list (tool-hiding) and
tools/call routed through executeTool.
- http.ts: Express host mounting /mcp, /openapi.json, POST /tools/:name, /healthz.
- openapi.ts: buildOpenApiDocument wraps the existing path generator into a full
OpenAPI 3.1 document.
- local-auth.ts: LocalAuthProvider (dev bearer tokens) that refuses to construct
outside SH_MCP_ENV=local and enforces audience binding (design.md §3, §6).
* Add in-memory dev clients; make package tool exports lazy
Add an in-memory Client implementation per integration package (seeded fake
data, no network) selected when SH_MCP_ENV=local (build-plan §4). Gmail/calendar/
tasks dev clients partition by ctx.sub; payments/qbo seed sensitive-looking
fields so the redaction egress path has real targets to mask.
Make the eager default-tool exports in tasks/reminders/qbo LAZY (getDefaultTools)
so importing a package barrel no longer constructs an AWS client at module load
(build-plan §7 'no I/O at import time') — the previous eager construction broke
server startup. Fix payments tsconfig rootDir (src, was '.') so its declarations
resolve under dist/index.d.ts like the other 8 packages.
* Add runnable sh-mcp-ops and sh-mcp-finance servers
Two thin composition-root servers over the shared transport (design.md §3):
- ops: internal-data, knowledge-base, google-maps, gmail, calendar, tasks,
reminders. finance: qbo, payments (audited + redacted on egress).
- config from env only (no hardcoded ids/issuer/tables); SH_MCP_ENV selects
LocalAuthProvider + dev clients (local) vs CognitoAuthProvider + real stubs
(aws). Finance applies the 15-min finance-token TTL ceiling (design.md §2.5).
- index.ts is the only place .listen() is called; a Lambda handler placeholder
is exported but not depended on.
- synth-only CDK stubs (no real IAM/Cognito/WAF) so 'cdk synth' has a valid app
(build-plan §6); READMEs document local run, dev tokens, curl, MCP Inspector.
* Add security-weighted test suite + coverage gate; wire tooling
Add tests for the highest-risk surface (build-plan §5, design.md §7.3):
tool-hiding, server-side scope enforcement (incl. forced hidden calls),
audience binding, input-schema validation, finance redaction on egress, audit
emission with hashed args, prompt-injection regression (tool output is data),
rate limiting, MCP conformance (in-memory transport round-trip), OpenAPI 3.1
validity, and local-auth safety. Add HTTP integration tests (supertest) for both
servers and per-package dev-client tests. 405 tests pass.
Wire the coverage gate into vitest.config.ts: 80% overall, with per-file
thresholds on the auth + dispatch crown jewels; exclude deferred real client
stubs, entrypoints, cdk apps, and aws-only config from the gate (documented).
Extend eslint flat config + add .prettierignore to cover servers/. Commit the
updated package-lock.json.
* Suppress pre-existing dev-tooling + out-of-scope scanner findings
Add written-justification suppressions for the 4 confirmed crit/high pre-push
scanner findings, none of which are in this PR's Phase 1 production code:
- npmaudit vitest / @vitest/coverage-v8 / vite: dev/test-only deps that never
run in the deployed server/Lambda runtime (pins carried from Phase 0b;
Dependabot will bump).
- gitleaks docs/agentforce-plan.md secret: that file is not on this branch and
not in this changeset; flagged for the maintainer to scrub on its own branch.
The deep agentic /sh-security-review (required for this auth/authz-touching PR)
was NOT run by the agent and is flagged outstanding in the PR body.
* Address CodeQL findings: bound ajv error work + edge rate limiting
GHAS code-scanning alerts on this PR:
- dispatch.ts (js/resource-exhaustion): ajv ran with allErrors:true on
untrusted input, letting a crafted payload force unbounded error
enumeration. Switch to allErrors:false (default) so validation
short-circuits on the first failure; the 400 still names that path.
- http.ts (js/missing-rate-limiting): the authenticated routes (/mcp,
/tools/:name) had no edge throttle — auth/JWT verification ran on every
request before the per-sub dispatch limiter could apply. Add an IP-keyed
express-rate-limit in front of authenticate (120/60s default, configurable),
returning the standard 429 shape. Defense-in-depth over the per-sub +
per-tool limiter in executeTool; API GW/WAF remains the production edge.
Tests: +2 cases proving the edge limiter throttles before auth (429, not
401) on /tools and /mcp. 407 pass; tsc/eslint/prettier clean.
* Fix polynomial ReDoS in Bearer-token extraction (CodeQL js/polynomial-redos)
extractBearerToken matched /^Bearer\s+(.+)$/ — \s and . both match a space,
so the two quantifiers overlap and a crafted header can drive polynomial
backtracking. Require the capture to start with a non-whitespace char
(/^Bearer\s+(\S.*)$/), removing the ambiguity → linear match. Behavior is
unchanged for real tokens; +2 regression tests.
* Harden auth + finance redaction (sh-security-review confirmed mediums)
Two confirmed medium findings from the agentic security review:
- Fail-open SH_MCP_ENV: config defaulted to 'local' when the var was unset,
so a deploy that forgot SH_MCP_ENV=aws would silently run LocalAuthProvider
and accept static dev bearer tokens (dev-finance-admin -> finance:admin).
Now fail-closed: SH_MCP_ENV must be explicitly 'local' or 'aws' or the
server refuses to start. Plus an independent guard in LocalAuthProvider
that refuses to construct in an AWS runtime (AWS_LAMBDA_FUNCTION_NAME /
AWS_EXECUTION_ENV present), regardless of the env flag.
- Finance egress redaction gap: redactDeep only wholesale-masked a sensitive
key when its value was a scalar; an object/array under a sensitive key was
recursed into, letting a bare nested value (e.g. {account:{number:...}})
escape the keyword-gated pattern matcher. Now the entire subtree under a
sensitive key is masked. No current finance tool emitted such shapes (all
flat strings), so this closes a latent hole in the universal safety net.
+4 tests (subtree redaction, AWS-runtime guard). 411 pass; coverage gate green.
Review also produced lows (memo free-text digits, unsalted argsHash,
unauth /openapi.json by-design, session-cap no-reset by-design) tracked
separately; 0 confirmed critical/high — review verdict PASS.
314 lines
11 KiB
TypeScript
314 lines
11 KiB
TypeScript
/**
|
|
* Unit tests for @sh-mcp/gmail.
|
|
*
|
|
* The GmailClient is fully mocked — no real network calls, no Google SDK
|
|
* imported at test time. A mock AuthContext is passed to each handler.
|
|
*
|
|
* Coverage:
|
|
* - Happy path: search returns results / thread returns messages
|
|
* - Empty result: client returns []
|
|
* - Scope error: handler called with wrong scope throws ScopeError
|
|
* - Client error: underlying client rejects with a transient error
|
|
* - Throttle / retry: client rejects with a 429-style error
|
|
* - Redaction: sensitive values in snippets/bodies are masked
|
|
* - maxResults cap: enforced at 50 regardless of caller input
|
|
*/
|
|
|
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
import type { GmailClient, EmailMessage, EmailThread } from '../src/client.js';
|
|
import { makeSearchInboxTool, makeGetEmailThreadDetailTool } from '../src/tools.js';
|
|
import type { AuthContext } from '@sh-mcp/shared';
|
|
import { ScopeError } from '@sh-mcp/shared';
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Mock helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function mockAuthContext(overrides?: Partial<AuthContext>): AuthContext {
|
|
return {
|
|
sub: 'lauren@seahavenind.com',
|
|
scopes: ['gmail:self', 'ops:read'],
|
|
aud: 'sh-mcp-ops',
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function mockEmailMessage(overrides?: Partial<EmailMessage>): EmailMessage {
|
|
return {
|
|
id: 'msg_001',
|
|
threadId: 'thread_001',
|
|
subject: 'Invoice from ACME Corp',
|
|
from: 'billing@acme.com',
|
|
to: 'lauren@seahavenind.com',
|
|
date: '2026-06-01T10:00:00Z',
|
|
snippet: 'Please find the invoice attached.',
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function mockEmailThread(overrides?: Partial<EmailThread>): EmailThread {
|
|
return {
|
|
threadId: 'thread_001',
|
|
subject: 'Invoice from ACME Corp',
|
|
messages: [
|
|
{
|
|
id: 'msg_001',
|
|
from: 'billing@acme.com',
|
|
to: 'lauren@seahavenind.com',
|
|
date: '2026-06-01T10:00:00Z',
|
|
body: 'Please find the invoice attached. Total due: $1,500.',
|
|
},
|
|
{
|
|
id: 'msg_002',
|
|
from: 'lauren@seahavenind.com',
|
|
to: 'billing@acme.com',
|
|
date: '2026-06-02T09:00:00Z',
|
|
body: 'Thank you, received.',
|
|
},
|
|
],
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeMockClient(): GmailClient {
|
|
return {
|
|
searchInbox: vi.fn(),
|
|
getThreadDetail: vi.fn(),
|
|
};
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// search_inbox
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_inbox', () => {
|
|
let client: GmailClient;
|
|
|
|
beforeEach(() => {
|
|
client = makeMockClient();
|
|
});
|
|
|
|
it('happy path — returns matched messages', async () => {
|
|
const messages = [
|
|
mockEmailMessage(),
|
|
mockEmailMessage({ id: 'msg_002', threadId: 'thread_002' }),
|
|
];
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce(messages);
|
|
|
|
const tool = makeSearchInboxTool(client);
|
|
const result = await tool.handler(
|
|
{ query: 'from:billing@acme.com subject:invoice' },
|
|
mockAuthContext(),
|
|
);
|
|
|
|
expect(result.totalReturned).toBe(2);
|
|
expect(result.messages).toHaveLength(2);
|
|
expect(result.messages[0].id).toBe('msg_001');
|
|
expect(result.messages[0].subject).toBe('Invoice from ACME Corp');
|
|
expect(vi.mocked(client.searchInbox)).toHaveBeenCalledWith({
|
|
query: 'from:billing@acme.com subject:invoice',
|
|
maxResults: 10,
|
|
userSub: 'lauren@seahavenind.com',
|
|
});
|
|
});
|
|
|
|
it('respects custom maxResults', async () => {
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce([]);
|
|
const tool = makeSearchInboxTool(client);
|
|
await tool.handler({ query: 'is:unread', maxResults: 25 }, mockAuthContext());
|
|
|
|
expect(vi.mocked(client.searchInbox)).toHaveBeenCalledWith(
|
|
expect.objectContaining({ maxResults: 25 }),
|
|
);
|
|
});
|
|
|
|
it('caps maxResults at 50 even when caller requests more', async () => {
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce([]);
|
|
const tool = makeSearchInboxTool(client);
|
|
await tool.handler({ query: 'is:unread', maxResults: 999 }, mockAuthContext());
|
|
|
|
expect(vi.mocked(client.searchInbox)).toHaveBeenCalledWith(
|
|
expect.objectContaining({ maxResults: 50 }),
|
|
);
|
|
});
|
|
|
|
it('empty result — returns empty array', async () => {
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce([]);
|
|
const tool = makeSearchInboxTool(client);
|
|
const result = await tool.handler({ query: 'subject:nonexistent' }, mockAuthContext());
|
|
|
|
expect(result.messages).toEqual([]);
|
|
expect(result.totalReturned).toBe(0);
|
|
});
|
|
|
|
it('throws ScopeError when gmail:self scope is missing', async () => {
|
|
const tool = makeSearchInboxTool(client);
|
|
const ctx = mockAuthContext({ scopes: ['ops:read'] });
|
|
|
|
await expect(tool.handler({ query: 'test' }, ctx)).rejects.toThrow(ScopeError);
|
|
expect(vi.mocked(client.searchInbox)).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('propagates client error', async () => {
|
|
vi.mocked(client.searchInbox).mockRejectedValueOnce(new Error('Gmail API unavailable'));
|
|
const tool = makeSearchInboxTool(client);
|
|
|
|
await expect(tool.handler({ query: 'test' }, mockAuthContext())).rejects.toThrow(
|
|
'Gmail API unavailable',
|
|
);
|
|
});
|
|
|
|
it('propagates throttle / 429-style error', async () => {
|
|
const throttleError = Object.assign(new Error('Rate limit exceeded'), { code: 429 });
|
|
vi.mocked(client.searchInbox).mockRejectedValueOnce(throttleError);
|
|
const tool = makeSearchInboxTool(client);
|
|
|
|
const err = await tool.handler({ query: 'test' }, mockAuthContext()).catch((e: unknown) => e);
|
|
expect(err).toBeInstanceOf(Error);
|
|
expect((err as NodeJS.ErrnoException & { code?: number }).code).toBe(429);
|
|
});
|
|
|
|
it('redacts sensitive values in snippets and subjects', async () => {
|
|
const sensitiveMessage = mockEmailMessage({
|
|
subject: 'Wire details: routing 021000021 account 1234567890',
|
|
snippet: 'SSN 123-45-6789 card 4111111111111111',
|
|
});
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce([sensitiveMessage]);
|
|
|
|
const tool = makeSearchInboxTool(client);
|
|
const result = await tool.handler({ query: 'test' }, mockAuthContext());
|
|
|
|
// Sensitive patterns must not appear in the output.
|
|
expect(result.messages[0].subject).not.toContain('021000021');
|
|
expect(result.messages[0].snippet).not.toContain('123-45-6789');
|
|
expect(result.messages[0].snippet).not.toContain('4111111111111111');
|
|
});
|
|
|
|
it('passes the calling user sub to the client (never reads another mailbox)', async () => {
|
|
vi.mocked(client.searchInbox).mockResolvedValueOnce([]);
|
|
const tool = makeSearchInboxTool(client);
|
|
const ctx = mockAuthContext({ sub: 'adam@seahavenind.com' });
|
|
await tool.handler({ query: 'test' }, ctx);
|
|
|
|
expect(vi.mocked(client.searchInbox)).toHaveBeenCalledWith(
|
|
expect.objectContaining({ userSub: 'adam@seahavenind.com' }),
|
|
);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// get_email_thread_detail
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('get_email_thread_detail', () => {
|
|
let client: GmailClient;
|
|
|
|
beforeEach(() => {
|
|
client = makeMockClient();
|
|
});
|
|
|
|
it('happy path — returns full thread', async () => {
|
|
const thread = mockEmailThread();
|
|
vi.mocked(client.getThreadDetail).mockResolvedValueOnce(thread);
|
|
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
const result = await tool.handler({ threadId: 'thread_001' }, mockAuthContext());
|
|
|
|
expect(result.threadId).toBe('thread_001');
|
|
expect(result.subject).toBe('Invoice from ACME Corp');
|
|
expect(result.messageCount).toBe(2);
|
|
expect(result.messages).toHaveLength(2);
|
|
expect(result.messages[0].body).toContain('Total due');
|
|
expect(vi.mocked(client.getThreadDetail)).toHaveBeenCalledWith({
|
|
threadId: 'thread_001',
|
|
userSub: 'lauren@seahavenind.com',
|
|
});
|
|
});
|
|
|
|
it('empty thread — returns zero messages', async () => {
|
|
vi.mocked(client.getThreadDetail).mockResolvedValueOnce(mockEmailThread({ messages: [] }));
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
const result = await tool.handler({ threadId: 'thread_empty' }, mockAuthContext());
|
|
|
|
expect(result.messages).toEqual([]);
|
|
expect(result.messageCount).toBe(0);
|
|
});
|
|
|
|
it('throws ScopeError when gmail:self scope is missing', async () => {
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
const ctx = mockAuthContext({ scopes: ['ops:read', 'ops:tasks'] });
|
|
|
|
await expect(tool.handler({ threadId: 'thread_001' }, ctx)).rejects.toThrow(ScopeError);
|
|
expect(vi.mocked(client.getThreadDetail)).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('propagates client error', async () => {
|
|
vi.mocked(client.getThreadDetail).mockRejectedValueOnce(new Error('Thread not found'));
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
|
|
await expect(tool.handler({ threadId: 'thread_001' }, mockAuthContext())).rejects.toThrow(
|
|
'Thread not found',
|
|
);
|
|
});
|
|
|
|
it('propagates throttle / 429-style error', async () => {
|
|
const throttleError = Object.assign(new Error('Quota exceeded'), { code: 429, retryAfter: 5 });
|
|
vi.mocked(client.getThreadDetail).mockRejectedValueOnce(throttleError);
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
|
|
const err = await tool
|
|
.handler({ threadId: 'thread_001' }, mockAuthContext())
|
|
.catch((e: unknown) => e);
|
|
expect(err).toBeInstanceOf(Error);
|
|
expect((err as NodeJS.ErrnoException & { code?: number }).code).toBe(429);
|
|
});
|
|
|
|
it('redacts sensitive values in message bodies and subject', async () => {
|
|
const sensitiveThread = mockEmailThread({
|
|
subject: 'ACH routing 021000021',
|
|
messages: [
|
|
{
|
|
id: 'msg_s1',
|
|
from: 'billing@acme.com',
|
|
to: 'lauren@seahavenind.com',
|
|
date: '2026-06-01T10:00:00Z',
|
|
body: 'Account number 9876543210 routing 021000021 SSN 987-65-4321',
|
|
},
|
|
],
|
|
});
|
|
vi.mocked(client.getThreadDetail).mockResolvedValueOnce(sensitiveThread);
|
|
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
const result = await tool.handler({ threadId: 'thread_sensitive' }, mockAuthContext());
|
|
|
|
expect(result.subject).not.toContain('021000021');
|
|
expect(result.messages[0].body).not.toContain('9876543210');
|
|
expect(result.messages[0].body).not.toContain('021000021');
|
|
expect(result.messages[0].body).not.toContain('987-65-4321');
|
|
});
|
|
|
|
it('passes the calling user sub to the client (never reads another mailbox)', async () => {
|
|
vi.mocked(client.getThreadDetail).mockResolvedValueOnce(mockEmailThread());
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
const ctx = mockAuthContext({ sub: 'adam@seahavenind.com' });
|
|
await tool.handler({ threadId: 'thread_001' }, ctx);
|
|
|
|
expect(vi.mocked(client.getThreadDetail)).toHaveBeenCalledWith(
|
|
expect.objectContaining({ userSub: 'adam@seahavenind.com' }),
|
|
);
|
|
});
|
|
|
|
it('tool metadata is correct', () => {
|
|
const tool = makeGetEmailThreadDetailTool(client);
|
|
expect(tool.name).toBe('get_email_thread_detail');
|
|
expect(tool.tier).toBe('ops');
|
|
expect(tool.requiredScope).toBe('gmail:self');
|
|
});
|
|
|
|
it('search_inbox tool metadata is correct', () => {
|
|
const tool = makeSearchInboxTool(client);
|
|
expect(tool.name).toBe('search_inbox');
|
|
expect(tool.tier).toBe('ops');
|
|
expect(tool.requiredScope).toBe('gmail:self');
|
|
});
|
|
});
|