Reported in the forum: https://forum.proxmox.com/threads/image-upload-fails-after-upgrading-from-7-1-to-7-3.119051/#post-516517
When additional headers existed in the request body, the upload failed. With this patch, all additional headers get ignored. Example: The following upload would fail because no headers were expected after Content-Disposition. ``` --EPIHyQJFC5ftgoXHMe8-Jc6E7FqA4oMb0QBfOTz Content-Disposition: form-data; name="content" Content-Type: text/plain; charset=ISO-8859-1 iso ``` Fixed upload was tested using * Curl * GUI * Apache HttpClient 5 Signed-off-by: Matthias Heiserer <[email protected]> --- src/PVE/APIServer/AnyEvent.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index f397a8c..db89ff2 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -1201,11 +1201,19 @@ sub file_upload_multipart { $rstate->{phase} = 1; } + my $remove_until_data = sub { + my ($hdl) = @_; + # remove any remaining multipart "headers" like Content-Type + $hdl->{rbuf} =~ s/^.*?${newline_re}{2}//s; + }; + my $extract_form_disposition = sub { my ($name) = @_; - if ($hdl->{rbuf} =~ s/^${delim_re}Content-Disposition: (.*?); name="$name"(.*?)($delim_re)/$3/s) { + if ($hdl->{rbuf} =~ s/^${delim_re}Content-Disposition: (.*?); name="$name"(.*)$/$2/s) { assert_form_disposition($1); - $rstate->{params}->{$name} = trim($2); + $remove_until_data->($hdl); + $hdl->{rbuf} =~ s/^(.*?)(${delim_re})/$2/s; + $rstate->{params}->{$name} = trim($1); } }; @@ -1224,6 +1232,7 @@ sub file_upload_multipart { die "wrong field name '$2' for file upload, expected 'filename'" if $2 ne "filename"; $rstate->{phase} = 2; $rstate->{params}->{filename} = trim($3); + $remove_until_data->($hdl); } } -- 2.30.2 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
