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 B8D30DFB5 for ; Tue, 6 Dec 2022 16:17:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8752430010 for ; Tue, 6 Dec 2022 16:16:36 +0100 (CET) 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 for ; Tue, 6 Dec 2022 16:16:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 18FFE4447C for ; Tue, 6 Dec 2022 16:16:35 +0100 (CET) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Tue, 6 Dec 2022 16:16:29 +0100 Message-Id: <20221206151629.86019-2-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221206151629.86019-1-m.heiserer@proxmox.com> References: <20221206151629.86019-1-m.heiserer@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.172 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 http-server 2/2] fix multipart upload: header order 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, 06 Dec 2022 15:17:06 -0000 When the Content-Disposition header wasn't the first, i.e. upload of ``` --XVH95dt1-A3J8mWiLCmHCW4roSC7-gBntjATBy-- Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: form-data; name="content" ``` would fail. These headers now also get ignored, as we don't use them. Fixed upload was tested using │ * Curl │ * GUI │ * Apache HttpClient 5 Signed-off-by: Matthias Heiserer --- src/PVE/APIServer/AnyEvent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index db89ff2..c26a439 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -1209,7 +1209,7 @@ sub file_upload_multipart { my $extract_form_disposition = sub { my ($name) = @_; - if ($hdl->{rbuf} =~ s/^${delim_re}Content-Disposition: (.*?); name="$name"(.*)$/$2/s) { + if ($hdl->{rbuf} =~ s/^${delim_re}.*?Content-Disposition: (.*?); name="$name"(.*)$/$2/s) { assert_form_disposition($1); $remove_until_data->($hdl); $hdl->{rbuf} =~ s/^(.*?)(${delim_re})/$2/s; -- 2.30.2