@mastra/mcp 1.6.1-alpha.0 → 1.6.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/mcp
 
+## 1.6.1-alpha.1
+
+### Patch Changes
+
+- Added Fine-Grained Authorization (FGA) enforcement to MCP tool execution. Both transport-driven calls and direct `executeTool()` calls now run the same authorization checks when a request user is present, and typed FGA permission constants are accepted in MCP server authorization config. ([#15410](https://github.com/mastra-ai/mastra/pull/15410))
+
+- Updated dependencies [[`86c0298`](https://github.com/mastra-ai/mastra/commit/86c0298e647306423c842f9d5ac827bd616bd13d), [`7fce309`](https://github.com/mastra-ai/mastra/commit/7fce30912b14170bfc41f0ac736cca0f39fe0cd4), [`7997c2e`](https://github.com/mastra-ai/mastra/commit/7997c2e55ddd121562a4098cd8d2b89c68433bf1), [`e97ccb9`](https://github.com/mastra-ai/mastra/commit/e97ccb900f8b7a390ce82c9f8eb8d6eb2c5e3777), [`c5daf48`](https://github.com/mastra-ai/mastra/commit/c5daf48556e98c46ae06caf00f92c249912007e9), [`cd96779`](https://github.com/mastra-ai/mastra/commit/cd9677937f113b2856dc8b9f3d4bdabcee58bb2e)]:
+  - @mastra/core@1.32.0-alpha.2
+
 ## 1.6.1-alpha.0
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-mcp
 description: Documentation for @mastra/mcp. Use when working with @mastra/mcp APIs, configuration, or implementation.
 metadata:
   package: "@mastra/mcp"
-  version: "1.6.1-alpha.0"
+  version: "1.6.1-alpha.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.1-alpha.0",
+  "version": "1.6.1-alpha.1",
   "package": "@mastra/mcp",
   "exports": {
     "UnauthorizedError": {

package/dist/docs/references/docs-mcp-overview.md

@@ -332,6 +332,31 @@ const mcp = new MCPClient({
 })
 ```
 
+**Apify**:
+
+[Apify](https://apify.com) is the largest marketplace of tools for AI, with thousands of ready-made [Actors](https://apify.com/store) to extract real-time data from any website, track competitors, generate leads, analyze sentiment, or orchestrate your apps. Connect your agent through the [Apify MCP Server](https://mcp.apify.com).
+
+```typescript
+import { MCPClient } from '@mastra/mcp'
+
+export const mcp = new MCPClient({
+  servers: {
+    apify: {
+      url: new URL('https://mcp.apify.com'),
+      requestInit: {
+        headers: {
+          Authorization: `Bearer ${process.env.APIFY_TOKEN}`,
+        },
+      },
+    },
+  },
+})
+```
+
+Get your API token from the [Apify Console](https://console.apify.com/settings/integrations) and store it as `APIFY_TOKEN` in your environment.
+
+To pick specific Actors and tools, use the [Apify MCP server configurator](https://mcp.apify.com) and copy the generated URL.
+
 **Ampersand**:
 
 [Ampersand](https://withampersand.com?utm_source=mastra-docs) offers an [MCP Server](https://docs.withampersand.com/mcp) that allows you to connect your agent to 150+ integrations with SaaS products like Salesforce, Hubspot, and Zendesk.

package/dist/index.cjs

@@ -2826,9 +2826,11 @@ var MCPServer = class extends mcp.MCPServerBase {
    * This allows us to create multiple server instances with identical functionality.
    */
   registerHandlersOnServer(serverInstance) {
-    serverInstance.setRequestHandler(types_js.ListToolsRequestSchema, async () => {
+    serverInstance.setRequestHandler(types_js.ListToolsRequestSchema, async (_request, extra) => {
+      const proxiedContext = this.createProxiedRequestContext(extra);
+      const tools = await this.getAuthorizedConvertedToolEntries(proxiedContext);
       return {
-        tools: Object.values(this.convertedTools).map((tool) => {
+        tools: tools.map(([, tool]) => {
           const toolSpec = {
             name: tool.id || "unknown",
             description: tool.description,
@@ -2920,6 +2922,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
             throw new Error(`The "extra" key is now nested under "mcp.extra" in tool arguments`);
           }
         };
+        await this.enforceToolExecutionFGA(request.params.name, proxiedContext);
         const result = await tool.execute(validation?.value ?? request.params.arguments ?? {}, mcpOptions);
         const duration = Date.now() - startTime;
         if (tools.isValidationError(result)) {
@@ -4111,7 +4114,24 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
    * });
    * ```
    */
-  getToolListInfo() {
+  getToolListInfo(requestContext) {
+    const fgaProvider = this.mastra?.getServer?.()?.fga;
+    if (fgaProvider && requestContext) {
+      return this.getAuthorizedConvertedToolEntries(requestContext).then((tools) => ({
+        tools: tools.map(([toolId, tool]) => ({
+          id: toolId,
+          name: tool.id || toolId,
+          description: tool.description,
+          inputSchema: this.convertSchema(tool.parameters),
+          outputSchema: this.convertSchema(tool.outputSchema),
+          toolType: tool.mcp?.toolType,
+          _meta: withMastraToolStrictMeta(tool.mcp?._meta, tool.strict)
+        }))
+      }));
+    }
+    if (fgaProvider && !requestContext) {
+      return { tools: [] };
+    }
     this.logger.debug("Getting tool list", { server: this.name });
     return {
       tools: Object.entries(this.convertedTools).map(([toolId, tool]) => ({
@@ -4119,7 +4139,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         name: tool.id || toolId,
         description: tool.description,
         inputSchema: this.convertSchema(tool.parameters),
-        outputSchema: this.convertSchema(tool.parameters),
+        outputSchema: this.convertSchema(tool.outputSchema),
         toolType: tool.mcp?.toolType,
         _meta: withMastraToolStrictMeta(tool.mcp?._meta, tool.strict)
       }))
@@ -4159,6 +4179,58 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       _meta: withMastraToolStrictMeta(tool.mcp?._meta, tool.strict)
     };
   }
+  createProxiedRequestContext(extra) {
+    const proxiedContext = new requestContext.RequestContext();
+    if (extra && typeof extra === "object") {
+      Object.entries(extra).forEach(([key, value]) => {
+        proxiedContext.set(key, value);
+      });
+    }
+    return proxiedContext;
+  }
+  async getAuthorizedConvertedToolEntries(requestContext) {
+    const entries = Object.entries(this.convertedTools);
+    const fgaProvider = this.mastra?.getServer?.()?.fga;
+    if (!fgaProvider) {
+      return entries;
+    }
+    const user = requestContext.get("user");
+    if (!user) {
+      return [];
+    }
+    const accessible = await Promise.all(
+      entries.map(async ([toolId, tool]) => {
+        try {
+          await this.enforceToolExecutionFGA(toolId, requestContext);
+          return [toolId, tool];
+        } catch (error) {
+          if (error instanceof Error && error.name === "FGADeniedError") {
+            return null;
+          }
+          throw error;
+        }
+      })
+    );
+    return accessible.filter((entry) => entry !== null);
+  }
+  async enforceToolExecutionFGA(toolId, requestContext) {
+    const fgaProvider = this.mastra?.getServer?.()?.fga;
+    if (!fgaProvider) {
+      return;
+    }
+    const { checkFGA, FGADeniedError, MastraFGAPermissions } = await import('@mastra/core/auth/ee');
+    const resourceId = JSON.stringify([this.id, toolId]);
+    const user = requestContext?.get("user");
+    if (!user) {
+      throw new FGADeniedError({ id: "unknown" }, { type: "tool", id: resourceId }, MastraFGAPermissions.TOOLS_EXECUTE);
+    }
+    await checkFGA({
+      fgaProvider,
+      user,
+      resource: { type: "tool", id: resourceId },
+      permission: MastraFGAPermissions.TOOLS_EXECUTE
+    });
+  }
   /**
    * Executes a specific tool provided by this MCP server.
    *
@@ -4241,8 +4313,10 @@ Provided arguments: ${JSON.stringify(args, null, 2)}`,
     try {
       const finalExecutionContext = {
         messages: executionContext?.messages || [],
-        toolCallId: executionContext?.toolCallId || crypto$1.randomUUID()
+        toolCallId: executionContext?.toolCallId || crypto$1.randomUUID(),
+        requestContext: executionContext?.requestContext
       };
+      await this.enforceToolExecutionFGA(toolId, finalExecutionContext.requestContext);
       const result = await tool.execute(validatedArgs, finalExecutionContext);
       this.logger.info("Tool executed successfully", { tool: toolId });
       return result;