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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 87D46EC97 for ; Mon, 12 Dec 2022 17:05:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6DD6E6D5B for ; Mon, 12 Dec 2022 17:05:41 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 12 Dec 2022 17:05:40 +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 0354744E9D for ; Mon, 12 Dec 2022 17:05:40 +0100 (CET) Message-ID: <66c5e78a-b26e-bace-5e90-9e09684f5fb9@proxmox.com> Date: Mon, 12 Dec 2022 17:05:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20221212150756.221191-1-m.heiserer@proxmox.com> From: Daniel Tschlatscher In-Reply-To: <20221212150756.221191-1-m.heiserer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.118 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH v3 http-server 1/3] multipart upload: fix upload of files starting with newlines 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: Mon, 12 Dec 2022 16:05:41 -0000 Testing this series in the Browser, with curl and postman, I couldn't find any issues anymore, more details below. Code looks good to me as well. Tested-by: Daniel Tschlatscher Reviewed-by: Daniel Tschlatscher Browser/GUI: ✅ Uploading files with 0B, 1B, 1kB, 17kB, 1MB, 1GB, 10GB ✅ Uploading file with a SHA256 checksum In curl and Postman: ✅ Changing the extension in the first boundary (error) ✅ Adding additional headers leading or trailing (ignored) ✅ Specifying no headers in first boundary (error) ✅ Inconsistent boundary parameter in the Content-Type header (error) ✅ Inconsistent boundary in the body (error) ✅ Whitespaces at the beginning of the file are not discarded ✅ Arbitrary input after the last boundary ✅ Nothing after last boundary ✅ Mixed \n and \r\n in body On 12/12/22 16:07, Matthias Heiserer wrote: > Currently, if a file starts with a newline, it gets removed > and the uploda succeeds (provided no hash is given). > > 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 f397a8c..545c122 100644 > --- a/src/PVE/APIServer/AnyEvent.pm > +++ b/src/PVE/APIServer/AnyEvent.pm > @@ -1217,7 +1217,7 @@ sub file_upload_multipart { > if ($hdl->{rbuf} =~ > s/^${delim_re} > Content-Disposition:\ (.*?);\ name="(.*?)";\ filename="([^"]+)"${newline_re} > - Content-Type:\ \S*\s+ > + Content-Type:\ \S*${newline_re}{2} > //sxx > ) { > assert_form_disposition($1);