@ampless/backend 1.0.0-alpha.20 → 1.0.0-alpha.22

package/dist/functions/mcp-handler.d.ts

@@ -1,10 +1,12 @@
 /**
- * MCP HTTP endpoint Lambda. Phase 5: Bearer validation + JSON-RPC 2.0
- * tool dispatch over AppSync IAM auth, including `upload_media`.
+ * MCP HTTP endpoint Lambda. Bearer validation + JSON-RPC 2.0 tool
+ * dispatch over AppSync IAM auth, including `upload_media`.
  *
- *   1. Reads KvStore directly (PK = 'mcp-tokens', SK = SHA-256 hex)
- *      to validate `Authorization: Bearer amk_...`. Same narrow IAM
- *      grant as Phase 3 (`dynamodb:GetItem` on the KvStore table).
+ *   1. Reads the admin-only `McpToken` DynamoDB table directly
+ *      (identifier = SHA-256 hex of plaintext) to validate
+ *      `Authorization: Bearer amk_...`. The Lambda has a narrow IAM
+ *      grant: `dynamodb:GetItem` on the McpToken table only — no
+ *      AppSync round-trip for token validation.
  *   2. Parses the incoming JSON-RPC envelope by hand (no MCP SDK
  *      stdio transport in a Lambda runtime — overkill for the three
  *      verbs we actually need).

package/dist/functions/mcp-handler.js

@@ -4,7 +4,6 @@ import "../chunk-BYXBJQAS.js";
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient, GetCommand } from "@aws-sdk/lib-dynamodb";
 import { createHash } from "crypto";
-import { decodeAwsJson as decodeAwsJson2 } from "ampless";
 
 // ../mcp-server/dist/chunk-K4GTND6P.js
 import {
@@ -1030,7 +1029,6 @@ function createMcpStorageClient(opts) {
 }
 
 // src/functions/mcp-handler.ts
-var TOKENS_PK = "mcp-tokens";
 var JSON_RPC_PARSE_ERROR = -32700;
 var JSON_RPC_INVALID_REQUEST = -32600;
 var JSON_RPC_METHOD_NOT_FOUND = -32601;
@@ -1042,7 +1040,7 @@ function requireEnv(name) {
   if (!v) throw new Error(`[mcp-handler] missing required env var ${name}`);
   return v;
 }
-var KV_TABLE = requireEnv("AMPLESS_KV_TABLE");
+var MCP_TOKEN_TABLE = requireEnv("AMPLESS_MCP_TOKEN_TABLE");
 var APPSYNC_URL = requireEnv("AMPLESS_APPSYNC_URL");
 var BUCKET_NAME = requireEnv("AMPLESS_BUCKET_NAME");
 var AWS_REGION = process.env["AWS_REGION"] ?? "us-east-1";
@@ -1070,25 +1068,15 @@ async function validateBearer(plaintext) {
   const hash = hashToken(plaintext);
   const res = await ddb.send(
     new GetCommand({
-      TableName: KV_TABLE,
-      Key: { pk: TOKENS_PK, sk: hash }
+      TableName: MCP_TOKEN_TABLE,
+      Key: { hash }
     })
   );
   const row = res.Item;
-  if (!row?.value) return null;
-  const meta = decodeTokenMeta(row.value);
-  if (!meta) {
-    console.error("[mcp-handler] could not decode token row", { hash, valueType: typeof row.value });
-    return null;
-  }
-  if (meta.revokedAt) return null;
-  if (meta.expiresAt && new Date(meta.expiresAt).getTime() <= Date.now()) return null;
-  return meta;
-}
-function decodeTokenMeta(value) {
-  const parsed = decodeAwsJson2(value);
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
-  return parsed;
+  if (!row) return null;
+  if (row.revokedAt) return null;
+  if (row.expiresAt && new Date(row.expiresAt).getTime() <= Date.now()) return null;
+  return row;
 }
 var cachedCtx = null;
 function makeContext() {

package/dist/index.d.ts

@@ -18,10 +18,8 @@ interface DefineAmplessBackendOpts {
 }
 type AmplessBackend = any;
 /**
- * The end-to-end ampless backend wiring: identical to the 251-line
- * `backend.ts` that used to live in `templates/_shared/amplify/`,
- * but parameterised on the resource objects so users only have to
- * compose the imports.
+ * The end-to-end ampless backend wiring, parameterised on the resource
+ * objects so users only have to compose the imports.
  *
  * What it does, in order:
  *   1. Calls `defineBackend` with every Ampless resource.
@@ -175,6 +173,7 @@ declare function amplessSchemaModels(a: any, opts?: AmplessSchemaModelsOpts): {
     Taxonomy: any;
     PostTag: any;
     KvStore: any;
+    McpToken: any;
     PublicPost: any;
     PublicPostConnection: any;
     listPublishedPosts: any;
@@ -201,8 +200,8 @@ interface AmplessSchemaAuthorizationOpts {
      * destructure `resource` out of their `allow` parameter), so this
      * grant applies broadly — every model the Lambda calls is reachable.
      * That's wider than strictly necessary; the MCP tools' GraphQL
-     * operations narrow the effective surface to Post / PostTag in
-     * Phase 4 and Media in Phase 5.
+     * operations narrow the effective surface to Post / PostTag for
+     * content tools and Media for `upload_media`.
      *
      * Typed as `unknown` for the same reason `userAdminFunction` /
      * `mcpHandlerFunction` are in other helpers — `defineFunction`'s

package/dist/index.js

@@ -88,6 +88,7 @@ function defineAmplessBackend(opts) {
   const cfnKvTable = backend.data.resources.cfnResources.amplifyDynamoDbTables["KvStore"];
   cfnKvTable.streamSpecification = { streamViewType: "NEW_AND_OLD_IMAGES" };
   cfnKvTable.timeToLiveSpecification = { attributeName: "ttl", enabled: true };
+  const mcpTokenTable = backend.data.resources.tables["McpToken"];
   const eventsStack = backend.createStack("amplessEvents");
   const eventsDlq = new Queue(eventsStack, "EventsDlq", {
     retentionPeriod: Duration.days(14)
@@ -174,10 +175,10 @@ function defineAmplessBackend(opts) {
     new PolicyStatement({
       effect: Effect.ALLOW,
       actions: ["dynamodb:GetItem"],
-      resources: [kvTable.tableArn]
+      resources: [mcpTokenTable.tableArn]
     })
   );
-  mcpHandlerFn.addEnvironment("AMPLESS_KV_TABLE", kvTable.tableName);
+  mcpHandlerFn.addEnvironment("AMPLESS_MCP_TOKEN_TABLE", mcpTokenTable.tableName);
   mcpHandlerFn.addEnvironment(
     "AMPLESS_APPSYNC_URL",
     backend.data.resources.cfnResources.cfnGraphqlApi.attrGraphQlUrl
@@ -362,6 +363,30 @@ function amplessSchemaModels(a, opts = {}) {
     }).identifier(["pk", "sk"]).authorization((allow) => [
       allow.groups(["ampless-admin", "ampless-editor"])
     ]),
+    // Admin-issued API tokens for the HTTP MCP endpoint. Identifier =
+    // SHA-256 hex of plaintext; the Lambda hashes incoming Bearers and
+    // GetItem's this table directly (bypassing AppSync) so token
+    // validation costs one DDB read.
+    //
+    // Admin-only authorization is the security boundary: the MCP
+    // Lambda runs every tool with its own IAM role independent of the
+    // issuer's Cognito group, so editors must not be able to mint
+    // tokens that bypass their own group restrictions. KvStore is
+    // shared with editors for site settings / caches; this model is
+    // deliberately separate so the namespace can't be smuggled into
+    // there.
+    McpToken: a.model({
+      hash: a.string().required(),
+      prefix: a.string().required(),
+      createdBy: a.string().required(),
+      createdByEmail: a.string().required(),
+      issuedAt: a.datetime().required(),
+      lastUsedAt: a.datetime(),
+      expiresAt: a.datetime(),
+      revokedAt: a.datetime()
+    }).identifier(["hash"]).authorization((allow) => [
+      allow.groups(["ampless-admin"])
+    ]),
     // Custom return type for public post reads. Decoupling from `Post` lets
     // AppSync skip the model-level (admin-only) auth check on fields.
     //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/backend",
-  "version": "1.0.0-alpha.20",
+  "version": "1.0.0-alpha.22",
   "description": "Amplify Gen 2 backend factories for ampless: auth, data, storage, event processors, API key renewer",
   "license": "MIT",
   "type": "module",
@@ -65,8 +65,8 @@
     "@smithy/protocol-http": "^5.3.0",
     "@smithy/signature-v4": "^5.4.0",
     "fflate": "^0.8.2",
-    "ampless": "1.0.0-alpha.10",
-    "@ampless/mcp-server": "1.0.0-alpha.11"
+    "ampless": "1.0.0-alpha.11",
+    "@ampless/mcp-server": "1.0.0-alpha.12"
   },
   "peerDependencies": {
     "@aws-amplify/backend": "^1",