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

fix proxy loop assertion

Browse Source
This commit is contained in:
Dietmar Maurer 2013-07-23 08:34:56 +02:00
parent f60bd577b7
commit 40ca6e9c11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/HTTPServer.pm
View File

@ -462,21 +462,21 @@ sub handle_api2_request {
$rpcenv->set_user(undef); # clear after request $rpcenv->set_user(undef); # clear after request
if ($res->{proxy}) { if (my $host = $res->{proxy}) {
if ($self->{trusted_env}) { if ($self->{trusted_env}) {
$self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy not allowed"); $self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy not allowed");
return; return;
} }
if ($r->header('PVEDisableProxy')) { if ($host ne 'localhost' && $r->header('PVEDisableProxy')) {
$self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy loop detected"); $self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy loop detected");
return; return;
} }
$res->{proxy_params}->{tmpfilename} = $reqstate->{tmpfilename} if $upload_state; $res->{proxy_params}->{tmpfilename} = $reqstate->{tmpfilename} if $upload_state;
$self->proxy_request($reqstate, $clientip, $res->{proxy}, $method, $self->proxy_request($reqstate, $clientip, $host, $method,
$r->uri, $auth->{ticket}, $auth->{token}, $res->{proxy_params}); $r->uri, $auth->{ticket}, $auth->{token}, $res->{proxy_params});
return; return;