Skip to content

Fix Windows SSH compatibility: ProxyCommand, key ACLs, and ESM require #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaunymca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Windows SSH compatibility: ProxyCommand, key ACLs, and ESM require #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/core/swarm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,16 @@ function resolveModelProvider(): "vers" {
/** SSH helpers — minimal, just what swarm needs */

function sshArgs(keyPath: string, vmId: string): string[] {
const devNull = process.platform === "win32" ? "NUL" : "/dev/null";
return [
"-i", keyPath,
"-o", "StrictHostKeyChecking=no",
"-o", "UserKnownHostsFile=/dev/null",
"-o", `UserKnownHostsFile=${devNull}`,
"-o", "LogLevel=ERROR",
"-o", "ConnectTimeout=30",
"-o", "ServerAliveInterval=15",
"-o", "ServerAliveCountMax=4",
"-o", `ProxyCommand=openssl s_client -connect %h:443 -servername %h -quiet 2>/dev/null`,
"-o", `ProxyCommand=openssl s_client -connect %h:443 -servername %h -quiet`,
`root@${vmId}.vm.vers.sh`,
];
}
Expand Down
14 changes: 11 additions & 3 deletions src/core/vers-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import { execFile, spawn } from "node:child_process";
import { readFileSync } from "node:fs";
import { writeFile, mkdir } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand Down Expand Up @@ -89,7 +90,7 @@ export function loadVersKeyFromDisk(): string {
try {
const homedir = process.env.HOME || process.env.USERPROFILE || "";
const keysPath = join(homedir, ".vers", "keys.json");
const data = require("fs").readFileSync(keysPath, "utf-8");
const data = readFileSync(keysPath, "utf-8");
const parsed = JSON.parse(data);
return parsed?.keys?.VERS_API_KEY || "";
} catch {
Expand Down Expand Up @@ -236,6 +237,12 @@ export class VersClient {
await mkdir(keyDir, { recursive: true });
const keyPath = join(keyDir, `vers-${vmId.slice(0, 12)}.pem`);
await writeFile(keyPath, keyInfo.ssh_private_key, { mode: 0o600 });
if (process.platform === "win32") {
await new Promise<void>((res, rej) => {
execFile("icacls", [keyPath, "/inheritance:r", "/grant:r", `${process.env.USERNAME}:F`],
(err) => err ? rej(err) : res());
});
}
this.keyPathCache.set(vmId, keyPath);
return keyPath;
}
Expand All @@ -244,15 +251,16 @@ export class VersClient {
async sshArgs(vmId: string): Promise<string[]> {
const keyPath = await this.ensureKeyFile(vmId);
const hostname = `${vmId}.vm.vers.sh`;
const devNull = process.platform === "win32" ? "NUL" : "/dev/null";
return [
"-i", keyPath,
"-o", "IdentitiesOnly=yes",
"-o", "IdentityAgent=none",
"-o", "StrictHostKeyChecking=no",
"-o", "UserKnownHostsFile=/dev/null",
"-o", `UserKnownHostsFile=${devNull}`,
"-o", "LogLevel=ERROR",
"-o", "ConnectTimeout=30",
"-o", `ProxyCommand=openssl s_client -connect %h:443 -servername %h -quiet 2>/dev/null`,
"-o", `ProxyCommand=openssl s_client -connect %h:443 -servername %h -quiet`,
`root@${hostname}`,
];
}
Expand Down