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 076B8752BA for ; Wed, 21 Apr 2021 13:24:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1BC1DFF6 for ; Wed, 21 Apr 2021 13:23:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 C2BBEDFC9 for ; Wed, 21 Apr 2021 13:23: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 F3EFA46271 for ; Wed, 21 Apr 2021 13:15:45 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Wed, 21 Apr 2021 13:15:34 +0200 Message-Id: <20210421111539.29261-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210421111539.29261-1-s.reiter@proxmox.com> References: <20210421111539.29261-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [pbsclient.pm] Subject: [pve-devel] [PATCH common 05/10] PBSClient: add file_restore_extract function 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: Wed, 21 Apr 2021 11:24:28 -0000 *_prepare creates a fifo for streaming data back to clients directly, filefile_restore_extract blocks and should be called from a background worker - while it is running outcoming data can be read from the FIFO. Signed-off-by: Stefan Reiter --- src/PVE/PBSClient.pm | 63 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index f6b46b2..3d30155 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -5,9 +5,10 @@ use strict; use warnings; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); +use File::Temp qw(tempdir); use IO::File; use JSON; -use POSIX qw(strftime ENOENT); +use POSIX qw(mkfifo strftime ENOENT); use PVE::JSONSchema qw(get_standard_option); use PVE::Tools qw(run_command file_set_contents file_get_contents file_read_firstline $IPV6RE); @@ -343,4 +344,64 @@ sub file_restore_list { ); } +# call sync from API, returns a fifo path for streaming data to clients, +# pass it to file_restore_extract to start transfering data +sub file_restore_extract_prepare { + my ($self) = @_; + + my $tmpdir = tempdir(); + mkfifo("$tmpdir/fifo", 0600) + or die "creating file download fifo '$tmpdir/fifo' failed: $!\n"; + + # allow reading data for proxy user + my $wwwid = getpwnam('www-data') || + die "getpwnam failed"; + chown $wwwid, -1, "$tmpdir" + or die "changing permission on fifo dir '$tmpdir' failed: $!\n"; + chown $wwwid, -1, "$tmpdir/fifo" + or die "changing permission on fifo '$tmpdir/fifo' failed: $!\n"; + + return "$tmpdir/fifo"; +} + +# this blocks while data is transfered, call this from a background worker +sub file_restore_extract { + my ($self, $output_file, $snapshot, $filepath, $base64) = @_; + + my $ret = eval { + local $SIG{ALRM} = sub { die "got timeout\n" }; + alarm(30); + sysopen(my $fh, "$output_file", O_WRONLY) + or die "open target '$output_file' for writing failed: $!\n"; + alarm(0); + + my $startcmd = sub { + my ($cmd, %opts) = @_; + + delete $opts{outfunc}; + delete $opts{logfunc}; + $opts{errfunc} = sub { print $_[0], "\n"; }; + + my $fn = fileno($fh); + $opts{output} = ">&$fn"; + + run_command($cmd, %opts); + }; + + return run_raw_client_cmd( + $self, "extract", + [ $snapshot, $filepath, "-", "--base64", $base64 ? 1 : 0 ], + binary => "proxmox-file-restore", + startcmd => $startcmd, + ); + }; + + unlink($output_file); + $output_file =~ s/fifo$//; + rmdir($output_file) if -d $output_file; + + die "file restore task failed: $@" if $@; + return $ret; +} + 1; -- 2.20.1