mirror of
https://github.com/Sea-Haven-Industries/sh-mcp.git
synced 2026-09-30 03:03:15 +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.
304 lines
10 KiB
TypeScript
304 lines
10 KiB
TypeScript
/**
|
|
* Unit tests for @sh-mcp/qbo.
|
|
*
|
|
* All tests inject a mock QboClientInterface — no real network calls, no AWS.
|
|
* A mock AuthContext is passed directly; real JWT validation is the DEFERRED
|
|
* auth layer and is not exercised here.
|
|
*/
|
|
|
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
import type { AuthContext } from '@sh-mcp/shared';
|
|
import { makeSearchVendorsTool } from '../src/tools.js';
|
|
import type {
|
|
QboClientInterface,
|
|
SearchVendorsParams,
|
|
SearchVendorsResult,
|
|
} from '../src/client.js';
|
|
import { QboApiError, QboThrottleError } from '../src/client.js';
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/** A mock AuthContext that carries finance:read scope. */
|
|
function makeFinanceCtx(overrides?: Partial<AuthContext>): AuthContext {
|
|
return {
|
|
sub: 'adam@seahavenind.com',
|
|
scopes: ['ops:read', 'finance:read'],
|
|
aud: 'sh-mcp-finance',
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
/** A mock QboClientInterface backed by a vitest spy. */
|
|
function makeMockClient(
|
|
impl: (params: SearchVendorsParams) => Promise<SearchVendorsResult>,
|
|
): QboClientInterface {
|
|
return {
|
|
searchVendors: vi.fn(impl),
|
|
};
|
|
}
|
|
|
|
/** Minimal vendor fixture. */
|
|
const VENDOR_ACME = {
|
|
id: 'qbo-vendor-001',
|
|
displayName: 'Acme Supplies',
|
|
email: 'billing@acme.example',
|
|
phone: '555-0100',
|
|
active: true,
|
|
balance: 1250.0,
|
|
taxId: '12-3456789',
|
|
};
|
|
|
|
/** Vendor fixture with no optional fields. */
|
|
const VENDOR_MINIMAL = {
|
|
id: 'qbo-vendor-002',
|
|
displayName: 'Beta Services',
|
|
active: false,
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Happy-path tests
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_vendors — happy path', () => {
|
|
let client: QboClientInterface;
|
|
|
|
beforeEach(() => {
|
|
client = makeMockClient(async () => ({
|
|
vendors: [VENDOR_ACME, VENDOR_MINIMAL],
|
|
totalCount: 2,
|
|
}));
|
|
});
|
|
|
|
it('returns vendor records with the correct shape', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
const result = await tool.handler({ query: 'acme' }, makeFinanceCtx());
|
|
|
|
expect(result.totalCount).toBe(2);
|
|
expect(result.vendors).toHaveLength(2);
|
|
|
|
const acme = result.vendors[0];
|
|
expect(acme.id).toBe('qbo-vendor-001');
|
|
expect(acme.displayName).toBe('Acme Supplies');
|
|
expect(acme.email).toBe('billing@acme.example');
|
|
expect(acme.phone).toBe('555-0100');
|
|
expect(acme.active).toBe(true);
|
|
expect(acme.balance).toBe(1250.0);
|
|
});
|
|
|
|
it('redacts taxId in the response', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
const result = await tool.handler({ query: 'acme' }, makeFinanceCtx());
|
|
|
|
const acme = result.vendors[0];
|
|
// taxId must be present but must NOT equal the raw value
|
|
expect(acme.taxId).toBeDefined();
|
|
expect(acme.taxId).not.toBe('12-3456789');
|
|
// redact() replaces sensitive data with masked characters
|
|
expect(acme.taxId).toMatch(/[*x●]/i);
|
|
});
|
|
|
|
it('preserves vendor displayName and contact fields intact (not redacted)', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
const result = await tool.handler({ query: 'acme' }, makeFinanceCtx());
|
|
|
|
const acme = result.vendors[0];
|
|
// redact() contract: leaves vendor names and contact info intact
|
|
expect(acme.displayName).toBe('Acme Supplies');
|
|
expect(acme.email).toBe('billing@acme.example');
|
|
expect(acme.phone).toBe('555-0100');
|
|
});
|
|
|
|
it('omits optional fields when the vendor has none', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
const result = await tool.handler({ query: 'beta' }, makeFinanceCtx());
|
|
|
|
const beta = result.vendors[1];
|
|
expect(beta.id).toBe('qbo-vendor-002');
|
|
expect(beta.displayName).toBe('Beta Services');
|
|
expect(beta.active).toBe(false);
|
|
expect(beta.email).toBeUndefined();
|
|
expect(beta.phone).toBeUndefined();
|
|
expect(beta.balance).toBeUndefined();
|
|
expect(beta.taxId).toBeUndefined();
|
|
});
|
|
|
|
it('forwards maxResults to the client', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
await tool.handler({ query: 'acme', maxResults: 5 }, makeFinanceCtx());
|
|
|
|
expect(client.searchVendors).toHaveBeenCalledWith(expect.objectContaining({ maxResults: 5 }));
|
|
});
|
|
|
|
it('defaults maxResults to 20 when not specified', async () => {
|
|
const tool = makeSearchVendorsTool(client);
|
|
await tool.handler({ query: 'acme' }, makeFinanceCtx());
|
|
|
|
expect(client.searchVendors).toHaveBeenCalledWith(expect.objectContaining({ maxResults: 20 }));
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Empty result
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_vendors — empty result', () => {
|
|
it('returns an empty vendors array and totalCount 0 when QBO finds nothing', async () => {
|
|
const client = makeMockClient(async () => ({ vendors: [], totalCount: 0 }));
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
const result = await tool.handler({ query: 'nonexistent vendor xyz' }, makeFinanceCtx());
|
|
|
|
expect(result.vendors).toHaveLength(0);
|
|
expect(result.totalCount).toBe(0);
|
|
});
|
|
|
|
it('returns totalCount accurately when results are paginated (totalCount > vendors.length)', async () => {
|
|
const client = makeMockClient(async () => ({
|
|
vendors: [VENDOR_MINIMAL],
|
|
totalCount: 47,
|
|
}));
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
const result = await tool.handler({ query: 'services', maxResults: 1 }, makeFinanceCtx());
|
|
|
|
expect(result.vendors).toHaveLength(1);
|
|
expect(result.totalCount).toBe(47);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Error paths
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_vendors — error handling', () => {
|
|
it('rethrows unexpected errors from the client unchanged', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new Error('Unexpected internal failure');
|
|
});
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
await expect(tool.handler({ query: 'acme' }, makeFinanceCtx())).rejects.toThrow(
|
|
'Unexpected internal failure',
|
|
);
|
|
});
|
|
|
|
it('wraps QboApiError with status code in the thrown message', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new QboApiError('Forbidden', 403);
|
|
});
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
await expect(tool.handler({ query: 'acme' }, makeFinanceCtx())).rejects.toThrow(
|
|
'QBO API error (HTTP 403): Forbidden',
|
|
);
|
|
});
|
|
|
|
it('throws a scope error when the context lacks finance:read', async () => {
|
|
const client = makeMockClient(async () => ({ vendors: [], totalCount: 0 }));
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
// ops-only context — missing finance:read
|
|
const opsCtx = makeFinanceCtx({ scopes: ['ops:read'] });
|
|
|
|
await expect(tool.handler({ query: 'acme' }, opsCtx)).rejects.toThrow();
|
|
// client should never be called when scope check fails
|
|
expect(client.searchVendors).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('throws a scope error when the context has no scopes at all', async () => {
|
|
const client = makeMockClient(async () => ({ vendors: [], totalCount: 0 }));
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
const emptyCtx = makeFinanceCtx({ scopes: [] });
|
|
|
|
await expect(tool.handler({ query: 'acme' }, emptyCtx)).rejects.toThrow();
|
|
expect(client.searchVendors).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Throttle / retry
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_vendors — throttle / retry', () => {
|
|
it('surfaces a rate-limit error with retry hint when QBO returns 429 with retryAfter', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new QboThrottleError(30);
|
|
});
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
await expect(tool.handler({ query: 'acme' }, makeFinanceCtx())).rejects.toThrow(
|
|
/rate limit.*retry after 30s/i,
|
|
);
|
|
});
|
|
|
|
it('surfaces a rate-limit error without retry hint when QBO omits retryAfter', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new QboThrottleError();
|
|
});
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
const err = await tool
|
|
.handler({ query: 'acme' }, makeFinanceCtx())
|
|
.catch((e: unknown) => e as Error);
|
|
|
|
expect(err.message).toMatch(/rate limit/i);
|
|
// No "Retry after Xs" appended
|
|
expect(err.message).not.toMatch(/retry after/i);
|
|
});
|
|
|
|
it('does not swallow the error — the caller is responsible for retry logic', async () => {
|
|
// The tool itself does not retry; it propagates so the server layer
|
|
// (or the MCP client) can back off and retry.
|
|
const client = makeMockClient(async () => {
|
|
throw new QboThrottleError(60);
|
|
});
|
|
const tool = makeSearchVendorsTool(client);
|
|
|
|
await expect(tool.handler({ query: 'acme' }, makeFinanceCtx())).rejects.toThrow();
|
|
// Called exactly once — no internal retry loop.
|
|
expect(client.searchVendors).toHaveBeenCalledTimes(1);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tool metadata
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_vendors — tool definition', () => {
|
|
it('has the correct name', () => {
|
|
const tool = makeSearchVendorsTool(
|
|
makeMockClient(async () => ({ vendors: [], totalCount: 0 })),
|
|
);
|
|
expect(tool.name).toBe('search_vendors');
|
|
});
|
|
|
|
it('declares finance tier', () => {
|
|
const tool = makeSearchVendorsTool(
|
|
makeMockClient(async () => ({ vendors: [], totalCount: 0 })),
|
|
);
|
|
expect(tool.tier).toBe('finance');
|
|
});
|
|
|
|
it('requires finance:read scope', () => {
|
|
const tool = makeSearchVendorsTool(
|
|
makeMockClient(async () => ({ vendors: [], totalCount: 0 })),
|
|
);
|
|
expect(tool.requiredScope).toBe('finance:read');
|
|
});
|
|
|
|
it('has an inputSchema that marks query as required', () => {
|
|
const tool = makeSearchVendorsTool(
|
|
makeMockClient(async () => ({ vendors: [], totalCount: 0 })),
|
|
);
|
|
const schema = tool.inputSchema as {
|
|
required: string[];
|
|
properties: Record<string, unknown>;
|
|
};
|
|
expect(schema.required).toContain('query');
|
|
expect(schema.properties).toHaveProperty('query');
|
|
expect(schema.properties).toHaveProperty('maxResults');
|
|
});
|
|
});
|