diff --git a/package-lock.json b/package-lock.json index ff20bcd..58dd95f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,12 +11,16 @@ "dependencies": { "@xterm/addon-fit": "^0.11.0", "@xterm/xterm": "^6.0.0", + "keytar": "*", "monaco-editor": "^0.55.1", "ssh2": "^1.15.0" }, "devDependencies": { "electron": "^40.6.0", "electron-builder": "^26.8.1" + }, + "optionalDependencies": { + "keytar": "^7.9.0" } }, "node_modules/@develar/schema-utils": { @@ -1246,7 +1250,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, + "devOptional": true, "funding": [ { "type": "github", @@ -1276,7 +1280,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "buffer": "^5.5.0", @@ -1310,7 +1314,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, + "devOptional": true, "funding": [ { "type": "github", @@ -1857,7 +1861,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" @@ -1873,7 +1877,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=10" @@ -1882,6 +1886,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/defaults": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", @@ -1957,7 +1971,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", - "dev": true, + "devOptional": true, "license": "Apache-2.0", "engines": { "node": ">=8" @@ -2382,7 +2396,7 @@ "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "once": "^1.4.0" @@ -2486,6 +2500,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "license": "(MIT OR WTFPL)", + "optional": true, + "engines": { + "node": ">=6" + } + }, "node_modules/exponential-backoff": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", @@ -2654,6 +2678,13 @@ "node": ">= 6" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT", + "optional": true + }, "node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -2764,6 +2795,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "license": "MIT", + "optional": true + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -3077,7 +3115,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, + "devOptional": true, "funding": [ { "type": "github", @@ -3120,9 +3158,16 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, + "devOptional": true, "license": "ISC" }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC", + "optional": true + }, "node_modules/ip-address": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", @@ -3291,6 +3336,25 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/keytar": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", + "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "node-addon-api": "^4.3.0", + "prebuild-install": "^7.0.1" + } + }, + "node_modules/keytar/node_modules/node-addon-api": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", + "license": "MIT", + "optional": true + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -3490,7 +3554,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, + "devOptional": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3642,6 +3706,13 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT", + "optional": true + }, "node_modules/monaco-editor": { "version": "0.55.1", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.55.1.tgz", @@ -3666,6 +3737,13 @@ "license": "MIT", "optional": true }, + "node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "license": "MIT", + "optional": true + }, "node_modules/negotiator": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", @@ -3815,7 +3893,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "wrappy": "1" @@ -4038,6 +4116,60 @@ "node": "^12.20.0 || >=14" } }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.", + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prebuild-install/node_modules/node-abi": { + "version": "3.87.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.87.0.tgz", + "integrity": "sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prebuild-install/node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/proc-log": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", @@ -4088,7 +4220,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", @@ -4118,6 +4250,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "optional": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, "node_modules/read-binary-file-arch": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", @@ -4135,7 +4283,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "inherits": "^2.0.3", @@ -4256,7 +4404,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, + "devOptional": true, "funding": [ { "type": "github", @@ -4364,6 +4512,53 @@ "dev": true, "license": "ISC" }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "optional": true + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "optional": true, + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, "node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", @@ -4520,7 +4715,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -4584,6 +4779,16 @@ "node": ">=8" } }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/sumchecker": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", @@ -4627,6 +4832,43 @@ "node": ">=18" } }, + "node_modules/tar-fs": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC", + "optional": true + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tar/node_modules/yallist": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", @@ -4768,6 +5010,19 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -4852,7 +5107,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/verror": { @@ -4938,7 +5193,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, + "devOptional": true, "license": "ISC" }, "node_modules/xmlbuilder": { diff --git a/package.json b/package.json index 6fe1bb6..97f8538 100644 --- a/package.json +++ b/package.json @@ -55,5 +55,8 @@ "allowElevation": true, "allowToChangeInstallationDirectory": true } + }, + "optionalDependencies": { + "keytar": "^7.9.0" } } diff --git a/src/main.js b/src/main.js index c014768..b1937dc 100644 --- a/src/main.js +++ b/src/main.js @@ -4,6 +4,7 @@ const fs = require('fs/promises'); const { Client } = require('ssh2'); let mainWindow; +let keytarLib = null; let sshClient = null; let sftp = null; let shellStream = null; @@ -12,6 +13,27 @@ let pendingHostKey = null; const profilesFile = () => path.join(app.getPath('userData'), 'profiles.json'); const knownHostsFile = () => path.join(app.getPath('userData'), 'known-hosts.json'); +const credentialService = 'ssh-lite-client'; + +function getKeytar() { + if (keytarLib !== null) { + return keytarLib; + } + + try { + // optional dependency + // eslint-disable-next-line global-require, import/no-extraneous-dependencies + keytarLib = require('keytar'); + } catch (_err) { + keytarLib = undefined; + } + + return keytarLib; +} + +function profileCredentialAccount(profile) { + return `${profile.name}|${profile.host}|${profile.username}`; +} async function readJsonFile(filePath, fallbackValue) { try { @@ -272,11 +294,83 @@ ipcMain.handle('profiles:save', async (_event, profile) => { ipcMain.handle('profiles:delete', async (_event, profileName) => { const value = await readJsonFile(profilesFile(), { profiles: [] }); const profiles = Array.isArray(value.profiles) ? value.profiles : []; + const target = profiles.find((p) => p.name === profileName); const next = profiles.filter((p) => p.name !== profileName); await writeJsonFile(profilesFile(), { profiles: next }); + + if (target) { + const keytar = getKeytar(); + if (keytar) { + try { + await keytar.deletePassword(credentialService, profileCredentialAccount(target)); + } catch (_err) { + // ignore keychain delete errors + } + } + } + return { ok: true, profiles: next }; }); +ipcMain.handle('profiles:getSecret', async (_event, profile) => { + if (!profile || !profile.name || !profile.host || !profile.username) { + return { ok: false, error: 'Invalid profile for secret lookup' }; + } + + const keytar = getKeytar(); + if (!keytar) { + return { ok: false, error: 'Secure credential storage unavailable on this system' }; + } + + try { + const raw = await keytar.getPassword(credentialService, profileCredentialAccount(profile)); + if (!raw) { + return { ok: true, found: false }; + } + + const secret = JSON.parse(raw); + return { ok: true, found: true, secret }; + } catch (err) { + return { ok: false, error: err.message }; + } +}); + +ipcMain.handle('profiles:saveSecret', async (_event, profile, secret) => { + if (!profile || !profile.name || !profile.host || !profile.username) { + return { ok: false, error: 'Invalid profile for secret save' }; + } + + const keytar = getKeytar(); + if (!keytar) { + return { ok: false, error: 'Secure credential storage unavailable on this system' }; + } + + try { + await keytar.setPassword(credentialService, profileCredentialAccount(profile), JSON.stringify(secret || {})); + return { ok: true }; + } catch (err) { + return { ok: false, error: err.message }; + } +}); + +ipcMain.handle('profiles:deleteSecret', async (_event, profile) => { + if (!profile || !profile.name || !profile.host || !profile.username) { + return { ok: false, error: 'Invalid profile for secret delete' }; + } + + const keytar = getKeytar(); + if (!keytar) { + return { ok: false, error: 'Secure credential storage unavailable on this system' }; + } + + try { + await keytar.deletePassword(credentialService, profileCredentialAccount(profile)); + return { ok: true }; + } catch (err) { + return { ok: false, error: err.message }; + } +}); + ipcMain.handle('ssh:pickPrivateKey', async () => { const response = await dialog.showOpenDialog({ properties: ['openFile'], diff --git a/src/preload.js b/src/preload.js index 34f8044..758f7ba 100644 --- a/src/preload.js +++ b/src/preload.js @@ -9,6 +9,9 @@ contextBridge.exposeInMainWorld('api', { listProfiles: () => ipcRenderer.invoke('profiles:list'), saveProfile: (profile) => ipcRenderer.invoke('profiles:save', profile), deleteProfile: (profileName) => ipcRenderer.invoke('profiles:delete', profileName), + getProfileSecret: (profile) => ipcRenderer.invoke('profiles:getSecret', profile), + saveProfileSecret: (profile, secret) => ipcRenderer.invoke('profiles:saveSecret', profile, secret), + deleteProfileSecret: (profile) => ipcRenderer.invoke('profiles:deleteSecret', profile), startTerminal: () => ipcRenderer.invoke('terminal:start'), sendTerminal: (data) => ipcRenderer.invoke('terminal:send', data), resizeTerminal: (cols, rows) => ipcRenderer.invoke('terminal:resize', cols, rows), diff --git a/src/renderer/index.html b/src/renderer/index.html index 96ff10c..8e5c644 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -20,6 +20,7 @@

SSH Lite Client

+
diff --git a/src/renderer/renderer.js b/src/renderer/renderer.js index eb834ca..961bad3 100644 --- a/src/renderer/renderer.js +++ b/src/renderer/renderer.js @@ -9,6 +9,7 @@ const startPathEl = document.getElementById('startPath'); const profileSelectEl = document.getElementById('profileSelect'); const profileNameEl = document.getElementById('profileName'); const useKeyAuthEl = document.getElementById('useKeyAuth'); +const rememberCredsEl = document.getElementById('rememberCreds'); const keyAuthFieldsEl = document.getElementById('keyAuthFields'); const saveProfileBtn = document.getElementById('saveProfileBtn'); const deleteProfileBtn = document.getElementById('deleteProfileBtn'); @@ -654,10 +655,49 @@ function applyProfile(profile) { userEl.value = profile.username || ''; startPathEl.value = profile.startPath || '.'; - // Credentials are intentionally not persisted in profiles. passEl.value = ''; keyEl.value = ''; passphraseEl.value = ''; + useKeyAuthEl.checked = false; + rememberCredsEl.checked = false; + updateAuthModeUI(); +} + +async function loadProfileSecret(profile) { + const res = await window.api.getProfileSecret(profile); + if (!res.ok) { + // keychain may be unavailable; keep manual auth fallback + return; + } + + if (!res.found || !res.secret) { + return; + } + + const secret = res.secret; + rememberCredsEl.checked = true; + useKeyAuthEl.checked = !!secret.useKeyAuth; + passEl.value = secret.password || ''; + keyEl.value = secret.privateKey || ''; + passphraseEl.value = secret.passphrase || ''; + updateAuthModeUI(); +} + +async function syncProfileSecret(profile) { + if (!profile || !profile.name || !profile.host || !profile.username) { + return { ok: false, error: 'Profile needs name, host, and username for credential storage' }; + } + + if (rememberCredsEl.checked) { + return window.api.saveProfileSecret(profile, { + useKeyAuth: !!useKeyAuthEl.checked, + password: passEl.value || '', + privateKey: keyEl.value || '', + passphrase: passphraseEl.value || '' + }); + } + + return window.api.deleteProfileSecret(profile); } async function refreshProfiles() { @@ -825,12 +865,13 @@ pickKeyBtn.onclick = async () => { setStatus(`Loaded key from ${res.filePath}`); }; -profileSelectEl.onchange = () => { +profileSelectEl.onchange = async () => { const selectedName = profileSelectEl.value; const profile = profiles.find((p) => p.name === selectedName); if (!profile) return; applyProfile(profile); - setStatus('Profile loaded (password/private key are not stored in profiles)'); + await loadProfileSecret(profile); + setStatus(`Profile loaded ${rememberCredsEl.checked ? 'with saved credentials' : '(credentials not saved)'}`); }; useKeyAuthEl.onchange = () => { @@ -850,9 +891,20 @@ saveProfileBtn.onclick = async () => { setStatus(res.error || 'Failed to save profile', true); return; } + + const secretRes = await syncProfileSecret(payload); await refreshProfiles(); profileSelectEl.value = payload.name; - setStatus(`Saved profile ${payload.name}`); + + if (secretRes?.ok) { + setStatus(`Saved profile ${payload.name}${rememberCredsEl.checked ? ' + secure credentials' : ''}`); + return; + } + + setStatus( + `Saved profile ${payload.name}, but secure credential storage is unavailable${secretRes?.error ? ` (${secretRes.error})` : ''}`, + true + ); }; deleteProfileBtn.onclick = async () => { @@ -871,6 +923,7 @@ deleteProfileBtn.onclick = async () => { return; } await refreshProfiles(); + rememberCredsEl.checked = false; setStatus(`Deleted profile ${target}`); }; diff --git a/src/renderer/styles.css b/src/renderer/styles.css index a33e316..45e1f33 100644 --- a/src/renderer/styles.css +++ b/src/renderer/styles.css @@ -70,7 +70,7 @@ header p { .conn-top-row { display: grid; - grid-template-columns: minmax(240px, 1fr) minmax(160px, 220px) auto auto; + grid-template-columns: minmax(220px, 1fr) minmax(150px, 220px) minmax(220px, 1fr) auto auto; gap: 8px; align-items: center; } @@ -98,6 +98,10 @@ header p { gap: 8px; } +.inline-check-top { + justify-self: start; +} + .conn-row-key { grid-template-columns: auto minmax(220px, 1.1fr) 90px minmax(180px, 1fr); } @@ -429,7 +433,8 @@ body.resizing { grid-template-columns: 1fr auto auto; } - #profileName { + #profileName, + .inline-check-top { grid-column: 1 / -1; } @@ -446,7 +451,8 @@ body.resizing { @media (max-width: 960px) { .conn-top-row, .conn-row-basic, - .conn-row-key { + .conn-row-key, + .conn-row-options { grid-template-columns: 1fr; }