marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add ssh reuse defaults and remote daemon scaffold

Browse source
This commit is contained in:
Lawrence Chen 2026-02-20 23:32:48 -08:00
parent f46813a029
commit aaf2ef4c3a
7 changed files with 291 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
CLI/cmux.swift
View file

@ -1885,6 +1885,15 @@ struct CMUXCLI {
private func buildSSHCommandText(_ options: SSHCommandOptions) -> String {
var parts: [String] = ["ssh", "-o", "StrictHostKeyChecking=accept-new"]
if !hasSSHOptionKey(options.sshOptions, key: "ControlMaster") {
parts += ["-o", "ControlMaster=auto"]
}
if !hasSSHOptionKey(options.sshOptions, key: "ControlPersist") {
parts += ["-o", "ControlPersist=600"]
}
if !hasSSHOptionKey(options.sshOptions, key: "ControlPath") {
parts += ["-o", "ControlPath=\(defaultSSHControlPathTemplate())"]
}
if let port = options.port {
parts += ["-p", String(port)]
}
@ -1905,6 +1914,23 @@ struct CMUXCLI {
return shellFeatures + " " + sshCommand
}
private func hasSSHOptionKey(_ options: [String], key: String) -> Bool {
let loweredKey = key.lowercased()
for option in options {
let trimmed = option.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else { continue }
let token = trimmed.split(whereSeparator: { $0 == "=" || $0.isWhitespace }).first.map(String.init)?.lowercased()
if token == loweredKey {
return true
}
}
return false
}
private func defaultSSHControlPathTemplate() -> String {
"/tmp/cmux-ssh-\(getuid())-%C"
}
private func shellQuote(_ value: String) -> String {
let safePattern = "^[A-Za-z0-9_@%+=:,./-]+$"
if value.range(of: safePattern, options: .regularExpression) != nil {