proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-05-03 12:42:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove all references to rpcenv (we can do this in the subclass).

Browse Source
This commit is contained in:
Dietmar Maurer 2017-01-15 08:34:46 +01:00
parent 6189d2ef0a
commit 58ddb769fb
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/APIServer/AnyEvent.pm
View File

@ -667,8 +667,6 @@ sub handle_api2_request {
#print Dumper($upload_state) if $upload_state; #print Dumper($upload_state) if $upload_state;
my $rpcenv = $self->{rpcenv};
my $params; my $params;
if ($upload_state) { if ($upload_state) {
@ -681,14 +679,10 @@ sub handle_api2_request {
my $clientip = $reqstate->{peer_host}; my $clientip = $reqstate->{peer_host};
$rpcenv->init_request();
my $res = $self->rest_handler($clientip, $method, $rel_uri, $auth, $params); my $res = $self->rest_handler($clientip, $method, $rel_uri, $auth, $params);
AnyEvent->now_update(); # in case somebody called sleep() AnyEvent->now_update(); # in case somebody called sleep()
$rpcenv->set_user(undef); # clear after request
my $upgrade = $r->header('upgrade'); my $upgrade = $r->header('upgrade');
$upgrade = lc($upgrade) if $upgrade; $upgrade = lc($upgrade) if $upgrade;
@ -765,9 +759,6 @@ sub handle_spice_proxy_request {
die "Port $spiceport is not allowed" if ($spiceport < 61000 || $spiceport > 61099); die "Port $spiceport is not allowed" if ($spiceport < 61000 || $spiceport > 61099);
my $rpcenv = $self->{rpcenv};
$rpcenv->init_request();
my $clientip = $reqstate->{peer_host}; my $clientip = $reqstate->{peer_host};
my $r = $reqstate->{request}; my $r = $reqstate->{request};
@ -1188,14 +1179,9 @@ sub unshift_read_header {
return; return;
} }
my $rpcenv = $self->{rpcenv};
# set environment variables
$rpcenv->set_user(undef);
$rpcenv->set_language('C');
$rpcenv->set_client_ip($reqstate->{peer_host});
eval { eval {
$auth = $self->auth_handler($method, $rel_uri, $ticket, $token); $auth = $self->auth_handler($method, $rel_uri, $ticket, $token,
$reqstate->{peer_host});
}; };
if (my $err = $@) { if (my $err = $@) {
# always delay unauthorized calls by 3 seconds # always delay unauthorized calls by 3 seconds
@ -1694,7 +1680,7 @@ sub generate_csrf_prevention_token {
} }
sub auth_handler { sub auth_handler {
my ($self, $method, $rel_uri, $ticket, $token) = @_; my ($self, $method, $rel_uri, $ticket, $token, $peer_host) = @_;
die "implement me"; die "implement me";