update read tools

Author: blva

src/tools/atlas/read/inspectAccessList.ts

@@ -1,15 +1,15 @@
-import { z } from "zod";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { ToolArgs, OperationType } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
+import { AtlasArgs } from "../validators.js";
 
 export class InspectAccessListTool extends AtlasToolBase {
     public name = "atlas-inspect-access-list";
     protected description = "Inspect Ip/CIDR ranges with access to your MongoDB Atlas clusters.";
     public operationType: OperationType = "read";
     protected argsShape = {
-        projectId: z.string().describe("Atlas project ID"),
+        projectId: AtlasArgs.projectId().describe("Atlas project ID"),
     };
 
     protected async execute({ projectId }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {

src/tools/atlas/read/inspectCluster.ts

@@ -5,13 +5,14 @@ import type { ToolArgs, OperationType } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
 import type { Cluster } from "../../../common/atlas/cluster.js";
 import { inspectCluster } from "../../../common/atlas/cluster.js";
+import { AtlasArgs } from "../validators.js";
 
 export class InspectClusterTool extends AtlasToolBase {
     public name = "atlas-inspect-cluster";
     protected description = "Inspect MongoDB Atlas cluster";
     public operationType: OperationType = "read";
     protected argsShape = {
-        projectId: z.string().describe("Atlas project ID"),
+        projectId: AtlasArgs.projectId().describe("Atlas project ID"),
         clusterName: z.string().describe("Atlas cluster name"),
     };
 

src/tools/atlas/read/listAlerts.ts

@@ -1,15 +1,15 @@
-import { z } from "zod";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { ToolArgs, OperationType } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
+import { AtlasArgs } from "../validators.js";
 
 export class ListAlertsTool extends AtlasToolBase {
     public name = "atlas-list-alerts";
     protected description = "List MongoDB Atlas alerts";
     public operationType: OperationType = "read";
     protected argsShape = {
-        projectId: z.string().describe("Atlas project ID to list alerts for"),
+        projectId: AtlasArgs.projectId().describe("Atlas project ID to list alerts for"),
     };
 
     protected async execute({ projectId }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {

src/tools/atlas/read/listClusters.ts

@@ -1,4 +1,3 @@
-import { z } from "zod";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { ToolArgs, OperationType } from "../../tool.js";
@@ -10,13 +9,14 @@ import type {
     PaginatedFlexClusters20241113,
 } from "../../../common/atlas/openapi.js";
 import { formatCluster, formatFlexCluster } from "../../../common/atlas/cluster.js";
+import { AtlasArgs } from "../validators.js";
 
 export class ListClustersTool extends AtlasToolBase {
     public name = "atlas-list-clusters";
     protected description = "List MongoDB Atlas clusters";
     public operationType: OperationType = "read";
     protected argsShape = {
-        projectId: z.string().describe("Atlas project ID to filter clusters").optional(),
+        projectId: AtlasArgs.projectId().describe("Atlas project ID to filter clusters").optional(),
     };
 
     protected async execute({ projectId }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {

src/tools/atlas/read/listDBUsers.ts

@@ -1,16 +1,16 @@
-import { z } from "zod";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { ToolArgs, OperationType } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
 import type { DatabaseUserRole, UserScope } from "../../../common/atlas/openapi.js";
+import { AtlasArgs } from "../validators.js";
 
 export class ListDBUsersTool extends AtlasToolBase {
     public name = "atlas-list-db-users";
     protected description = "List MongoDB Atlas database users";
     public operationType: OperationType = "read";
     protected argsShape = {
-        projectId: z.string().describe("Atlas project ID to filter DB users"),
+        projectId: AtlasArgs.projectId().describe("Atlas project ID to filter DB users"),
     };
 
     protected async execute({ projectId }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {

src/tools/atlas/read/listProjects.ts

@@ -2,15 +2,15 @@ import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { OperationType } from "../../tool.js";
 import { formatUntrustedData } from "../../tool.js";
-import { z } from "zod";
 import type { ToolArgs } from "../../tool.js";
+import { AtlasArgs } from "../validators.js";
 
 export class ListProjectsTool extends AtlasToolBase {
     public name = "atlas-list-projects";
     protected description = "List MongoDB Atlas projects";
     public operationType: OperationType = "read";
     protected argsShape = {
-        orgId: z.string().describe("Atlas organization ID to filter projects").optional(),
+        orgId: AtlasArgs.organizationId().describe("Atlas organization ID to filter projects").optional(),
     };
 
     protected async execute({ orgId }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {

src/tools/atlas/validators.ts

@@ -1,38 +1,47 @@
-import { z } from "zod";
+import { z, type ZodString } from "zod";
+
+export const ToolArgs = {
+    string: (): ZodString =>
+        z.string().regex(/^[\x20-\x7E]*$/, "String cannot contain special characters or Unicode symbols"),
+};
+
 /**
  * Common Zod validators for Atlas tools
  * These can be reused across different Atlas tools for consistent validation
  */
 export const AtlasArgs = {
     objectId: (fieldName: string): z.ZodString =>
-        z
-            .string()
+        ToolArgs.string()
             .min(1, `${fieldName} is required`)
             .regex(/^[0-9a-fA-F]{24}$/, `${fieldName} must be a valid 24-character hexadecimal string`),
 
-    projectId: (): z.ZodString => AtlasArgs.objectId("Project ID"),
+    projectId: (): z.ZodString => AtlasArgs.objectId("projectId"),
 
-    organizationId: (): z.ZodString => AtlasArgs.objectId("Organization ID"),
+    organizationId: (): z.ZodString => AtlasArgs.objectId("organizationId"),
 
     clusterName: (): z.ZodString =>
-        z
-            .string()
+        ToolArgs.string()
             .min(1, "Cluster name is required")
             .max(64, "Cluster name must be 64 characters or less")
             .regex(/^[a-zA-Z0-9_-]+$/, "Cluster name can only contain letters, numbers, hyphens, and underscores"),
 
     username: (): z.ZodString =>
-        z
-            .string()
+        ToolArgs.string()
             .min(1, "Username is required")
             .max(100, "Username must be 100 characters or less")
             .regex(/^[a-zA-Z0-9._-]+$/, "Username can only contain letters, numbers, dots, hyphens, and underscores"),
 
-    ipAddress: (): z.ZodString => z.string().ip({ version: "v4" }),
+    ipAddress: (): z.ZodString => ToolArgs.string().ip({ version: "v4" }),
 
     cidrBlock: (): z.ZodString =>
-        z.string().regex(/^(\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/, "Must be a valid CIDR block (e.g., 192.168.1.0/24)"),
+        ToolArgs.string().regex(
+            /^(\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/,
+            "Must be a valid CIDR block (e.g., 192.168.1.0/24)"
+        ),
 
     region: (): z.ZodString =>
-        z.string().regex(/^[a-zA-Z0-9_-]+$/, "Region can only contain letters, numbers, hyphens, and underscores"),
+        ToolArgs.string().regex(
+            /^[a-zA-Z0-9_-]+$/,
+            "Region can only contain letters, numbers, hyphens, and underscores"
+        ),
 };