it-tools-mcp 3.0.10 → 3.0.12

package/build/tools/network.js

@@ -6,8 +6,44 @@ import Telnet from "telnet-client";
 import psList from "ps-list";
 import fs from "fs";
 import readLastLines from "read-last-lines";
+import path from "path";
+import os from "os";
 // For Telnet import (telnet-client exports as an object, not a class)
 const TelnetClient = Telnet.Telnet || Telnet;
+function resolvePrivateKey(privateKeyArg) {
+    // If not provided, try default keys
+    if (!privateKeyArg) {
+        const home = os.homedir();
+        const defaultKeys = [
+            path.join(home, '.ssh', 'id_rsa'),
+            path.join(home, '.ssh', 'id_ed25519'),
+        ];
+        for (const keyPath of defaultKeys) {
+            if (fs.existsSync(keyPath)) {
+                return fs.readFileSync(keyPath, 'utf8');
+            }
+        }
+        return undefined;
+    }
+    // If it looks like a path, try to read it
+    if (privateKeyArg.startsWith('/') ||
+        privateKeyArg.startsWith('~') ||
+        privateKeyArg.endsWith('.pem') ||
+        privateKeyArg.endsWith('.key')) {
+        let keyPath = privateKeyArg;
+        if (keyPath.startsWith('~')) {
+            keyPath = path.join(os.homedir(), keyPath.slice(1));
+        }
+        if (fs.existsSync(keyPath)) {
+            return fs.readFileSync(keyPath, 'utf8');
+        }
+        else {
+            throw new Error('Private key file not found: ' + keyPath);
+        }
+    }
+    // Otherwise, assume it's the key content
+    return privateKeyArg;
+}
 export function registerNetworkTools(server) {
     // IP address tools
     server.tool("ip-subnet-calculator", "Calculate subnet information for IPv4", {
@@ -536,9 +572,17 @@ Common issues:
         target: z.string().describe("Target host"),
         user: z.string().describe("Username"),
         command: z.string().describe("Command to run on remote host"),
-        privateKey: z.string().optional().describe("Private key for authentication (PEM format, optional)")
+        privateKey: z.string().optional().describe("Private key for authentication (PEM format, optional, or path to key file)")
     }, async ({ target, user, command, privateKey }) => {
         return new Promise((resolve) => {
+            let resolvedKey;
+            try {
+                resolvedKey = resolvePrivateKey(privateKey);
+            }
+            catch (err) {
+                resolve({ content: [{ type: "text", text: `SSH key error: ${err.message}` }] });
+                return;
+            }
             const conn = new SSHClient();
             let output = "";
             conn.on("ready", () => {
@@ -562,7 +606,7 @@ Common issues:
             }).connect({
                 host: target,
                 username: user,
-                ...(privateKey ? { privateKey } : {})
+                ...(resolvedKey ? { privateKey: resolvedKey } : {})
             });
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "it-tools-mcp",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "description": "MCP server providing access to various IT tools and utilities for developers",
   "type": "module",
   "main": "./build/index.js",