An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(ssh): verify mux readiness before reusing socket
Andras Bacsaia13fb3cf0001
diff --git a/app/Helpers/SshMultiplexingHelper.php b/app/Helpers/SshMultiplexingHelper.phpindex 6984dac4b0..db139d1107 100644--- a/app/Helpers/SshMultiplexingHelper.php+++ b/app/Helpers/SshMultiplexingHelper.php@@ -28,13 +28,18 @@ class SshMultiplexingHelperpublic static function removeMuxFile(Server $server): void{- $closeCommand = 'ssh -O exit -o ControlPath='.self::muxSocket($server).' ';+ $closeCommand = self::muxControlCommand($server, 'exit');+ Process::run($closeCommand);+ }++ private static function muxControlCommand(Server $server, string $operation): string+ {+ $command = "ssh -O {$operation} -o ControlPath=".self::muxSocket($server).' ';if (data_get($server, 'settings.is_cloudflare_tunnel')) {- $closeCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';+ $command .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';}- $closeCommand .= self::escapedUserAtHost($server);- Process::run($closeCommand);+ return $command.self::escapedUserAtHost($server);}public static function generateScpCommand(Server $server, string $source, string $dest): string@@ -128,24 +133,31 @@ class SshMultiplexingHelper$lockDirectory = self::muxLockDirectory($server);$lockTimeout = (int) config('constants.ssh.mux_lock_timeout');+ $checkCommand = self::muxControlCommand($server, 'check');+$script = <<<'SH'cmd=$1socket=$2lock=$3timeout=$4+check=$5run_command() {sh -c "$cmd"}-if [ -S "$socket" ]; then+mux_ready() {+ [ -S "$socket" ] && sh -c "$check" >/dev/null 2>&1+}++if mux_ready; thenrun_commandexit $?fiwaited=0while ! mkdir "$lock" 2>/dev/null; do- if [ -S "$socket" ]; then+ if mux_ready; thenrun_commandexit $?fi@@ -171,7 +183,7 @@ sh -c "$cmd" &child=$!for _ in 1 2 3 4 5 6 7 8 9 10; do- if [ -S "$socket" ] || ! kill -0 "$child" 2>/dev/null; then+ if mux_ready || ! kill -0 "$child" 2>/dev/null; thenbreakfisleep 0.1@@ -186,7 +198,8 @@ SH;.escapeshellarg($command).' '.escapeshellarg($muxSocket).' '.escapeshellarg($lockDirectory).' '- .escapeshellarg((string) $lockTimeout);+ .escapeshellarg((string) $lockTimeout).' '+ .escapeshellarg($checkCommand);}private static function escapedUserAtHost(Server $server): stringdiff --git a/tests/Feature/SshMultiplexingLockTest.php b/tests/Feature/SshMultiplexingLockTest.phpindex c39d5a48f3..ff8ff20bc5 100644--- a/tests/Feature/SshMultiplexingLockTest.php+++ b/tests/Feature/SshMultiplexingLockTest.php@@ -71,8 +71,8 @@ it('adds native openssh multiplexing options to ssh commands', function () {->toContain("-o ControlPath=/var/www/html/storage/app/ssh/mux/mux_{$server->uuid}")->toContain("/var/www/html/storage/app/ssh/mux/mux_{$server->uuid}.lock")->toContain('-o ControlPersist=3600')- ->not->toContain('ssh -fN')- ->not->toContain('-O check');+ ->toContain('-O check')+ ->not->toContain('ssh -fN');Process::assertNothingRan();});@@ -105,8 +105,8 @@ it('adds native openssh multiplexing options to scp commands', function () {->toContain("-o ControlPath=/var/www/html/storage/app/ssh/mux/mux_{$server->uuid}")->toContain("/var/www/html/storage/app/ssh/mux/mux_{$server->uuid}.lock")->toContain('-o ControlPersist=3600')- ->not->toContain('ssh -fN')- ->not->toContain('-O check');+ ->toContain('-O check')+ ->not->toContain('ssh -fN');Process::assertNothingRan();});