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 655FF8CAC2 for ; Fri, 4 Nov 2022 11:57:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 41FA416D6 for ; Fri, 4 Nov 2022 11:56:46 +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 ; Fri, 4 Nov 2022 11:56:45 +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 1E16B43ECA for ; Fri, 4 Nov 2022 11:56:45 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 4 Nov 2022 11:56:44 +0100 Message-Id: <20221104105644.1808000-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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] upload: allow whitespaces in filenames 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: Fri, 04 Nov 2022 10:57:16 -0000 some fields (e.g. filename) can contain spaces, but our 'trim' function, would only return the value until the first whitespace character instead of removing leading/trailing white space. this lead to giving the wrong filename to the api call (e.g. 'foo' instead of 'foo (1).iso') which would reject it because of the 'wrong' extension this patch fixes that by using a more robust regex replacement fixes commit: 0fbcbc2 ("fix #3990: multipart upload: rework to fix uploading small files") Signed-off-by: Dominik Csapak --- while looking at the code, i noticed there is now the unused function 'parse_content_disposition', so i'd suggest we either use that instead, or remove it if we don't need it src/PVE/APIServer/AnyEvent.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index 4296ded..81adf50 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -1187,8 +1187,9 @@ sub file_upload_multipart { my ($self, $reqstate, $auth, $method, $path, $rstate) = @_; my $trim = sub { - $_[0] =~ /\s*(\S+)/; - return $1; + my $value = shift; + $value =~ s/^\s+|\s+$//g; + return $value; }; eval { -- 2.30.2