sh-mcp/auth/group-sync/src/sync.ts

62 lines
2.5 KiB
TypeScript
Raw Normal View History

Phase 2a: Cognito auth substrate (CDK) + pre-token & group-sync Lambdas (#4) * Phase 2a: Cognito auth substrate (CDK) + pre-token & group-sync Lambdas Stands up the real AWS auth broker the servers already validate against (SH_MCP_ENV=aws), surface-agnostic. Nothing deployed yet (gated on Google secrets); CI synthesizes the stack. infra/ — root CDK app, stack sh-mcp-auth: - Cognito user pool, ESSENTIALS feature plan (required for the V2 pre-token trigger), Google external OIDC IdP (client_id/secret resolved from Secrets Manager at deploy via CFN dynamic reference, never inlined). - Resource servers + per-tier app clients whose AllowedOAuthScopes ARE the trust-tier boundary: ops=(read,tasks), exec=(ops+gmail/calendar, NO finance), finance=(finance:read ONLY, 15-min access TTL). offline refresh 30d. - Cognito groups sh-mcp-ops/-assistant/-finance/-admin. - sync-state + deny-list DynamoDB tables (overrideLogicalId pinned so a future refactor cannot replace+drop them; deny-list TTL attr 'expiresAt'). - Least-priv IAM (no wildcard action/resource; Google SA secret grant scoped to the one secret), arm64 Lambdas, explicit 60-day log groups, alarms on the seahaven-alarm-topics CMK (ALARM-state actions only, two-alarm group-sync). auth/pre-token-gen — SUPPRESS-ONLY V2 Lambda. Maps Cognito group entitlement to scopesToSuppress; NEVER scopesToAdd a tier scope (AllowedOAuthScopes stays the ceiling). Reads last_successful_sync; fail-closed to base ops:read when stale. auth/group-sync — mirrors Google Group membership into Cognito groups every 5 min (jose-signed SA JWT -> Directory API, no googleapis dep); writes the freshness marker ONLY on full success so a partial failure keeps the pre-token Lambda failing closed. 37 new tests (suppress-only policy, fail-closed, reconcile diff, 16 CDK assertions incl. Essentials/V2/per-client-scope/no-wildcard-IAM). 448 total pass; tsc -b + infra typecheck + cdk synth + prettier clean; CI run-cdk-synth re-enabled. App-client callback URLs are a context placeholder pending the surface decision. Confluence map (1540098) + project memory updates owed once this deploys. * Phase 2a: harden auth substrate per security-review + IAM cross-review Both mandatory gates run on the 2a diff. GPT-4.1 IAM/Lambda cross-review: the suppress-only invariant is now an executable fail-closed guard (a future edit that sets scopesToAdd throws → no token minted). /sh-security-review fan-out + proof-or-kill verifier: PASS (0 confirmed critical/high). The verifier refuted the two "high" candidates (the email-case revocation "bypass" is symmetric — the add path uses the same lowercasing filter, so an un-removable user could never have been added; the empty-directory purge is a non-200 throw → stale marker → fail closed). Three confirmed findings remediated: - C2 (deny-list was inert): the sh-mcp-deny-list table was provisioned and documented as "hard revocation" but no code read it. The pre-token Lambda now reads it on every mint (DENY_LIST_TABLE env + grantReadData) and strips a deny-listed sub to NO tier scopes, ahead of the next group sync. Fail-OPEN on a DDB read error (logs deny_list_read_failed) so a blip can't lock everyone out — group membership + its fail-closed 30-min window stay authoritative. - C5 (finance 30-day refresh nullified the 15-min access TTL): refresh window is now per-tier; finance caps at 8h, ops/exec keep 30d. - C7 (nested Google-group members silently dropped): listGroupMembers now sets includeDerivedMembership and skips non-USER rows, honoring the documented "nested resolved" contract instead of pushing a phantom group address. Also corrects the sync.ts comment that overstated fail-closed as instantaneous (it is bounded by MAX_SYNC_AGE_MS). +8 tests (deny-list unit, hard-revocation handler path, finance refresh window, deny-list env wiring); 456 pass. tsc -b, cdk synth, prettier, eslint all clean.
2026-06-26 14:33:46 -04:00
/**
* The pure reconcile orchestration, decoupled from AWS/Google SDKs via the
* {@link clients} interfaces so it is fully unit-testable.
*
* Invariant: the freshness marker is written ONLY after EVERY managed group
* reconciles without error. A partial failure leaves the marker at its prior
* value, so the pre-token Lambda fails closed once that value ages past
* MAX_SYNC_AGE_MS (the bounded revocation-latency window — not instantaneous;
* a partial failure is no worse than a fully missed run). Adds run before
* removes within a group, so the worst case inside that window is an
* over-grant that the window then collapses (design.md §2.3; agentforce-plan
* §0.1 CR-5).
*/
import type { DirectoryReader, CognitoGroupTarget, SyncStateWriter } from './clients.js';
import { managedGroups, computeMembershipDiff, type ManagedGroup } from './groups.js';
export interface SyncDeps {
directory: DirectoryReader;
cognito: CognitoGroupTarget;
syncState: SyncStateWriter;
domain: string;
/** Injectable clock for deterministic tests. */
now?: () => number;
}
export interface GroupSyncResult {
group: string;
added: number;
removed: number;
}
/** Reconcile a single managed group; returns the applied change counts. */
async function reconcileGroup(deps: SyncDeps, g: ManagedGroup): Promise<GroupSyncResult> {
await deps.cognito.ensureGroup(g.cognito);
const [desired, current] = await Promise.all([
deps.directory.listGroupMembers(g.googleEmail),
deps.cognito.listMembers(g.cognito),
]);
const { toAdd, toRemove } = computeMembershipDiff(current, desired);
// Adds before removes so a membership move never leaves a user with no group.
for (const email of toAdd) await deps.cognito.addMember(g.cognito, email);
for (const email of toRemove) await deps.cognito.removeMember(g.cognito, email);
return { group: g.cognito, added: toAdd.length, removed: toRemove.length };
}
/**
* Reconcile every managed group, then (only on full success) write the freshness
* marker. Throws if any group fails — the caller surfaces that as a Lambda error
* so the CloudWatch alarm fires and the marker stays stale.
*/
export async function runSync(deps: SyncDeps): Promise<GroupSyncResult[]> {
const now = deps.now ?? Date.now;
const results: GroupSyncResult[] = [];
for (const g of managedGroups(deps.domain)) {
results.push(await reconcileGroup(deps, g));
}
// Reached only if all groups reconciled without throwing.
await deps.syncState.writeLastSuccessfulSync(now());
return results;
}