ssh-config 4.4.2 → 4.4.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ssh-config",
   "description": "SSH config parser and stringifier",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "author": "Chen Yangjian (https://www.cyj.me)",
   "repository": {
     "type": "git",
@@ -16,13 +16,15 @@
   "devDependencies": {
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.45",
+    "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint": "^8.31.0",
     "heredoc": "^1.3.1",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",
-    "typescript": "^4.6.3"
+    "sinon": "^17.0.1",
+    "typescript": "^5.4.4"
   },
   "scripts": {
     "lint": "eslint --ext ts .",
@@ -33,7 +35,7 @@
     "test:coverage": "nyc mocha --exit --recursive && nyc report --reporter=lcov"
   },
   "engine": {
-    "node": ">= 10.0.0"
+    "node": ">= 14.0.0"
   },
   "license": "MIT"
 }

package/src/ssh-config.js

@@ -17,7 +17,7 @@ var LineType;
 (function (LineType) {
     LineType[LineType["DIRECTIVE"] = 1] = "DIRECTIVE";
     LineType[LineType["COMMENT"] = 2] = "COMMENT";
-})(LineType = exports.LineType || (exports.LineType = {}));
+})(LineType || (exports.LineType = LineType = {}));
 const MULTIPLE_VALUE_PROPS = [
     'IdentityFile',
     'LocalForward',
@@ -91,13 +91,21 @@ class SSHConfig extends Array {
     compute(opts) {
         if (typeof opts === 'string')
             opts = { Host: opts };
+        let userInfo;
+        try {
+            userInfo = os_1.default.userInfo();
+        }
+        catch (_a) {
+            // os.userInfo() throws a SystemError if a user has no username or homedir.
+            userInfo = { username: process.env.USER || process.env.USERNAME || '' };
+        }
         const context = {
             params: {
                 Host: opts.Host,
                 HostName: opts.Host,
                 OriginalHost: opts.Host,
-                User: os_1.default.userInfo().username,
-                LocalUser: os_1.default.userInfo().username,
+                User: userInfo.username,
+                LocalUser: userInfo.username,
             },
             inFinalPass: false,
             doFinalPass: false,
@@ -140,11 +148,11 @@ class SSHConfig extends Array {
                             }
                         }
                     }
-                    if (canonicalDomains.length > 0 && canonicalizeHostName) {
+                    if (canonicalDomains.length > 0 && canonicalizeHostName && context.params.Host === context.params.OriginalHost) {
                         for (const domain of canonicalDomains) {
-                            const host = `${line.value}.${domain}`;
-                            const { stdout } = (0, child_process_1.spawnSync)('nslookup', [host]);
-                            if (!/server can't find/.test(stdout.toString())) {
+                            const host = `${context.params.OriginalHost}.${domain}`;
+                            const { status, stderr } = (0, child_process_1.spawnSync)('nslookup', [host]);
+                            if (status === 0 && !/can't find/.test(stderr.toString())) {
                                 context.params.Host = host;
                                 setProperty('Host', host);
                                 doPass();
@@ -294,9 +302,9 @@ class SSHConfig extends Array {
         return config;
     }
 }
-exports.default = SSHConfig;
 SSHConfig.DIRECTIVE = LineType.DIRECTIVE;
 SSHConfig.COMMENT = LineType.COMMENT;
+exports.default = SSHConfig;
 /**
  * Parse SSH config text into structured object.
  */
@@ -408,7 +416,7 @@ function parse(text) {
                 }
                 // otherwise ignore the space
             }
-            else if (chr === '#') {
+            else if (chr === '#' && results.length > 0) {
                 break;
             }
             else {