From: Matthias Heiserer <m.heiserer@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
John Hollowell <jhollowe@johnhollowell.com>
Subject: Re: [pve-devel] [PATCH http-server 1/1] fix #4344: http-server: ignore unused multipart headers
Date: Mon, 14 Nov 2022 11:33:48 +0100 [thread overview]
Message-ID: <de181d95-9f1c-8f07-1e58-37c538861280@proxmox.com> (raw)
In-Reply-To: <20221113234810.6642-2-jhollowe@johnhollowell.com>
Thanks for the patch! I must have overlooked that in my original patch.
Didn't think to test with proxmoxer :)
In case you haven't do so already, please submit the contributor license
agreement. We require that in order to use your patch.
https://www.proxmox.com/en/proxmox-ve/get-involved
On 14.11.2022 00:48, John Hollowell wrote:
> Signed-off-by: John Hollowell <jhollowe@johnhollowell.com>
> ---
> src/PVE/APIServer/AnyEvent.pm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
> index f397a8c..d958642 100644
> --- a/src/PVE/APIServer/AnyEvent.pm
> +++ b/src/PVE/APIServer/AnyEvent.pm
> @@ -1215,15 +1215,15 @@ sub file_upload_multipart {
> $extract_form_disposition->('checksum');
>
> if ($hdl->{rbuf} =~
> - s/^${delim_re}
> - Content-Disposition:\ (.*?);\ name="(.*?)";\ filename="([^"]+)"${newline_re}
> - Content-Type:\ \S*\s+
> - //sxx
> + s/^${delim_re}Content-Disposition:\ (.*?);\ name="(.*?)";\ filename="([^"]+)"//sxx
We should drop the xx and escaping of spaces, it's not needed for the
single line.
> ) {
> assert_form_disposition($1);
> die "wrong field name '$2' for file upload, expected 'filename'" if $2 ne "filename";
> $rstate->{phase} = 2;
> $rstate->{params}->{filename} = trim($3);
> +
> + # remove any remaining multipart "headers" like Content-Type
> + $hdl->{rbuf} =~ s/^.*?${newline_re}{2}//s
I'm thinking of whether it would be better to include this line in the
other one, or not. Probably more clearer the way it is now.
> }
> }
>
> --
> 2.30.2
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
> Reviewed-by: Matthias Heiserer <m.heiserer@proxmox.com>
Tested-by: Matthias Heiserer <m.heiserer@proxmox.com>
next prev parent reply other threads:[~2022-11-14 10:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 23:48 [pve-devel] [PATCH http-server 0/1] fix #4344: " John Hollowell
2022-11-13 23:48 ` [pve-devel] [PATCH http-server 1/1] fix #4344: http-server: " John Hollowell
2022-11-14 10:33 ` Matthias Heiserer [this message]
2022-11-16 10:05 ` Matthias Heiserer
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=de181d95-9f1c-8f07-1e58-37c538861280@proxmox.com \
--to=m.heiserer@proxmox.com \
--cc=jhollowe@johnhollowell.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.