mirror of
https://github.com/Sea-Haven-Industries/sh-mcp.git
synced 2026-09-30 11:13:17 +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.
253 lines
9 KiB
TypeScript
253 lines
9 KiB
TypeScript
/**
|
|
* Unit tests for @sh-mcp/google-maps
|
|
*
|
|
* All tests use a mock GoogleMapsClient — no real network calls are made.
|
|
* The mock AuthContext satisfies the @sh-mcp/shared contract.
|
|
*/
|
|
|
|
import { describe, it, expect, vi } from 'vitest';
|
|
import type { AuthContext } from '@sh-mcp/shared';
|
|
import type { GoogleMapsClient, PlaceResult } from '../src/client.js';
|
|
import { makeSearchNearbyVendors } from '../src/tools.js';
|
|
import type { SearchNearbyVendorsInput } from '../src/tools.js';
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function mockAuthCtx(overrides?: Partial<AuthContext>): AuthContext {
|
|
return {
|
|
sub: 'test-user@seahavenind.com',
|
|
scopes: ['ops:read'],
|
|
aud: 'sh-mcp-ops',
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
const SAMPLE_PLACE: PlaceResult = {
|
|
displayName: 'Acme Electric LLC',
|
|
formattedAddress: '123 Main St, Ronkonkoma, NY 11779',
|
|
nationalPhoneNumber: '(631) 555-0100',
|
|
types: ['electrician', 'home_goods_store'],
|
|
rating: 4.7,
|
|
googleMapsUri: 'https://maps.google.com/?cid=12345',
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Mock client factory
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function makeMockClient(impl: () => Promise<PlaceResult[]>): GoogleMapsClient {
|
|
return { searchText: vi.fn().mockImplementation(impl) };
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tests
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('search_nearby_vendors', () => {
|
|
describe('happy path — results returned', () => {
|
|
it('returns shaped VendorListing objects with an unvetted disclaimer', async () => {
|
|
const client = makeMockClient(async () => [SAMPLE_PLACE]);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
const input: SearchNearbyVendorsInput = { query: 'electrician near Ronkonkoma NY' };
|
|
const result = await tool.handler(input, mockAuthCtx());
|
|
|
|
expect(result.total).toBe(1);
|
|
const vendor = result.results[0];
|
|
expect(vendor.name).toBe('Acme Electric LLC');
|
|
expect(vendor.address).toBe('123 Main St, Ronkonkoma, NY 11779');
|
|
expect(vendor.phone).toBe('(631) 555-0100');
|
|
expect(vendor.categories).toContain('electrician');
|
|
expect(vendor.rating).toBe(4.7);
|
|
expect(vendor.maps_url).toBe('https://maps.google.com/?cid=12345');
|
|
expect(vendor.disclaimer).toMatch(/UNVETTED/);
|
|
});
|
|
|
|
it('passes through location bias params to the client', async () => {
|
|
const client = makeMockClient(async () => [SAMPLE_PLACE]);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
const input: SearchNearbyVendorsInput = {
|
|
query: 'plumber',
|
|
lat: 40.8296,
|
|
lng: -73.104,
|
|
radius_meters: 8000,
|
|
max_results: 5,
|
|
};
|
|
await tool.handler(input, mockAuthCtx());
|
|
|
|
expect(client.searchText).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
textQuery: 'plumber',
|
|
locationBiasLat: 40.8296,
|
|
locationBiasLng: -73.104,
|
|
locationBiasRadiusMeters: 8000,
|
|
maxResultCount: 5,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('defaults max_results to 10 when not supplied', async () => {
|
|
const client = makeMockClient(async () => []);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
await tool.handler({ query: 'locksmith' }, mockAuthCtx());
|
|
|
|
expect(client.searchText).toHaveBeenCalledWith(
|
|
expect.objectContaining({ maxResultCount: 10 }),
|
|
);
|
|
});
|
|
|
|
it('handles optional fields absent (no phone, rating, maps_url)', async () => {
|
|
const sparse: PlaceResult = {
|
|
displayName: 'Sparse Vendor',
|
|
formattedAddress: '456 Oak Ave',
|
|
types: ['general_contractor'],
|
|
};
|
|
const client = makeMockClient(async () => [sparse]);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
const result = await tool.handler({ query: 'general contractor' }, mockAuthCtx());
|
|
|
|
const vendor = result.results[0];
|
|
expect(vendor.phone).toBeUndefined();
|
|
expect(vendor.rating).toBeUndefined();
|
|
expect(vendor.maps_url).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe('empty results', () => {
|
|
it('returns an empty array and total 0 when the API finds nothing', async () => {
|
|
const client = makeMockClient(async () => []);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
const result = await tool.handler({ query: 'zxzxzx nonsense query' }, mockAuthCtx());
|
|
|
|
expect(result.total).toBe(0);
|
|
expect(result.results).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
describe('error handling', () => {
|
|
it('propagates a generic API error to the caller', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new Error('Google Places API error 500: Internal Server Error');
|
|
});
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
await expect(tool.handler({ query: 'electrician' }, mockAuthCtx())).rejects.toThrow(
|
|
'Google Places API error 500',
|
|
);
|
|
});
|
|
|
|
it('propagates a 400 Bad Request error to the caller', async () => {
|
|
const client = makeMockClient(async () => {
|
|
throw new Error('Google Places API error 400: INVALID_ARGUMENT');
|
|
});
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
await expect(tool.handler({ query: 'bad request' }, mockAuthCtx())).rejects.toThrow('400');
|
|
});
|
|
});
|
|
|
|
describe('throttle / retry', () => {
|
|
it('surfaces a RATE_LIMITED error when the client throws one', async () => {
|
|
const rateLimitErr = Object.assign(new Error('Google Places API rate limit exceeded'), {
|
|
code: 'RATE_LIMITED',
|
|
});
|
|
const client = makeMockClient(async () => {
|
|
throw rateLimitErr;
|
|
});
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
await expect(tool.handler({ query: 'electrician' }, mockAuthCtx())).rejects.toMatchObject({
|
|
code: 'RATE_LIMITED',
|
|
});
|
|
});
|
|
|
|
it('succeeds on a second attempt when the first throws RATE_LIMITED', async () => {
|
|
let calls = 0;
|
|
const client: GoogleMapsClient = {
|
|
searchText: vi.fn().mockImplementation(async () => {
|
|
calls += 1;
|
|
if (calls === 1) {
|
|
const err = Object.assign(new Error('Google Places API rate limit exceeded'), {
|
|
code: 'RATE_LIMITED',
|
|
});
|
|
throw err;
|
|
}
|
|
return [SAMPLE_PLACE];
|
|
}),
|
|
};
|
|
|
|
// The tool itself does not retry — retry belongs in the server/transport
|
|
// layer. This test documents that the error is throw-able and re-tryable
|
|
// by calling the handler twice directly.
|
|
const tool = makeSearchNearbyVendors(client);
|
|
const ctx = mockAuthCtx();
|
|
|
|
// First call fails
|
|
await expect(tool.handler({ query: 'electrician' }, ctx)).rejects.toThrow();
|
|
|
|
// Second call succeeds
|
|
const result = await tool.handler({ query: 'electrician' }, ctx);
|
|
expect(result.total).toBe(1);
|
|
expect(result.results[0].name).toBe('Acme Electric LLC');
|
|
});
|
|
});
|
|
|
|
describe('scope enforcement', () => {
|
|
it('throws ScopeError when the context lacks ops:read', async () => {
|
|
const client = makeMockClient(async () => [SAMPLE_PLACE]);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
// Context with an empty scope list — no ops:read
|
|
const ctx = mockAuthCtx({ scopes: [] });
|
|
|
|
await expect(tool.handler({ query: 'electrician' }, ctx)).rejects.toThrow();
|
|
|
|
// The client must never have been called if scope fails
|
|
expect(client.searchText).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('throws ScopeError when only a finance scope is present', async () => {
|
|
const client = makeMockClient(async () => [SAMPLE_PLACE]);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
const ctx = mockAuthCtx({ scopes: ['finance:read'] });
|
|
|
|
await expect(tool.handler({ query: 'electrician' }, ctx)).rejects.toThrow();
|
|
|
|
expect(client.searchText).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('tool metadata', () => {
|
|
it('has the correct name, tier, and requiredScope', () => {
|
|
const client = makeMockClient(async () => []);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
|
|
expect(tool.name).toBe('search_nearby_vendors');
|
|
expect(tool.tier).toBe('ops');
|
|
expect(tool.requiredScope).toBe('ops:read');
|
|
});
|
|
|
|
it('has a valid JSON Schema with query as a required property', () => {
|
|
const client = makeMockClient(async () => []);
|
|
const tool = makeSearchNearbyVendors(client);
|
|
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('lat');
|
|
expect(schema.properties).toHaveProperty('lng');
|
|
expect(schema.properties).toHaveProperty('radius_meters');
|
|
expect(schema.properties).toHaveProperty('max_results');
|
|
});
|
|
});
|
|
});
|