From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 826FD72A51 for ; Tue, 13 Apr 2021 14:16:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 606722A95A for ; Tue, 13 Apr 2021 14:16:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A88CF2A8FC for ; Tue, 13 Apr 2021 14:16:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6FD7F45A74 for ; Tue, 13 Apr 2021 14:16:55 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:33 +0200 Message-Id: <20210413121640.3602975-16-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> References: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pvesm.pm] Subject: [pve-devel] [PATCH storage] import: allow import from UNIX socket X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 12:16:57 -0000 this allows forwarding over websockets without requiring a (free) port. Signed-off-by: Fabian Grünbichler --- PVE/CLI/pvesm.pm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm index 7b46897..9206188 100755 --- a/PVE/CLI/pvesm.pm +++ b/PVE/CLI/pvesm.pm @@ -7,6 +7,10 @@ use POSIX qw(O_RDONLY O_WRONLY O_CREAT O_TRUNC); use Fcntl ':flock'; use File::Path; +use IO::Socket::IP; +use IO::Socket::UNIX; +use Socket qw(SOCK_STREAM); + use PVE::SafeSyslog; use PVE::Cluster; use PVE::INotify; @@ -314,7 +318,8 @@ __PACKAGE__->register_method ({ }, filename => { description => "Source file name. For '-' stdin is used, the " . - "tcp:// format allows to use a TCP connection as input. " . + "tcp:// 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.", type => 'string', }, @@ -392,6 +397,25 @@ __PACKAGE__->register_method ({ alarm $prev_alarm; 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; } else { sysopen($infh, $filename, O_RDONLY) -- 2.20.1