ssh-client-wrapper 2.2.6 → 2.2.8

package/lib/util.js

@@ -41,8 +41,7 @@ const hostInfoSchema = {
     retryMaxTimeout: { type: "number", minimum: 0 },
     sshOpt: { type: "array", minItems: 1, items: { type: "string", pattern: "\\S+", transform: ["trim"] } }
   },
-  required: ["host"],
-  additionalProperties: false
+  required: ["host"]
 };
 
 const stringOptions = [
@@ -74,10 +73,11 @@ const buff2String = (func, data) => {
  */
 const sanityCheck = (hostInfo) => {
   debug("sanityCheck called", hostInfo);
+
   // keep password, passphrase, and masterPty before validate.
-  // these properties can have invalid value for JSON.
-  // ajv will remove that at validation pahse becase of additionalProperties setting
-  // so we keep them here and put back later.
+  // these properties can have a iellegal value as JSON data
+  // so we keep them before ajv validation and put them back
+
   const { password, passphrase, masterPty } = hostInfo;
   validate(hostInfo);
 
@@ -123,9 +123,9 @@ const sanityCheck = (hostInfo) => {
     hostInfo.password = password;
   }
   if (["string", "function"].includes(typeof passphrase)) {
-    hostInfo.password = password;
+    hostInfo.passphrase = passphrase;
   }
-  if (masterPty === null || typeof masterPty === "function") {
+  if (typeof masterPty !== "undefined") {
     hostInfo.masterPty = masterPty;
   }
   return hostInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh-client-wrapper",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "wrapper library for open ssh client and rsync",
   "keywords": [
     "ssh",

package/run_test_all.sh

@@ -4,8 +4,30 @@ export TEST_HOST=localhost
 export TEST_USER=testuser
 export TEST_PW=passw0rd
 export TEST_PORT=4000
+ssh-keygen -R '[localhost]:4000'
+
 npm run test
-docker-compose run --build --rm tester &&
-docker-compose run --build --rm tester-bullseye &&
-docker-compose run --build --rm tester-buster &&
+if [ $? -ne 0 ];then
+  echo local test failed
+  exit 1
+fi
+
+docker-compose run --build --rm tester
+if [ $? -ne 0 ];then
+  echo test on latest ubuntu failed
+  exit 2
+fi
+
+docker-compose run --build --rm tester-bullseye
+if [ $? -ne 0 ];then
+  echo test on bullseye failed
+  exit 3
+fi
+
+docker-compose run --build --rm tester-buster
+if [ $? -ne 0 ];then
+  echo test on buster failed
+  exit 4
+fi
+
 docker-compose rm --stop --force testbed