cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #909 from phreaker0/socket-rename 

rename ssh control socket to avoid problem with length limits and con…
This commit is contained in:
Jim Salter 2024-04-17 09:11:04 -04:00 committed by GitHub
parent 19fc237476 a059054ffb
commit fdbbe28ac7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncoid
View File

@ -1786,8 +1786,15 @@ sub getssh {
if ($rhost ne "") { if ($rhost ne "") {
if ($remoteuser eq 'root' || $args{'no-privilege-elevation'}) { $isroot = 1; } else { $isroot = 0; } if ($remoteuser eq 'root' || $args{'no-privilege-elevation'}) { $isroot = 1; } else { $isroot = 0; }
my $sanitizedrhost = $rhost;
$sanitizedrhost =~ s/[^a-zA-Z0-9-]//g;
# unix socket path have a length limit of about 104 characters so make sure it's not exceeded
$sanitizedrhost = substr($sanitizedrhost, 0, 50);
# now we need to establish a persistent master SSH connection # now we need to establish a persistent master SSH connection
$socket = "/tmp/syncoid-$rhost-" . time() . "-" . int(rand(10000)); $socket = "/tmp/syncoid-$sanitizedrhost-" . time() . "-" . $$ . "-" . int(rand(10000));
open FH, "$sshcmd -M -S $socket -o ControlPersist=1m $args{'sshport'} $rhost exit |"; open FH, "$sshcmd -M -S $socket -o ControlPersist=1m $args{'sshport'} $rhost exit |";
close FH; close FH;