@yawlabs/ssh-mcp 0.11.3 → 0.11.4

package/dist/index.js

@@ -19,6 +19,7 @@ function isValidHostname(host) {
   if (host.startsWith("[")) {
     return /^\[[0-9a-fA-F:]+\]$/.test(host);
   }
+  if (host.startsWith("-")) return false;
   return /^[a-zA-Z0-9._-]+$/.test(host);
 }
 function runArgs(cmd, args) {
@@ -146,6 +147,7 @@ function checkConnectivity(host, port = 22) {
     "StrictHostKeyChecking=no",
     "-p",
     String(port),
+    "--",
     host,
     "echo",
     "SSH_OK"
@@ -265,7 +267,7 @@ function diagnose(host, port = 22) {
 function parseSshConfigOutput(stdout) {
   const all = {};
   const identityFiles = [];
-  for (const line of stdout.split("\n")) {
+  for (const line of stdout.split(/\r?\n/)) {
     const spaceIdx = line.indexOf(" ");
     if (spaceIdx > 0) {
       const key = line.substring(0, spaceIdx);
@@ -569,6 +571,7 @@ function testConnection(host, port = 22) {
     "StrictHostKeyChecking=no",
     "-p",
     String(port),
+    "--",
     host,
     "echo",
     "SSH_OK"
@@ -604,6 +607,9 @@ function testConnection(host, port = 22) {
   return { status: "error", message: `Connection failed to ${host}:${port}: ${stdout}` };
 }
 
+// src/pool.ts
+import { createHash } from "crypto";
+
 // src/ssh.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
@@ -655,6 +661,25 @@ function buildHostVerifier(hosts, port) {
     return known.some((k) => k.equals(key));
   };
 }
+function isEncryptedKey(content) {
+  const text = content.toString("utf8");
+  if (text.includes("ENCRYPTED")) return true;
+  const m = text.match(/-----BEGIN OPENSSH PRIVATE KEY-----([\s\S]+?)-----END/);
+  if (m) {
+    try {
+      const raw = Buffer.from(m[1].replace(/\s+/g, ""), "base64");
+      const magic = "openssh-key-v1\0";
+      if (raw.toString("latin1", 0, magic.length) === magic) {
+        const cipherLen = raw.readUInt32BE(magic.length);
+        const cipher = raw.toString("latin1", magic.length + 4, magic.length + 4 + cipherLen);
+        return cipher !== "none";
+      }
+    } catch {
+      return true;
+    }
+  }
+  return false;
+}
 function resolveConfig(config) {
   const sshConfig = resolveFromSshConfig(config.host);
   const port = config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22);
@@ -678,15 +703,16 @@ function resolveConfig(config) {
     const agentSock = config.agent || process.env.SSH_AUTH_SOCK || (process.platform === "win32" ? "\\\\.\\pipe\\openssh-ssh-agent" : void 0);
     if (agentSock) {
       connectConfig.agent = agentSock;
-    } else {
-      const home = homedir3();
-      const keyPaths = sshConfig && sshConfig.identityFiles.length > 0 ? sshConfig.identityFiles.map((p) => p.startsWith("~") ? join3(home, p.slice(1)) : p) : [join3(home, ".ssh", "id_ed25519"), join3(home, ".ssh", "id_rsa"), join3(home, ".ssh", "id_ecdsa")];
-      for (const keyPath of keyPaths) {
-        try {
-          connectConfig.privateKey = readFileSync3(keyPath);
-          break;
-        } catch {
-        }
+    }
+    const home = homedir3();
+    const keyPaths = sshConfig && sshConfig.identityFiles.length > 0 ? sshConfig.identityFiles.map((p) => p.startsWith("~") ? join3(home, p.slice(1)) : p) : [join3(home, ".ssh", "id_ed25519"), join3(home, ".ssh", "id_rsa"), join3(home, ".ssh", "id_ecdsa")];
+    for (const keyPath of keyPaths) {
+      try {
+        const keyData = readFileSync3(keyPath);
+        if (agentSock && isEncryptedKey(keyData)) continue;
+        connectConfig.privateKey = keyData;
+        break;
+      } catch {
       }
     }
   }
@@ -1032,6 +1058,22 @@ function defaultMaxPoolSize() {
   const parsed = Number.parseInt(raw, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : 100;
 }
+function authFingerprint(cc) {
+  const h = createHash("sha256");
+  if (cc.privateKey) {
+    h.update("k");
+    h.update(cc.privateKey);
+  }
+  if (cc.password !== void 0) {
+    h.update("p");
+    h.update(cc.password);
+  }
+  if (typeof cc.agent === "string") {
+    h.update("a");
+    h.update(cc.agent);
+  }
+  return h.digest("hex").slice(0, 16);
+}
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   // Coalesces concurrent connect attempts for the same key so we don't open N
@@ -1053,7 +1095,7 @@ var ConnectionPool = class {
   async acquire(config) {
     const resolved = resolveConfig(config);
     const cc = resolved.connectConfig;
-    const key = `${cc.username}@${cc.host}:${cc.port}`;
+    const key = `${cc.username}@${cc.host}:${cc.port}#${authFingerprint(cc)}`;
     const MAX_ACQUIRE_ATTEMPTS = 3;
     let lastErr;
     for (let attempt = 0; attempt < MAX_ACQUIRE_ATTEMPTS; attempt++) {
@@ -1295,7 +1337,7 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
   const result = await exec(client, `systemctl status -- ${shellQuote(serviceName)} 2>&1`, timeoutMs);
   const raw = result.stdout;
   const activeMatch = raw.match(/Active:\s+(\S+)\s+\(([^)]+)\)/);
-  const descMatch = raw.match(/^\s+.*?-\s+(.+)$/m);
+  const descMatch = raw.match(/^[^\w\n]*\S+\s+-\s+(.+)$/m);
   const pidMatch = raw.match(/Main PID:\s+(\d+)/);
   const sinceMatch = raw.match(/since\s+(.+?);/);
   const unknown = !activeMatch && result.code !== 0;
@@ -1814,6 +1856,10 @@ async function main() {
   process.on("SIGTERM", () => {
     shutdown().catch(() => process.exit(1));
   });
+  process.on("exit", () => {
+    pool.drain();
+    killStartedAgent();
+  });
   await server.connect(transport);
 }
 main().catch((err) => {

package/dist/server.js

@@ -17,6 +17,7 @@ function isValidHostname(host) {
   if (host.startsWith("[")) {
     return /^\[[0-9a-fA-F:]+\]$/.test(host);
   }
+  if (host.startsWith("-")) return false;
   return /^[a-zA-Z0-9._-]+$/.test(host);
 }
 function runArgs(cmd, args) {
@@ -144,6 +145,7 @@ function checkConnectivity(host, port = 22) {
     "StrictHostKeyChecking=no",
     "-p",
     String(port),
+    "--",
     host,
     "echo",
     "SSH_OK"
@@ -269,7 +271,7 @@ import { join as join2 } from "path";
 function parseSshConfigOutput(stdout) {
   const all = {};
   const identityFiles = [];
-  for (const line of stdout.split("\n")) {
+  for (const line of stdout.split(/\r?\n/)) {
     const spaceIdx = line.indexOf(" ");
     if (spaceIdx > 0) {
       const key = line.substring(0, spaceIdx);
@@ -565,6 +567,7 @@ function testConnection(host, port = 22) {
     "StrictHostKeyChecking=no",
     "-p",
     String(port),
+    "--",
     host,
     "echo",
     "SSH_OK"
@@ -651,6 +654,25 @@ function buildHostVerifier(hosts, port) {
     return known.some((k) => k.equals(key));
   };
 }
+function isEncryptedKey(content) {
+  const text = content.toString("utf8");
+  if (text.includes("ENCRYPTED")) return true;
+  const m = text.match(/-----BEGIN OPENSSH PRIVATE KEY-----([\s\S]+?)-----END/);
+  if (m) {
+    try {
+      const raw = Buffer.from(m[1].replace(/\s+/g, ""), "base64");
+      const magic = "openssh-key-v1\0";
+      if (raw.toString("latin1", 0, magic.length) === magic) {
+        const cipherLen = raw.readUInt32BE(magic.length);
+        const cipher = raw.toString("latin1", magic.length + 4, magic.length + 4 + cipherLen);
+        return cipher !== "none";
+      }
+    } catch {
+      return true;
+    }
+  }
+  return false;
+}
 function resolveConfig(config) {
   const sshConfig = resolveFromSshConfig(config.host);
   const port = config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22);
@@ -674,15 +696,16 @@ function resolveConfig(config) {
     const agentSock = config.agent || process.env.SSH_AUTH_SOCK || (process.platform === "win32" ? "\\\\.\\pipe\\openssh-ssh-agent" : void 0);
     if (agentSock) {
       connectConfig.agent = agentSock;
-    } else {
-      const home = homedir3();
-      const keyPaths = sshConfig && sshConfig.identityFiles.length > 0 ? sshConfig.identityFiles.map((p) => p.startsWith("~") ? join3(home, p.slice(1)) : p) : [join3(home, ".ssh", "id_ed25519"), join3(home, ".ssh", "id_rsa"), join3(home, ".ssh", "id_ecdsa")];
-      for (const keyPath of keyPaths) {
-        try {
-          connectConfig.privateKey = readFileSync3(keyPath);
-          break;
-        } catch {
-        }
+    }
+    const home = homedir3();
+    const keyPaths = sshConfig && sshConfig.identityFiles.length > 0 ? sshConfig.identityFiles.map((p) => p.startsWith("~") ? join3(home, p.slice(1)) : p) : [join3(home, ".ssh", "id_ed25519"), join3(home, ".ssh", "id_rsa"), join3(home, ".ssh", "id_ecdsa")];
+    for (const keyPath of keyPaths) {
+      try {
+        const keyData = readFileSync3(keyPath);
+        if (agentSock && isEncryptedKey(keyData)) continue;
+        connectConfig.privateKey = keyData;
+        break;
+      } catch {
       }
     }
   }
@@ -1106,7 +1129,7 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
   const result = await exec(client, `systemctl status -- ${shellQuote(serviceName)} 2>&1`, timeoutMs);
   const raw = result.stdout;
   const activeMatch = raw.match(/Active:\s+(\S+)\s+\(([^)]+)\)/);
-  const descMatch = raw.match(/^\s+.*?-\s+(.+)$/m);
+  const descMatch = raw.match(/^[^\w\n]*\S+\s+-\s+(.+)$/m);
   const pidMatch = raw.match(/Main PID:\s+(\d+)/);
   const sinceMatch = raw.match(/since\s+(.+?);/);
   const unknown = !activeMatch && result.code !== 0;
@@ -1157,12 +1180,29 @@ function isPolicyConfigured() {
 }
 
 // src/pool.ts
+import { createHash } from "crypto";
 function defaultMaxPoolSize() {
   const raw = process.env.SSH_MCP_MAX_POOL_SIZE;
   if (!raw) return 100;
   const parsed = Number.parseInt(raw, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : 100;
 }
+function authFingerprint(cc) {
+  const h = createHash("sha256");
+  if (cc.privateKey) {
+    h.update("k");
+    h.update(cc.privateKey);
+  }
+  if (cc.password !== void 0) {
+    h.update("p");
+    h.update(cc.password);
+  }
+  if (typeof cc.agent === "string") {
+    h.update("a");
+    h.update(cc.agent);
+  }
+  return h.digest("hex").slice(0, 16);
+}
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   // Coalesces concurrent connect attempts for the same key so we don't open N
@@ -1184,7 +1224,7 @@ var ConnectionPool = class {
   async acquire(config) {
     const resolved = resolveConfig(config);
     const cc = resolved.connectConfig;
-    const key = `${cc.username}@${cc.host}:${cc.port}`;
+    const key = `${cc.username}@${cc.host}:${cc.port}#${authFingerprint(cc)}`;
     const MAX_ACQUIRE_ATTEMPTS = 3;
     let lastErr;
     for (let attempt = 0; attempt < MAX_ACQUIRE_ATTEMPTS; attempt++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/ssh-mcp",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "mcpName": "io.github.YawLabs/ssh-mcp",
   "description": "MCP server for SSH operations with built-in diagnostics",
   "type": "module",