yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import: allow import from UNIX socket

Browse Source 
this allows forwarding over websockets without requiring a (free) port.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-04-13 14:16:33 +02:00
committed by Thomas Lamprecht
parent 9e47ad47ec
commit 1ebd925dcf
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PVE/CLI/pvesm.pm
View File

@ -7,6 +7,10 @@ use POSIX qw(O_RDONLY O_WRONLY O_CREAT O_TRUNC);
use Fcntl ':flock'; use Fcntl ':flock';
use File::Path; use File::Path;
use IO::Socket::IP;
use IO::Socket::UNIX;
use Socket qw(SOCK_STREAM);
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Cluster; use PVE::Cluster;
use PVE::INotify; use PVE::INotify;
@ -314,7 +318,8 @@ __PACKAGE__->register_method ({
}, },
filename => { filename => {
description => "Source file name. For '-' stdin is used, the " . description => "Source file name. For '-' stdin is used, the " .
"tcp://<IP-or-CIDR> format allows to use a TCP connection as input. " . "tcp://<IP-or-CIDR> format allows to use a TCP connection, " .
"the unix://PATH-TO-SOCKET format a UNIX socket as input." .
"Else, the file is treated as common file.", "Else, the file is treated as common file.",
type => 'string', type => 'string',
}, },
@ -392,6 +397,25 @@ __PACKAGE__->register_method ({
alarm $prev_alarm; alarm $prev_alarm;
close($socket); close($socket);
$infh = \*$client;
} elsif ($filename =~ m!^unix://(.*)$!) {
my $socket_path = $1;
my $socket = IO::Socket::UNIX->new(
Type => SOCK_STREAM(),
Local => $socket_path,
Listen => 1,
) or die "failed to open socket: $!\n";
print "ready\n";
*STDOUT->flush();
my $prev_alarm = alarm 0;
local $SIG{ALRM} = sub { die "timed out waiting for client\n" };
alarm 30;
my $client = $socket->accept; # Wait for a client
alarm $prev_alarm;
close($socket);
$infh = \*$client; $infh = \*$client;
} else { } else {
sysopen($infh, $filename, O_RDONLY) sysopen($infh, $filename, O_RDONLY)