rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: ipv6 scp should use -6 flag

Browse source
This commit is contained in:
Andras Bacsai 2024-10-02 08:15:03 +02:00
parent 73e38ff951
commit 4d86b556a4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Helpers/SshMultiplexingHelper.php
View file

@ -94,7 +94,9 @@ public static function generateScpCommand(Server $server, string $source, string
$muxPersistTime = config('constants.ssh.mux_persist_time'); $muxPersistTime = config('constants.ssh.mux_persist_time');
$scp_command = "timeout $timeout scp "; $scp_command = "timeout $timeout scp ";
if ($server->isIpv6()) {
$scp_command .= '-6 ';
}
if (self::isMultiplexingEnabled()) { if (self::isMultiplexingEnabled()) {
$scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} "; $scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
self::ensureMultiplexedConnection($server); self::ensureMultiplexedConnection($server);

5
app/Models/Server.php
View file

@ -1221,4 +1221,9 @@ public function storageCheck(): ?string
return instant_remote_process($commands, $this, false); return instant_remote_process($commands, $this, false);
} }
public function isIpv6(): bool
{
return str($this->ip)->contains(':');
}
} }