proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-05-29 21:01:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multipart upload: factor out content-disposition extraction

Browse Source 
and improve the boundary variable helper name by adding a _re postfix
and using snake case everywhere.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-09-29 16:29:25 +02:00
parent 42ec24969f
commit 59128f6b5a
1 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/PVE/APIServer/AnyEvent.pm
View File

@ -1179,6 +1179,10 @@ sub handle_request {
} }
} }
my sub assert_form_disposition {
die "wrong Content-Disposition '$_[0]' in multipart, expected 'form-data'\n" if $_[0] ne 'form-data';
}
sub file_upload_multipart { sub file_upload_multipart {
my ($self, $reqstate, $auth, $method, $path, $rstate) = @_; my ($self, $reqstate, $auth, $method, $path, $rstate) = @_;
@ -1192,52 +1196,36 @@ sub file_upload_multipart {
my $hdl = $reqstate->{hdl}; my $hdl = $reqstate->{hdl};
my $startlen = length($hdl->{rbuf}); my $startlen = length($hdl->{rbuf});
my $newline = qr/\015?\012/; my $newline_re = qr/\015?\012/;
my $delimiter = qr/--\Q$boundary\E${newline}/; my $delim_re = qr/--\Q$boundary\E${newline_re}/;
my $closeDelimiter = qr/--\Q$boundary\E--${newline}/; my $close_delim_re = qr/--\Q$boundary\E--${newline_re}/;
my $check_disposition = sub {
my ($disp) = @_;
die "wrong Content-Disposition in multipart, expected `form-data` - abort upload"
if $disp ne 'form-data';
};
# Phase 0 - preserve boundary, but remove everything before # Phase 0 - preserve boundary, but remove everything before
if ($rstate->{phase} == 0 && $hdl->{rbuf} =~ s/^.*?($delimiter)/$1/xs) { if ($rstate->{phase} == 0 && $hdl->{rbuf} =~ s/^.*?($delim_re)/$1/s) {
$rstate->{read} += $startlen - length($hdl->{rbuf}); $rstate->{read} += $startlen - length($hdl->{rbuf});
$rstate->{phase} = 1; $rstate->{phase} = 1;
} }
# Phase 1 - parse payload without file data my $extract_form_disposition = sub {
if ($rstate->{phase} == 1) { my ($name) = @_;
if ($hdl->{rbuf} =~ s/^${delim_re}Content-Disposition: (.*?); name="$name"(.*?)($delim_re)/$3/s) {
assert_form_disposition($1);
$rstate->{params}->{$name} = $trim->($2);
}
};
if ($rstate->{phase} == 1) { # Phase 1 - parse payload without file data
$extract_form_disposition->('content');
$extract_form_disposition->('checksum-algorithm');
$extract_form_disposition->('checksum');
if ($hdl->{rbuf} =~ if ($hdl->{rbuf} =~
s/^${delimiter}Content-Disposition: (.*?); name="content"(.*?)($delimiter)/$3/s s/^${delim_re}
) { Content-Disposition:\ (.*?);\ name="(.*?)";\ filename="([^"]+)"${newline_re}
$check_disposition->($1);
$rstate->{params}->{content} = $trim->($2);
}
if ( $hdl->{rbuf} =~
s/^${delimiter}Content-Disposition: (.*?); name="checksum-algorithm"(.*?)($delimiter)/$3/s
) {
$check_disposition->($1);
$rstate->{params}->{"checksum-algorithm"} = $trim->($2);
}
if ( $hdl->{rbuf} =~
s/^${delimiter}Content-Disposition: (.*?); name="checksum"(.*?)($delimiter)/$3/s
) {
$check_disposition->($1);
$rstate->{params}->{checksum} = $trim->($2);
}
if ( $hdl->{rbuf} =~
s/^${delimiter}
Content-Disposition:\ (.*?);\ name="(.*?)";\ filename="([^"]+)"${newline}
Content-Type:\ \S*\s+ Content-Type:\ \S*\s+
//sxx //sxx
) { ) {
$check_disposition->($1); assert_form_disposition($1);
die "wrong field `name` for file upload, expected `filename` - abort upload" die "wrong field `name` for file upload, expected `filename` - abort upload"
if $2 ne "filename"; if $2 ne "filename";
$rstate->{phase} = 2; $rstate->{phase} = 2;
@ -1247,7 +1235,7 @@ sub file_upload_multipart {
# Phase 2 - dump content into file # Phase 2 - dump content into file
if ($rstate->{phase} == 2) { if ($rstate->{phase} == 2) {
if ($hdl->{rbuf} =~ s/^(.*?)${newline}?+${closeDelimiter}.*$//s) { if ($hdl->{rbuf} =~ s/^(.*?)${newline_re}?+${close_delim_re}.*$//s) {
my $rest = $1; my $rest = $1;
my $len = length($rest); my $len = length($rest);
die "write to temporary file failed - $!" die "write to temporary file failed - $!"