bdy 1.22.94-master → 1.22.94

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.94-master",
+  "version": "1.22.94",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/command/sandbox/ssh.js

@@ -0,0 +1,99 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../utils");
+const texts_1 = require("../../texts");
+const output_1 = __importDefault(require("../../output"));
+const input_1 = __importDefault(require("../../input"));
+const path_1 = require("path");
+const commandSandboxSsh = (0, utils_1.newCommand)('ssh', texts_1.DESC_COMMAND_SANDBOX_SSH);
+commandSandboxSsh.alias('connect');
+commandSandboxSsh.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandSandboxSsh.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxSsh.option('-i, --identity <path>', texts_1.OPTION_SANDBOX_SSH_IDENTITY);
+commandSandboxSsh.option('--print', texts_1.OPTION_SANDBOX_SSH_PRINT);
+commandSandboxSsh.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
+commandSandboxSsh.argument('[args...]', texts_1.OPTION_SANDBOX_SSH_ARGS);
+commandSandboxSsh.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_SSH}`);
+// ssh keeps the FIRST value it is given for a keyword, so every default below would silently beat
+// the same -o coming from the user. Only add ours when they did not set that keyword themselves.
+const hasSshOption = (args, keyword) => {
+    const prefix = `${keyword.toLowerCase()}=`;
+    return args.some((arg, i) => {
+        let value = '';
+        if (args[i - 1] === '-o')
+            value = arg;
+        else if (arg.startsWith('-o'))
+            value = arg.slice(2);
+        return value.toLowerCase().startsWith(prefix);
+    });
+};
+const buildSshArgs = (host, port, identity, extra) => {
+    const args = ['-p', String(port)];
+    if (identity)
+        args.push('-i', identity);
+    // The host key belongs to the agent inside the sandbox and is regenerated for every new sandbox,
+    // while the edge host is shared and only the forward port varies - a recycled port would trip a
+    // host key mismatch in the user's own known_hosts. Keep those keys in ~/.bdy instead.
+    if (!hasSshOption(extra, 'UserKnownHostsFile')) {
+        args.push('-o', `UserKnownHostsFile=${(0, path_1.join)((0, utils_1.getHomeDirectory)(), 'known_hosts')}`);
+    }
+    if (!hasSshOption(extra, 'StrictHostKeyChecking')) {
+        args.push('-o', 'StrictHostKeyChecking=accept-new');
+    }
+    // Only publickey reaches a shell: on the password path the agent accepts without opening the
+    // proxy connection to the sandbox sshd, so pty and shell requests are rejected afterwards.
+    if (!hasSshOption(extra, 'PreferredAuthentications')) {
+        args.push('-o', 'PreferredAuthentications=publickey');
+    }
+    args.push(host, ...extra);
+    return args;
+};
+const quoteArg = (arg) => /[\s'"\\$`*?[\]{}();&|<>#~]/.test(arg) ? `'${arg.replace(/'/g, "'\\''")}'` : arg;
+commandSandboxSsh.action(async (identifier, args, options) => {
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const project = input_1.default.restApiProject(options.project);
+    const client = input_1.default.restApiTokenClient();
+    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
+    if (!sandbox_id) {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
+    }
+    let sandbox = await client.getSandbox(workspace, sandbox_id);
+    if (sandbox.status !== utils_1.SANDBOX_STATUS.RUNNING) {
+        output_1.default.exitError((0, texts_1.ERR_SANDBOX_NOT_RUNNING)(identifier, sandbox.status || 'UNKNOWN'));
+    }
+    if (!sandbox.ssh_host || !sandbox.ssh_port) {
+        // A sandbox that just became RUNNING may not have its forward port registered yet
+        try {
+            sandbox = await client.sandboxWaitForPorts(workspace, sandbox_id, 30);
+        }
+        catch {
+            output_1.default.exitError((0, texts_1.ERR_SANDBOX_SSH_NO_ACCESS)(identifier));
+        }
+    }
+    const sshArgs = buildSshArgs(sandbox.ssh_host, sandbox.ssh_port, options.identity, args || []);
+    if (options.print) {
+        output_1.default.normal(['ssh', ...sshArgs].map(quoteArg).join(' '));
+        output_1.default.exitNormal();
+    }
+    const which = require('which');
+    const resolved = await which('ssh', { nothrow: true });
+    if (!resolved) {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_SSH_MISSING);
+    }
+    const { spawn } = require('cross-spawn');
+    const child = spawn(resolved, sshArgs, { stdio: 'inherit' });
+    // The terminal sends Ctrl+C to the whole foreground group: exiting here would detach a live ssh
+    // and hand the prompt back while it still owns the tty. Let ssh be the one that handles it.
+    const ignoreSignals = ['SIGINT', 'SIGQUIT', 'SIGTSTP'];
+    ignoreSignals.forEach((signal) => process.on(signal, () => { }));
+    child.on('error', () => {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_SSH_MISSING);
+    });
+    child.on('close', (code, signal) => {
+        output_1.default.exitCode(signal ? 1 : code || 0);
+    });
+});
+exports.default = commandSandboxSsh;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.94-master",
+  "version": "1.22.94",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",