ssh-client-wrapper 2.6.1 → 2.8.0

package/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   testbed:
     image: naoso5/test-sshd
     ports:
-      - "4000:22"
+      - "4100:22"
     container_name: testbed
   tester:
     build:

package/lib/fork.js

@@ -1,10 +1,10 @@
 "use strict";
 const debug = require("debug")("sshClientWrapper:debug:fork");
 const debugVerbose = require("debug")("sshClientWrapper:verbose:fork");
-const debugSendPty = require("debug")("sshClientWrapper:insecure:fork_sendpty");
+const debugSendPty = require("debug")("sshClientWrapperInsecure:fork_sendpty");
 const { spawn } = require("node-pty");
 
-const { rePwPrompt, rePhPrompt, reNewHostPrompt, buff2String, sendPty, watchDogTimer } = require("./util.js");
+const { rePwPrompt, rePhPrompt, reNewHostPrompt, reRemoteHostIdentificationHasChanged, buff2String, sendPty, watchDogTimer } = require("./util.js");
 
 const nodePtyOpt = {
   shell: process.platform === "win32" ? process.env.ComSpec : process.env.SHELL,
@@ -13,7 +13,19 @@ const nodePtyOpt = {
 
 function sshLoginCallback (output, ptyProcess, pw, ph, logger = debugSendPty) {
   return new Promise((resolve, reject) => {
+    if (reRemoteHostIdentificationHasChanged.test(output)) {
+      debug("REMOTE HOST IDENTIFICATION HAS CHANGED");
+      const rt = /known_hosts:(\d+)/.exec(output);
+      const rt2 = /Host key for (.+) has changed and you have requested strict checking./.exec(output);
+      const err = new Error("REMOTE HOST IDENTIFICATION HAS CHANGED");
+      err.code = "HostKeyError";
+      err.output = output;
+      err.lineNumber = rt[1] || null;
+      err.host = rt2[1] || null;
+      reject(err);
+    }
     if (reNewHostPrompt.test(output)) {
+      debug("get warning about new host and send yes automatically");
       sendPty(ptyProcess, "yes\n", logger, 17);
       resolve();
     }
@@ -96,11 +108,6 @@ async function fork (hostInfo, cmd, args, timeout, outputCallback, retryableExit
           err.retryable = true;
           reject(err);
         }
-        if (/muxserver_listen: link mux listener .* Bad file descriptor/.test(output)) {
-          ptyProcess.kill();
-          const err = new Error("Control socket creation failed");
-          reject(err);
-        }
       });
     }
 

package/lib/sshExec.js

@@ -3,7 +3,7 @@ const crypto = require("crypto");
 const { setTimeout: setTimeoutPromise } = require("timers/promises");
 const debug = require("debug")("sshClientWrapper:debug:sshExec");
 const debugVerbose = require("debug")("sshClientWrapper:verbose:sshExec");
-const debugSendMasterPty = require("debug")("sshClientWrapper:insecure:sshExec_masterPty");
+const debugSendMasterPty = require("debug")("sshClientWrapperInsecure:sshExec_masterPty");
 const { sendPty, sshCmd, getSshOption, sanityCheck, watchDogTimer } = require("./util.js");
 const { fork, createMasterPty, sshLoginCallback } = require("./fork.js");
 
@@ -143,6 +143,8 @@ async function connect (hostInfo, timeout = 60) {
         reject(new Error("Bad port"));
       } else if (/Operation|Connection timed out/.test(output)) {
         reject(new Error("Operation timed out"));
+      } else if (/muxserver_listen: link mux listener .* Bad file descriptor/.test(output)) {
+        reject(new Error("Control socket creation failed"));
       }
     });
     hostInfo.masterPty.onData((data) => {

package/lib/util.js

@@ -11,7 +11,7 @@ const acceptableRsyncRetrunCodes = [10, 11, 12, 13, 14];
 const rePwPrompt = /password:/;
 const rePhPrompt = /Enter passphrase for key/;
 const reNewHostPrompt = /Are you sure you want to continue connecting/;
-
+const reRemoteHostIdentificationHasChanged = /WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! /;
 const Ajv = require("ajv");
 
 const ajv = new Ajv({
@@ -264,6 +264,7 @@ module.exports = {
   rePwPrompt,
   rePhPrompt,
   reNewHostPrompt,
+  reRemoteHostIdentificationHasChanged,
   buff2String,
   getSshOption,
   sanityCheck,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh-client-wrapper",
-  "version": "2.6.1",
+  "version": "2.8.0",
   "description": "wrapper library for open ssh client and rsync",
   "keywords": [
     "ssh",
@@ -34,10 +34,10 @@
     "*.js": "eslint --fix"
   },
   "dependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "^8.13.0",
     "ajv-keywords": "^5.1.0",
     "debug": "^4.3.4",
-    "glob": "^10.3.10",
+    "glob": "^10.3.12",
     "node-pty": "^0.10.1",
     "promise-retry": "^2.0.1"
   },

package/run_test_all.sh

@@ -11,8 +11,8 @@ docker-compose up testbed -d
 export TEST_HOST=localhost
 export TEST_USER=testuser
 export TEST_PW=passw0rd
-export TEST_PORT=4000
-ssh-keygen -R '[localhost]:4000'
+export TEST_PORT=4100
+ssh-keygen -R '[localhost]:4100'
 
 npm run test
 echo local test success