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 22FFA75253 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 F423DDFF8 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 BC59ADFC3 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 C76524626C 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:35 +0200 Message-Id: <20210421111539.29261-7-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. [anyevent.pm] Subject: [pve-devel] [PATCH RESEND http-server 06/10] allow 'download' to be passed from API handler 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 PVE::HTTPServer in pve-manager wraps the API return value in a 'data' element, look for a 'download' element there too to allow an API call to instruct the HTTP server to return a file via path or filehandle. Signed-off-by: Stefan Reiter --- PVE/APIServer/AnyEvent.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm index 8a1af54..60a2a1c 100644 --- a/PVE/APIServer/AnyEvent.pm +++ b/PVE/APIServer/AnyEvent.pm @@ -812,7 +812,10 @@ sub handle_api2_request { $delay = 0 if $delay < 0; } - if (defined(my $download = $res->{download})) { + my $download = $res->{download}; + $download //= $res->{data}->{download} + if defined($res->{data}) && ref($res->{data}) eq 'HASH'; + if (defined($download)) { send_file_start($self, $reqstate, $download); return; } -- 2.20.1