proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-07-21 02:32:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow stream download from path and over pvedaemon-proxy

Browse Source 
Allow specifying a filepath for stream=1 instead of either a path or fh
with stream=1.

With this in place, we can also just return the path to the proxy in
case we want to stream a response back, and let it read from the file
itself. This way, the pvedaemon is cut out of the transfer pipe.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2021-04-22 17:34:53 +02:00 committed by Thomas Lamprecht
parent 389ad881f9
commit 51841e98fa
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PVE/APIServer/AnyEvent.pm
View File

@ -410,9 +410,33 @@ sub send_file_start {
my $mime; my $mime;
if (ref($download) eq 'HASH') { if (ref($download) eq 'HASH') {
$fh = $download->{fh};
$mime = $download->{'content-type'}; $mime = $download->{'content-type'};
if ($download->{path} && $download->{stream} &&
$reqstate->{request}->header('PVEDisableProxy'))
{
# avoid double stream from a file, let the proxy handle it
die "internal error: file proxy streaming only available for pvedaemon\n"
if !$self->{trusted_env};
my $header = HTTP::Headers->new(
pvestreamfile => $download->{path},
Content_Type => $mime,
);
# we need some data so Content-Length gets set correctly and
# the proxy doesn't wait for more data - place a canary
my $resp = HTTP::Response->new(200, "OK", $header, "error canary");
$self->response($reqstate, $resp);
return;
}
if (!($fh = $download->{fh})) {
my $path = $download->{path};
die "internal error: {download} returned but neither fh not path given\n"
if !$path;
sysopen($fh, "$path", O_NONBLOCK | O_RDONLY)
or die "open stream path '$path' for reading failed: $!\n";
}
if ($download->{stream}) { if ($download->{stream}) {
my $header = HTTP::Headers->new(Content_Type => $mime); my $header = HTTP::Headers->new(Content_Type => $mime);
my $resp = HTTP::Response->new(200, "OK", $header); my $resp = HTTP::Response->new(200, "OK", $header);
@ -750,6 +774,7 @@ sub proxy_request {
eval { eval {
my $code = delete $hdr->{Status}; my $code = delete $hdr->{Status};
my $msg = delete $hdr->{Reason}; my $msg = delete $hdr->{Reason};
my $stream = delete $hdr->{pvestreamfile};
delete $hdr->{URL}; delete $hdr->{URL};
delete $hdr->{HTTPVersion}; delete $hdr->{HTTPVersion};
my $header = HTTP::Headers->new(%$hdr); my $header = HTTP::Headers->new(%$hdr);
@ -757,9 +782,16 @@ sub proxy_request {
$location =~ s|^http://localhost:85||; $location =~ s|^http://localhost:85||;
$header->header(Location => $location); $header->header(Location => $location);
} }
if ($stream) {
sysopen(my $fh, "$stream", O_NONBLOCK | O_RDONLY)
or die "open stream path '$stream' for forwarding failed: $!\n";
my $resp = HTTP::Response->new($code, $msg, $header, undef);
$self->response($reqstate, $resp, undef, 1, 0, $fh);
} else {
my $resp = HTTP::Response->new($code, $msg, $header, $body); my $resp = HTTP::Response->new($code, $msg, $header, $body);
# Note: disable compression, because body is already compressed # Note: disable compression, because body is already compressed
$self->response($reqstate, $resp, undef, 1); $self->response($reqstate, $resp, undef, 1);
}
}; };
warn $@ if $@; warn $@ if $@;
}); });