Skip to content

Commit 22910ff

Browse files
fix(ssh): an ssh config alias keeps following its Port after it changes (pingdotgg#35063)
1 parent f10a502 commit 22910ff

2 files changed

Lines changed: 45 additions & 1 deletion

File tree

‎packages/ssh/src/tunnel.test.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,49 @@ describe("ssh tunnel scripts", () => {
468468
}),
469469
);
470470

471+
it.effect("reconnects a saved alias through the port its ssh config names now", () =>
472+
Effect.gen(function* () {
473+
let configPort = 53_791;
474+
const tunnelPorts: Array<string | undefined> = [];
475+
const spawner = ChildProcessSpawner.make((command) => {
476+
const args = commandArgs(command);
477+
if (args.includes("-G")) {
478+
return Effect.succeed(
479+
makeSuccessfulProcess(`hostname 127.0.0.1\nuser developer\nport ${configPort}\n`),
480+
);
481+
}
482+
if (args.includes("-N")) {
483+
tunnelPorts.push(args[args.indexOf("-p") + 1]);
484+
return Effect.succeed(makeRunningProcess(() => undefined));
485+
}
486+
return Effect.succeed(makeSuccessfulProcess('{"remotePort":3773}\n'));
487+
});
488+
const layer = Layer.mergeAll(
489+
NodeServices.layer,
490+
NodeCrypto.layer,
491+
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
492+
Layer.succeed(HttpClient.HttpClient, testHttpClient),
493+
Layer.succeed(NetService.NetService, testNetService),
494+
SshAuth.SshPasswordPrompt.disabledLayer,
495+
SshTunnel.SshEnvironmentManager.layer({ resolveCliRunner: Effect.succeed(ARCHIVE) }),
496+
);
497+
yield* Effect.gen(function* () {
498+
const manager = yield* SshTunnel.SshEnvironmentManager;
499+
const added = yield* manager.ensureEnvironment({
500+
alias: "lima-sandbox",
501+
hostname: "lima-sandbox",
502+
username: null,
503+
port: null,
504+
});
505+
// The VM restarts on a new port; the client reconnects with the target it saved.
506+
yield* manager.disconnectEnvironment(added.target);
507+
configPort = 53_812;
508+
yield* manager.ensureEnvironment(added.target);
509+
assert.deepStrictEqual(tunnelPorts, ["53791", "53812"]);
510+
}).pipe(Effect.provide(layer), Effect.scoped);
511+
}),
512+
);
513+
471514
it.effect("fails with a readiness error when ssh never connects", () =>
472515
Effect.gen(function* () {
473516
const tunnelSpawned = yield* Deferred.make<void>();

‎packages/ssh/src/tunnel.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1870,7 +1870,8 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
18701870
issuedPairingToken: pairingToken !== null,
18711871
});
18721872
return {
1873-
target: entry.target,
1873+
// Callers save this target; a port ssh -G resolved would pin the alias's current Port.
1874+
target: { ...entry.target, port: target.port },
18741875
httpBaseUrl: entry.httpBaseUrl,
18751876
wsBaseUrl: entry.wsBaseUrl,
18761877
pairingToken,

0 commit comments

Comments
 (0)