@ampless/backend 1.0.0-alpha.51 → 1.0.0-alpha.53

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

@@ -5,8 +5,8 @@
  *   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.
+ *      grant: `dynamodb:GetItem` and `dynamodb:UpdateItem` on the
+ *      McpToken table — 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

@@ -1,6 +1,6 @@
 // src/functions/mcp-handler.ts
-import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
-import { DynamoDBDocumentClient, GetCommand } from "@aws-sdk/lib-dynamodb";
+import { ConditionalCheckFailedException, DynamoDBClient } from "@aws-sdk/client-dynamodb";
+import { DynamoDBDocumentClient, GetCommand, UpdateCommand } from "@aws-sdk/lib-dynamodb";
 import { createHash } from "crypto";
 
 // ../mcp-server/dist/index.js
@@ -572,10 +572,32 @@ var deleteMediaSchema = {
     }
   }
 };
+var MEDIA_PREFIX = "public/media/";
+function assertMediaPrefix(key) {
+  if (key.includes("\\")) {
+    throw new Error(`delete_media: src must start with "${MEDIA_PREFIX}" \u2014 got: ${key}`);
+  }
+  const parts = key.split("/");
+  const resolved = [];
+  for (const part of parts) {
+    if (part === "..") {
+      resolved.pop();
+    } else {
+      resolved.push(part);
+    }
+  }
+  const normalised = resolved.join("/");
+  if (!normalised.startsWith(MEDIA_PREFIX)) {
+    throw new Error(`delete_media: src must start with "${MEDIA_PREFIX}" \u2014 got: ${key}`);
+  }
+}
 async function deleteMedia(graphql, storage, args) {
   if (!args.mediaId && !args.src) {
     throw new Error("delete_media: provide `mediaId` or `src`");
   }
+  if (args.src !== void 0) {
+    assertMediaPrefix(args.src);
+  }
   const dryRun = args.dryRun === true;
   let mediaId;
   let src;
@@ -584,12 +606,14 @@ async function deleteMedia(graphql, storage, args) {
     if (data.getMedia) {
       mediaId = data.getMedia.mediaId;
       src = data.getMedia.src;
+      assertMediaPrefix(src);
     }
   } else {
     const data = await graphql.query(GET_BY_SRC, { src: args.src });
     if (data.getMediaBySrc) {
       mediaId = data.getMediaBySrc.mediaId;
       src = data.getMediaBySrc.src;
+      assertMediaPrefix(src);
     }
   }
   if (!mediaId) {
@@ -1736,6 +1760,7 @@ var JSON_RPC_METHOD_NOT_FOUND = -32601;
 var JSON_RPC_INVALID_PARAMS = -32602;
 var JSON_RPC_INTERNAL_ERROR = -32603;
 var MCP_PROTOCOL_VERSION = "2024-11-05";
+var LAST_USED_THROTTLE_MS = 6e4;
 function requireEnv(name) {
   const v = process.env[name];
   if (!v) throw new Error(`[mcp-handler] missing required env var ${name}`);
@@ -1779,6 +1804,28 @@ async function validateBearer(plaintext) {
   if (row.expiresAt && new Date(row.expiresAt).getTime() <= Date.now()) return null;
   return row;
 }
+async function touchLastUsedAt(hash) {
+  const now = /* @__PURE__ */ new Date();
+  const threshold = new Date(now.getTime() - LAST_USED_THROTTLE_MS).toISOString();
+  try {
+    await ddb.send(
+      new UpdateCommand({
+        TableName: MCP_TOKEN_TABLE,
+        Key: { hash },
+        UpdateExpression: "SET lastUsedAt = :now",
+        ConditionExpression: "attribute_not_exists(lastUsedAt) OR attribute_type(lastUsedAt, :nullType) OR lastUsedAt < :threshold",
+        ExpressionAttributeValues: {
+          ":now": now.toISOString(),
+          ":threshold": threshold,
+          ":nullType": "NULL"
+        }
+      })
+    );
+  } catch (err2) {
+    if (err2 instanceof ConditionalCheckFailedException) return;
+    console.error("[mcp-handler] failed to update lastUsedAt:", err2);
+  }
+}
 var cachedCtx = null;
 function makeContext() {
   if (cachedCtx) return cachedCtx;
@@ -1861,6 +1908,7 @@ var handler = async (event) => {
   if (!meta) {
     return jsonResponse(401, { error: "invalid_token" });
   }
+  await touchLastUsedAt(meta.hash);
   let req;
   try {
     const body = event.isBase64Encoded ? Buffer.from(event.body ?? "", "base64").toString("utf8") : event.body ?? "";

package/dist/index.js

@@ -61,7 +61,7 @@ function defineAmplessBackend(opts) {
     new PolicyStatement({
       effect: Effect.ALLOW,
       actions: ["cognito-idp:AdminAddUserToGroup", "cognito-idp:ListUsersInGroup"],
-      resources: ["arn:aws:cognito-idp:*:*:userpool/*"]
+      resources: [backend.auth.resources.userPool.userPoolArn]
     })
   );
   backend.userAdmin.resources.lambda.addToRolePolicy(
@@ -73,7 +73,7 @@ function defineAmplessBackend(opts) {
         "cognito-idp:AdminAddUserToGroup",
         "cognito-idp:AdminRemoveUserFromGroup"
       ],
-      resources: ["arn:aws:cognito-idp:*:*:userpool/*"]
+      resources: [backend.auth.resources.userPool.userPoolArn]
     })
   );
   backend.userAdmin.resources.lambda.addEnvironment(
@@ -197,7 +197,7 @@ function defineAmplessBackend(opts) {
   mcpHandlerFn.addToRolePolicy(
     new PolicyStatement({
       effect: Effect.ALLOW,
-      actions: ["dynamodb:GetItem"],
+      actions: ["dynamodb:GetItem", "dynamodb:UpdateItem"],
       resources: [mcpTokenTable.tableArn]
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/backend",
-  "version": "1.0.0-alpha.51",
+  "version": "1.0.0-alpha.53",
   "description": "Amplify Gen 2 backend factories for ampless: auth, data, storage, event processors, API key renewer",
   "license": "MIT",
   "type": "module",
@@ -69,8 +69,8 @@
     "@smithy/protocol-http": "^5.4.4",
     "@smithy/signature-v4": "^5.4.4",
     "fflate": "^0.8.3",
-    "@ampless/mcp-server": "1.0.0-alpha.36",
-    "ampless": "1.0.0-alpha.30"
+    "@ampless/mcp-server": "1.0.0-alpha.38",
+    "ampless": "1.0.0-alpha.32"
   },
   "peerDependencies": {
     "@aws-amplify/backend": "^1",