ssh-config 4.4.1 → 4.4.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ssh-config",
   "description": "SSH config parser and stringifier",
-  "version": "4.4.1",
+  "version": "4.4.3",
   "author": "Chen Yangjian (https://www.cyj.me)",
   "repository": {
     "type": "git",
@@ -16,12 +16,14 @@
   "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",
+    "sinon": "^17.0.1",
     "typescript": "^4.6.3"
   },
   "scripts": {
@@ -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

@@ -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,
@@ -357,6 +365,9 @@ function parse(text) {
             else if (chr === '\\') {
                 escaped = true;
             }
+            else if (chr === '#' && !quoted) {
+                break;
+            }
             else {
                 val += chr;
             }
@@ -398,13 +409,16 @@ function parse(text) {
             else if (quoted) {
                 val += chr;
             }
-            else if (/[ \t]/.test(chr)) {
+            else if (/[ \t=]/.test(chr)) {
                 if (val) {
                     results.push(val);
                     val = '';
                 }
                 // otherwise ignore the space
             }
+            else if (chr === '#') {
+                break;
+            }
             else {
                 val += chr;
             }