@yawlabs/ssh-mcp 0.5.0 → 0.6.0

package/dist/index.js

@@ -15,16 +15,21 @@ import { existsSync, readFileSync, readdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 function isValidHostname(host) {
-  return /^[a-zA-Z0-9._\-:[\]]+$/.test(host) && host.length <= 253;
+  if (host.length === 0 || host.length > 253) return false;
+  if (host.startsWith("[")) {
+    return /^\[[0-9a-fA-F:]+\]$/.test(host);
+  }
+  return /^[a-zA-Z0-9._\-]+$/.test(host);
 }
 function runArgs(cmd, args) {
   try {
     const stdout = execFileSync(cmd, args, { encoding: "utf8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
     return { stdout: stdout.trim(), ok: true };
   } catch (e) {
-    const stdout = e.stdout?.toString().trim() || "";
-    const stderr = e.stderr?.toString().trim() || "";
-    const output = [stdout, stderr].filter(Boolean).join("\n") || e.message || "";
+    const err = e;
+    const stdout = err.stdout?.toString().trim() || "";
+    const stderr = err.stderr?.toString().trim() || "";
+    const output = [stdout, stderr].filter(Boolean).join("\n") || err.message || "";
     return { stdout: output, ok: false };
   }
 }
@@ -42,12 +47,10 @@ ${stdout2}` };
         message: "Windows OpenSSH agent is running but has no keys loaded. Run: ssh-add <key-path>"
       };
     }
-    if (!stdout2.includes("Error connecting") && !stdout2.includes("unable to")) {
-      return {
-        status: "warning",
-        message: "Windows OpenSSH Authentication Agent may not be running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
-      };
-    }
+    return {
+      status: "error",
+      message: "Windows OpenSSH Authentication Agent is not running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
+    };
   }
   if (!sock) {
     return {
@@ -111,6 +114,9 @@ function checkSshKeys() {
   return { status: "ok", message: `Found SSH keys: ${found.join(", ")}` };
 }
 function checkKnownHosts(host) {
+  if (!isValidHostname(host)) {
+    return { status: "error", message: `Invalid hostname: "${host}"` };
+  }
   const knownHostsPath = join(homedir(), ".ssh", "known_hosts");
   if (!existsSync(knownHostsPath)) {
     return {
@@ -118,9 +124,6 @@ function checkKnownHosts(host) {
       message: "~/.ssh/known_hosts does not exist. First connection to any host will prompt for verification."
     };
   }
-  if (!isValidHostname(host)) {
-    return { status: "error", message: `Invalid hostname: "${host}"` };
-  }
   const { stdout, ok } = runArgs("ssh-keygen", ["-F", host]);
   if (!ok || !stdout.trim()) {
     return {
@@ -423,9 +426,21 @@ function getSftp(client) {
     });
   });
 }
-async function readFile(client, remotePath) {
+var DEFAULT_MAX_READ_BYTES = 10 * 1024 * 1024;
+async function readFile(client, remotePath, maxBytes = DEFAULT_MAX_READ_BYTES) {
   const sftp = await getSftp(client);
   try {
+    const stats = await new Promise((resolve, reject) => {
+      sftp.stat(remotePath, (err, stats2) => {
+        if (err) return reject(err);
+        resolve(stats2);
+      });
+    });
+    if (stats.size > maxBytes) {
+      throw new Error(
+        `File is ${(stats.size / 1024 / 1024).toFixed(1)} MB, exceeds ${(maxBytes / 1024 / 1024).toFixed(0)} MB limit. Use ssh_exec with head/tail to read a portion.`
+      );
+    }
     return await new Promise((resolve, reject) => {
       sftp.readFile(remotePath, (err, data) => {
         if (err) return reject(err);
@@ -493,8 +508,10 @@ async function listDir(client, remotePath) {
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   idleTtlMs;
+  maxPoolSize;
   constructor(options) {
     this.idleTtlMs = options?.idleTtlMs ?? 6e4;
+    this.maxPoolSize = options?.maxPoolSize ?? 100;
   }
   async acquire(config) {
     const resolved = resolveConfig(config);
@@ -512,6 +529,24 @@ var ConnectionPool = class {
     if (existing?.dead) {
       this.entries.delete(key);
     }
+    if (this.entries.size >= this.maxPoolSize) {
+      let evicted = false;
+      for (const [k, e] of this.entries) {
+        if (e.refCount === 0) {
+          if (e.idleTimer) clearTimeout(e.idleTimer);
+          try {
+            e.client.end();
+          } catch {
+          }
+          this.entries.delete(k);
+          evicted = true;
+          break;
+        }
+      }
+      if (!evicted) {
+        throw new Error(`Connection pool is full (${this.maxPoolSize} active connections)`);
+      }
+    }
     try {
       const client = await connectWithProxy(resolved);
       const entry = { client, key, refCount: 1, idleTimer: null, dead: false };
@@ -924,7 +959,18 @@ async function multiExec(pool, hosts, command, timeoutMs = 3e4) {
     };
   });
 }
+var VALID_FIND_SIZE = /^\d+[kMGTP]?$/;
 async function find(client, options, timeoutMs = 3e4) {
+  if (options.minsize && !VALID_FIND_SIZE.test(options.minsize)) {
+    throw new Error(
+      `Invalid minsize format: "${options.minsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "1M", "100k")`
+    );
+  }
+  if (options.maxsize && !VALID_FIND_SIZE.test(options.maxsize)) {
+    throw new Error(
+      `Invalid maxsize format: "${options.maxsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "10M", "500k")`
+    );
+  }
   const args = [shellQuote(options.path)];
   if (options.maxdepth !== void 0) args.push("-maxdepth", String(options.maxdepth));
   if (options.type) args.push("-type", options.type);
@@ -967,11 +1013,11 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
 
 // src/tools.ts
 var HostSchema = z.string().describe("SSH hostname or IP address");
-var PortSchema = z.number().optional().describe("SSH port (default: 22)");
+var PortSchema = z.number().int().min(1).max(65535).optional().describe("SSH port (default: 22)");
 var UsernameSchema = z.string().optional().describe("SSH username (default: current user)");
 var KeyPathSchema = z.string().optional().describe("Path to SSH private key");
 var PasswordSchema = z.string().optional().describe("SSH password (prefer keys)");
-var TimeoutSchema = z.number().optional().describe("Command timeout in milliseconds (default: 30000)");
+var TimeoutSchema = z.number().int().positive().optional().describe("Command timeout in milliseconds (default: 30000)");
 var connectionParams = {
   host: HostSchema,
   port: PortSchema,
@@ -1099,7 +1145,7 @@ ${result.stderr}`);
           lines.push(`  - ${s}`);
         }
       }
-      return { content: [{ type: "text", text: lines.join("\n") }] };
+      return { content: [{ type: "text", text: lines.join("\n") }], isError: report.overall === "error" };
     }
   );
   server.tool(
@@ -1236,13 +1282,14 @@ ${result.stderr}`);
     {
       hosts: z.array(z.string()).describe("List of SSH hostnames or IPs"),
       command: z.string().describe("Shell command to execute on all hosts"),
+      port: PortSchema,
       username: UsernameSchema,
       privateKeyPath: KeyPathSchema,
       password: PasswordSchema,
       timeout: TimeoutSchema
     },
-    async ({ hosts, command, username, privateKeyPath, password, timeout }) => {
-      const hostConfigs = hosts.map((host) => ({ host, username, privateKeyPath, password }));
+    async ({ hosts, command, port, username, privateKeyPath, password, timeout }) => {
+      const hostConfigs = hosts.map((host) => ({ host, port, username, privateKeyPath, password }));
       const results = await multiExec(connectionPool, hostConfigs, command, timeout || 3e4);
       const lines = [];
       for (const r of results) {
@@ -1353,7 +1400,7 @@ ${files.join("\n")}` }] };
 function createServer(pool) {
   const server = new McpServer({
     name: "ssh-mcp",
-    version: "0.5.0"
+    version: "0.6.0"
   });
   registerTools(server, pool);
   return server;

package/dist/server.d.ts

@@ -24,7 +24,7 @@ declare function connectRaw(connectConfig: ConnectConfig): Promise<Client>;
 declare function connectWithProxy(resolved: ResolvedConfig): Promise<Client>;
 declare function connect(config: SSHConfig): Promise<Client>;
 declare function exec(client: Client, command: string, timeoutMs?: number): Promise<ExecResult>;
-declare function readFile(client: Client, remotePath: string): Promise<string>;
+declare function readFile(client: Client, remotePath: string, maxBytes?: number): Promise<string>;
 declare function writeFile(client: Client, remotePath: string, content: string): Promise<void>;
 declare function uploadFile(client: Client, localPath: string, remotePath: string): Promise<void>;
 declare function downloadFile(client: Client, remotePath: string, localPath: string): Promise<void>;
@@ -33,10 +33,13 @@ declare function listDir(client: Client, remotePath: string): Promise<string[]>;
 interface PoolOptions {
     /** Milliseconds before an idle connection is closed. Default: 60000 (60s) */
     idleTtlMs?: number;
+    /** Maximum number of connections in the pool. Default: 100 */
+    maxPoolSize?: number;
 }
 declare class ConnectionPool {
     private entries;
     private idleTtlMs;
+    private maxPoolSize;
     constructor(options?: PoolOptions);
     acquire(config: SSHConfig): Promise<Client>;
     release(client: Client): void;

package/dist/server.js

@@ -10,16 +10,21 @@ import { existsSync, readFileSync, readdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 function isValidHostname(host) {
-  return /^[a-zA-Z0-9._\-:[\]]+$/.test(host) && host.length <= 253;
+  if (host.length === 0 || host.length > 253) return false;
+  if (host.startsWith("[")) {
+    return /^\[[0-9a-fA-F:]+\]$/.test(host);
+  }
+  return /^[a-zA-Z0-9._\-]+$/.test(host);
 }
 function runArgs(cmd, args) {
   try {
     const stdout = execFileSync(cmd, args, { encoding: "utf8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
     return { stdout: stdout.trim(), ok: true };
   } catch (e) {
-    const stdout = e.stdout?.toString().trim() || "";
-    const stderr = e.stderr?.toString().trim() || "";
-    const output = [stdout, stderr].filter(Boolean).join("\n") || e.message || "";
+    const err = e;
+    const stdout = err.stdout?.toString().trim() || "";
+    const stderr = err.stderr?.toString().trim() || "";
+    const output = [stdout, stderr].filter(Boolean).join("\n") || err.message || "";
     return { stdout: output, ok: false };
   }
 }
@@ -37,12 +42,10 @@ ${stdout2}` };
         message: "Windows OpenSSH agent is running but has no keys loaded. Run: ssh-add <key-path>"
       };
     }
-    if (!stdout2.includes("Error connecting") && !stdout2.includes("unable to")) {
-      return {
-        status: "warning",
-        message: "Windows OpenSSH Authentication Agent may not be running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
-      };
-    }
+    return {
+      status: "error",
+      message: "Windows OpenSSH Authentication Agent is not running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
+    };
   }
   if (!sock) {
     return {
@@ -106,6 +109,9 @@ function checkSshKeys() {
   return { status: "ok", message: `Found SSH keys: ${found.join(", ")}` };
 }
 function checkKnownHosts(host) {
+  if (!isValidHostname(host)) {
+    return { status: "error", message: `Invalid hostname: "${host}"` };
+  }
   const knownHostsPath = join(homedir(), ".ssh", "known_hosts");
   if (!existsSync(knownHostsPath)) {
     return {
@@ -113,9 +119,6 @@ function checkKnownHosts(host) {
       message: "~/.ssh/known_hosts does not exist. First connection to any host will prompt for verification."
     };
   }
-  if (!isValidHostname(host)) {
-    return { status: "error", message: `Invalid hostname: "${host}"` };
-  }
   const { stdout, ok } = runArgs("ssh-keygen", ["-F", host]);
   if (!ok || !stdout.trim()) {
     return {
@@ -732,9 +735,21 @@ function getSftp(client) {
     });
   });
 }
-async function readFile(client, remotePath) {
+var DEFAULT_MAX_READ_BYTES = 10 * 1024 * 1024;
+async function readFile(client, remotePath, maxBytes = DEFAULT_MAX_READ_BYTES) {
   const sftp = await getSftp(client);
   try {
+    const stats = await new Promise((resolve, reject) => {
+      sftp.stat(remotePath, (err, stats2) => {
+        if (err) return reject(err);
+        resolve(stats2);
+      });
+    });
+    if (stats.size > maxBytes) {
+      throw new Error(
+        `File is ${(stats.size / 1024 / 1024).toFixed(1)} MB, exceeds ${(maxBytes / 1024 / 1024).toFixed(0)} MB limit. Use ssh_exec with head/tail to read a portion.`
+      );
+    }
     return await new Promise((resolve, reject) => {
       sftp.readFile(remotePath, (err, data) => {
         if (err) return reject(err);
@@ -824,7 +839,18 @@ async function multiExec(pool, hosts, command, timeoutMs = 3e4) {
     };
   });
 }
+var VALID_FIND_SIZE = /^\d+[kMGTP]?$/;
 async function find(client, options, timeoutMs = 3e4) {
+  if (options.minsize && !VALID_FIND_SIZE.test(options.minsize)) {
+    throw new Error(
+      `Invalid minsize format: "${options.minsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "1M", "100k")`
+    );
+  }
+  if (options.maxsize && !VALID_FIND_SIZE.test(options.maxsize)) {
+    throw new Error(
+      `Invalid maxsize format: "${options.maxsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "10M", "500k")`
+    );
+  }
   const args = [shellQuote(options.path)];
   if (options.maxdepth !== void 0) args.push("-maxdepth", String(options.maxdepth));
   if (options.type) args.push("-type", options.type);
@@ -869,8 +895,10 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   idleTtlMs;
+  maxPoolSize;
   constructor(options) {
     this.idleTtlMs = options?.idleTtlMs ?? 6e4;
+    this.maxPoolSize = options?.maxPoolSize ?? 100;
   }
   async acquire(config) {
     const resolved = resolveConfig(config);
@@ -888,6 +916,24 @@ var ConnectionPool = class {
     if (existing?.dead) {
       this.entries.delete(key);
     }
+    if (this.entries.size >= this.maxPoolSize) {
+      let evicted = false;
+      for (const [k, e] of this.entries) {
+        if (e.refCount === 0) {
+          if (e.idleTimer) clearTimeout(e.idleTimer);
+          try {
+            e.client.end();
+          } catch {
+          }
+          this.entries.delete(k);
+          evicted = true;
+          break;
+        }
+      }
+      if (!evicted) {
+        throw new Error(`Connection pool is full (${this.maxPoolSize} active connections)`);
+      }
+    }
     try {
       const client = await connectWithProxy(resolved);
       const entry = { client, key, refCount: 1, idleTimer: null, dead: false };
@@ -978,11 +1024,11 @@ ${diag}`);
 
 // src/tools.ts
 var HostSchema = z.string().describe("SSH hostname or IP address");
-var PortSchema = z.number().optional().describe("SSH port (default: 22)");
+var PortSchema = z.number().int().min(1).max(65535).optional().describe("SSH port (default: 22)");
 var UsernameSchema = z.string().optional().describe("SSH username (default: current user)");
 var KeyPathSchema = z.string().optional().describe("Path to SSH private key");
 var PasswordSchema = z.string().optional().describe("SSH password (prefer keys)");
-var TimeoutSchema = z.number().optional().describe("Command timeout in milliseconds (default: 30000)");
+var TimeoutSchema = z.number().int().positive().optional().describe("Command timeout in milliseconds (default: 30000)");
 var connectionParams = {
   host: HostSchema,
   port: PortSchema,
@@ -1110,7 +1156,7 @@ ${result.stderr}`);
           lines.push(`  - ${s}`);
         }
       }
-      return { content: [{ type: "text", text: lines.join("\n") }] };
+      return { content: [{ type: "text", text: lines.join("\n") }], isError: report.overall === "error" };
     }
   );
   server.tool(
@@ -1247,13 +1293,14 @@ ${result.stderr}`);
     {
       hosts: z.array(z.string()).describe("List of SSH hostnames or IPs"),
       command: z.string().describe("Shell command to execute on all hosts"),
+      port: PortSchema,
       username: UsernameSchema,
       privateKeyPath: KeyPathSchema,
       password: PasswordSchema,
       timeout: TimeoutSchema
     },
-    async ({ hosts, command, username, privateKeyPath, password, timeout }) => {
-      const hostConfigs = hosts.map((host) => ({ host, username, privateKeyPath, password }));
+    async ({ hosts, command, port, username, privateKeyPath, password, timeout }) => {
+      const hostConfigs = hosts.map((host) => ({ host, port, username, privateKeyPath, password }));
       const results = await multiExec(connectionPool, hostConfigs, command, timeout || 3e4);
       const lines = [];
       for (const r of results) {
@@ -1364,7 +1411,7 @@ ${files.join("\n")}` }] };
 function createServer(pool) {
   const server = new McpServer({
     name: "ssh-mcp",
-    version: "0.5.0"
+    version: "0.6.0"
   });
   registerTools(server, pool);
   return server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/ssh-mcp",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "MCP server for SSH operations with built-in diagnostics",
   "type": "module",
   "bin": {