Skip to content

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.

fix(ssh): remove mux first-use lock wrapper

Andras Bacsaia05878650954
diff --git a/app/Helpers/SshMultiplexingHelper.php b/app/Helpers/SshMultiplexingHelper.php
index db139d1107..cf92deb2a7 100644
--- a/app/Helpers/SshMultiplexingHelper.php
+++ b/app/Helpers/SshMultiplexingHelper.php
@@ -46,14 +46,13 @@ class SshMultiplexingHelper
{
$sshConfig = self::serverSshConfiguration($server);
$sshKeyLocation = $sshConfig['sshKeyLocation'];
- $multiplexingEnabled = self::isMultiplexingEnabled();
$scpCommand = 'timeout '.config('constants.ssh.command_timeout').' scp ';
if ($server->isIpv6()) {
$scpCommand .= '-6 ';
}
- if ($multiplexingEnabled) {
+ if (self::isMultiplexingEnabled()) {
$scpCommand .= self::multiplexingOptions($server);
}
@@ -64,14 +63,10 @@ class SshMultiplexingHelper
$scpCommand .= self::getCommonSshOptions($server, $sshKeyLocation, self::getConnectionTimeout($server), config('constants.ssh.server_interval'), isScp: true);
if ($server->isIpv6()) {
- $scpCommand .= "{$source} ".escapeshellarg($server->user).'@['.escapeshellarg($server->ip)."]:{$dest}";
- } else {
- $scpCommand .= "{$source} ".self::escapedUserAtHost($server).":{$dest}";
+ return $scpCommand."{$source} ".escapeshellarg($server->user).'@['.escapeshellarg($server->ip)."]:{$dest}";
}
- return $multiplexingEnabled
- ? self::withFirstUseMuxLock($server, $scpCommand)
- : $scpCommand;
+ return $scpCommand."{$source} ".self::escapedUserAtHost($server).":{$dest}";
}
public static function generateSshCommand(Server $server, string $command, bool $disableMultiplexing = false): string
@@ -82,13 +77,12 @@ class SshMultiplexingHelper
$sshConfig = self::serverSshConfiguration($server);
$sshKeyLocation = $sshConfig['sshKeyLocation'];
- $multiplexingEnabled = ! $disableMultiplexing && self::isMultiplexingEnabled();
self::validateSshKey($server->privateKey);
$sshCommand = 'timeout '.config('constants.ssh.command_timeout').' ssh ';
- if ($multiplexingEnabled) {
+ if (! $disableMultiplexing && self::isMultiplexingEnabled()) {
$sshCommand .= self::multiplexingOptions($server);
}
@@ -101,13 +95,9 @@ class SshMultiplexingHelper
$delimiter = base64_encode(Hash::make($command));
$command = str_replace($delimiter, '', $command);
- $sshCommand .= self::escapedUserAtHost($server)." 'bash -se' << \\$delimiter".PHP_EOL
+ return $sshCommand.self::escapedUserAtHost($server)." 'bash -se' << \\$delimiter".PHP_EOL
.$command.PHP_EOL
.$delimiter;
-
- return $multiplexingEnabled
- ? self::withFirstUseMuxLock($server, $sshCommand)
- : $sshCommand;
}
private static function multiplexingOptions(Server $server): string
@@ -122,86 +112,6 @@ class SshMultiplexingHelper
return '/var/www/html/storage/app/ssh/mux/mux_'.$server->uuid;
}
- private static function muxLockDirectory(Server $server): string
- {
- return self::muxSocket($server).'.lock';
- }
-
- private static function withFirstUseMuxLock(Server $server, string $command): string
- {
- $muxSocket = self::muxSocket($server);
- $lockDirectory = self::muxLockDirectory($server);
- $lockTimeout = (int) config('constants.ssh.mux_lock_timeout');
-
- $checkCommand = self::muxControlCommand($server, 'check');
-
- $script = <<<'SH'
-cmd=$1
-socket=$2
-lock=$3
-timeout=$4
-check=$5
-
-run_command() {
- sh -c "$cmd"
-}
-
-mux_ready() {
- [ -S "$socket" ] && sh -c "$check" >/dev/null 2>&1
-}
-
-if mux_ready; then
- run_command
- exit $?
-fi
-
-waited=0
-while ! mkdir "$lock" 2>/dev/null; do
- if mux_ready; then
- run_command
- exit $?
- fi
-
- if [ "$waited" -ge "$timeout" ]; then
- run_command
- exit $?
- fi
-
- waited=$((waited + 1))
- sleep 1
-done
-
-cleanup() {
- if [ -n "${child:-}" ] && kill -0 "$child" 2>/dev/null; then
- kill "$child" 2>/dev/null
- fi
- rmdir "$lock" 2>/dev/null
-}
-trap cleanup INT TERM HUP
-
-sh -c "$cmd" &
-child=$!
-
-for _ in 1 2 3 4 5 6 7 8 9 10; do
- if mux_ready || ! kill -0 "$child" 2>/dev/null; then
- break
- fi
- sleep 0.1
-done
-
-rmdir "$lock" 2>/dev/null
-wait "$child"
-exit $?
-SH;
-
- return 'sh -c '.escapeshellarg($script).' -- '
- .escapeshellarg($command).' '
- .escapeshellarg($muxSocket).' '
- .escapeshellarg($lockDirectory).' '
- .escapeshellarg((string) $lockTimeout).' '
- .escapeshellarg($checkCommand);
- }
-
private static function escapedUserAtHost(Server $server): string
{
return escapeshellarg($server->user).'@'.escapeshellarg($server->ip);
diff --git a/tests/Feature/SshMultiplexingLockTest.php b/tests/Feature/SshMultiplexingLockTest.php
index ff8ff20bc5..fee4ec6328 100644
--- a/tests/Feature/SshMultiplexingLockTest.php
+++ b/tests/Feature/SshMultiplexingLockTest.php
@@ -66,12 +66,10 @@ it('adds native openssh multiplexing options to ssh commands', function () {
$command = SshMultiplexingHelper::generateSshCommand($server, 'echo ok');
expect($command)
- ->toStartWith('sh -c')
->toContain('-o ControlMaster=auto')
->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')
- ->toContain('-O check')
+ ->not->toContain('-O check')
->not->toContain('ssh -fN');
Process::assertNothingRan();
@@ -85,7 +83,6 @@ it('omits native multiplexing options when ssh multiplexing is disabled for a co
$command = SshMultiplexingHelper::generateSshCommand($server, 'echo ok', disableMultiplexing: true);
expect($command)
- ->not->toStartWith('sh -c')
->not->toContain('-o ControlMaster=auto')
->not->toContain('-o ControlPath=')
->not->toContain('-o ControlPersist=');
@@ -100,12 +97,10 @@ it('adds native openssh multiplexing options to scp commands', function () {
$command = SshMultiplexingHelper::generateScpCommand($server, '/tmp/source', '/tmp/dest');
expect($command)
- ->toStartWith('sh -c')
->toContain('-o ControlMaster=auto')
->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')
- ->toContain('-O check')
+ ->not->toContain('-O check')
->not->toContain('ssh -fN');
Process::assertNothingRan();