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

handler: remove support for directly returned download info

Browse Source 
this was only used by PMG's HttpServer and for non-API file responses. all of
those got dropped there in favour of always returning an object like

{
    data => {
        download => {
            [download info here]
        },
        [..],
    },
    [..],
}

in case of PMG, or passing in a download hash in case of APIServer internal
calls.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2024-09-19 15:19:45 +02:00 committed by Thomas Lamprecht
parent e1f830d1e3
commit af9d2fe4f6
1 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,7 +429,9 @@ sub send_file_start {
my $nocomp; my $nocomp;
my $mime; my $mime;
if (ref($download) eq 'HASH') { die "invalid download information passed: '$download'\n"
if ref($download) ne 'HASH';
$mime = $download->{'content-type'}; $mime = $download->{'content-type'};
my $encoding = $download->{'content-encoding'}; my $encoding = $download->{'content-encoding'};
my $disposition = $download->{'content-disposition'}; my $disposition = $download->{'content-disposition'};
@ -468,12 +470,8 @@ sub send_file_start {
my $resp = HTTP::Response->new(200, "OK", $header); my $resp = HTTP::Response->new(200, "OK", $header);
$self->response($reqstate, $resp, undef, 1, 0, $fh); $self->response($reqstate, $resp, undef, 1, 0, $fh);
return; return;
} } elsif (!$mime) {
} else { my $filename = $download->{path};
my $filename = $download;
$fh = IO::File->new($filename, '<') ||
die "unable to open file '$filename' - $!\n";
my ($ext) = $filename =~ m/\.([^.]*)$/; my ($ext) = $filename =~ m/\.([^.]*)$/;
my $ext_info = $file_extension_info->{$ext}; my $ext_info = $file_extension_info->{$ext};
@ -985,8 +983,8 @@ sub handle_api2_request {
$delay = 0 if $delay < 0; $delay = 0 if $delay < 0;
} }
my $download = $res->{download}; my $download;
$download //= $res->{data}->{download} $download = $res->{data}->{download}
if defined($res->{data}) && ref($res->{data}) eq 'HASH'; if defined($res->{data}) && ref($res->{data}) eq 'HASH';
if (defined($download)) { if (defined($download)) {
if ($res->{info}->{download}) { if ($res->{info}->{download}) {
@ -1178,7 +1176,7 @@ sub handle_request {
if (my $filename = $handler->{file}) { if (my $filename = $handler->{file}) {
my $fh = IO::File->new($filename) || my $fh = IO::File->new($filename) ||
die "unable to open file '$filename' - $!\n"; die "unable to open file '$filename' - $!\n";
send_file_start($self, $reqstate, $filename); send_file_start($self, $reqstate, { path => $filename });
} else { } else {
die "internal error - no handler"; die "internal error - no handler";
} }
@ -1196,7 +1194,7 @@ sub handle_request {
my $filename = "$dir$file"; my $filename = "$dir$file";
my $fh = IO::File->new($filename) || my $fh = IO::File->new($filename) ||
die "unable to open file '$filename' - $!\n"; die "unable to open file '$filename' - $!\n";
send_file_start($self, $reqstate, $filename); send_file_start($self, $reqstate, { path => $filename });
return; return;
} }
} }