ssh-client-wrapper 2.6.2 → 2.9.1

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

@@ -4,7 +4,7 @@ const debugVerbose = require("debug")("sshClientWrapper:verbose:fork");
 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();
     }

package/lib/index.js

@@ -23,7 +23,7 @@ const { isArrayOfString, sanityCheck } = require("./util.js");
  * @param {string | Function} hostInfo.password - password or function which return password
  * @param {string | Function} hostInfo.passphrase - passphrase or function which return passphrase of private key
  * @param {string} hostInfo.keyFile - private key filename
- * @param {boolean} hostInfo.noStrictHostkeyChecking - bypass host key checking if true
+ * @param {boolean} hostInfo.noStrictHostKeyChecking - bypass host key checking if true
  * @param {Integer} hostInfo.ControlPersist=180 - how long keep master connection after last client connection has been closed (sec).
  * @param {Integer} hostInfo.ConnectTimeout=60 - timeout used when connectiong to ths SSH server
  * @param {Integer} hostInfo.maxRetry=3 - max number of retry

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({
@@ -34,7 +34,7 @@ const hostInfoSchema = {
     user: { type: "string", pattern: "\\S+", transform: ["trim"] },
     port: { type: "number", minimum: 0, maximum: 65535 },
     keyFile: { type: "string", pattern: "\\S+", transform: ["trim"] },
-    noStrictHostkeyChecking: { type: "boolean" },
+    noStrictHostKeyChecking: { type: "boolean" },
     ControlPersist: { type: "number", minimum: 0, default: 180 },
     ConnectTimeout: { type: "number", minimum: 0 },
     ControlPersistDir: { type: "string", pattern: "\\S+", transform: ["trim"] },
@@ -190,7 +190,7 @@ const getSshOption = (hostInfo, withoutDestination) => {
     }
   }
 
-  if (hostInfo.noStrictHostkeyChecking) {
+  if (hostInfo.noStrictHostKeyChecking) {
     args.push("-oStrictHostKeyChecking=no");
   }
   const controlPersist = Number.isInteger(hostInfo.ControlPersist) && hostInfo.ControlPersist >= 0 ? hostInfo.ControlPersist : "180";
@@ -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.2",
+  "version": "2.9.1",
   "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

package/test/sanityCheck.js

@@ -78,21 +78,21 @@ describe("test for sanityCheck", () => {
   it("should just change type if string value specified for boolean member", () => {
     expect(sanityCheck({
       host,
-      noStrictHostkeyChecking: "true"
+      noStrictHostKeyChecking: "true"
     })).to.deep.equal({
       host,
       ...defaultValues,
-      noStrictHostkeyChecking: true
+      noStrictHostKeyChecking: true
     });
   });
   it("should just change type if number value specified for boolean member", () => {
     expect(sanityCheck({
       host,
-      noStrictHostkeyChecking: 0
+      noStrictHostKeyChecking: 0
     })).to.deep.equal({
       host,
       ...defaultValues,
-      noStrictHostkeyChecking: false
+      noStrictHostKeyChecking: false
     });
   });
   it("shold keep addtional properties", () => {