From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH http-server] upload: allow whitespaces in filenames
Date: Fri, 4 Nov 2022 11:56:44 +0100 [thread overview]
Message-ID: <20221104105644.1808000-1-d.csapak@proxmox.com> (raw)
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 <d.csapak@proxmox.com>
---
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
next reply other threads:[~2022-11-04 10:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 10:56 Dominik Csapak [this message]
2022-11-04 13:17 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221104105644.1808000-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox