proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-07-23 15:52:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

header processing: extract into separate subroutine

Browse Source 
The code concerned with processing the request's header in
`unshift_read_header` is moved into the new `process_header`
subroutine.

If `process_header` doesn't return early, it returns `1` for further
control flow purposes.

Some minor things are formatted or renamed for readability's sake.

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
This commit is contained in:
Max Carrara 2023-03-03 18:29:48 +01:00 committed by Fabian Grünbichler
parent 21bab96c48
commit bda4864145
1 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1316,51 +1316,12 @@ sub unshift_read_header {
$r->push_header($state->{key}, $state->{val}) $r->push_header($state->{key}, $state->{val})
if $state->{key}; if $state->{key};
if (!$known_methods->{$method}) {
my $resp = HTTP::Response->new(HTTP_NOT_IMPLEMENTED, "method '$method' not available");
$self->response($reqstate, $resp);
return;
}
my $conn = $r->header('Connection');
my $accept_enc = $r->header('Accept-Encoding');
$reqstate->{accept_gzip} = ($accept_enc && $accept_enc =~ m/gzip/) ? 1 : 0;
if ($conn) {
$reqstate->{keep_alive} = 0 if $conn =~ m/close/oi;
} else {
if ($reqstate->{proto}->{ver} < 1001) {
$reqstate->{keep_alive} = 0;
}
}
my $te = $r->header('Transfer-Encoding');
if ($te && lc($te) eq 'chunked') {
# Handle chunked transfer encoding
$self->error($reqstate, 501, "chunked transfer encoding not supported");
return;
} elsif ($te) {
$self->error($reqstate, 501, "Unknown transfer encoding '$te'");
return;
}
my $pveclientip = $r->header('PVEClientIP');
my $base_uri = $self->{base_uri}; my $base_uri = $self->{base_uri};
# fixme: how can we make PVEClientIP header trusted?
if ($self->{trusted_env} && $pveclientip) {
$reqstate->{peer_host} = $pveclientip;
} else {
$r->header('PVEClientIP', $reqstate->{peer_host});
}
my $len = $r->header('Content-Length'); my $len = $r->header('Content-Length');
my $host_header = $r->header('Host'); my $host_header = $r->header('Host');
if (my $rpcenv = $self->{rpcenv}) {
$rpcenv->set_request_host($host_header);
}
$self->process_header($reqstate) or return;
# header processing complete - authenticate now # header processing complete - authenticate now
my $auth = {}; my $auth = {};
@ -1514,6 +1475,58 @@ sub unshift_read_header {
}); });
}; };
sub process_header {
my ($self, $reqstate) = @_;
my $request = $reqstate->{request};
my $path = uri_unescape($request->uri->path());
my $method = $request->method();
if (!$known_methods->{$method}) {
my $resp = HTTP::Response->new(HTTP_NOT_IMPLEMENTED, "method '$method' not available");
$self->response($reqstate, $resp);
return;
}
my $conn = $request->header('Connection');
my $accept_enc = $request->header('Accept-Encoding');
$reqstate->{accept_gzip} = ($accept_enc && $accept_enc =~ m/gzip/) ? 1 : 0;
if ($conn) {
$reqstate->{keep_alive} = 0 if $conn =~ m/close/oi;
} else {
if ($reqstate->{proto}->{ver} < 1001) {
$reqstate->{keep_alive} = 0;
}
}
my $te = $request->header('Transfer-Encoding');
if ($te && lc($te) eq 'chunked') {
# Handle chunked transfer encoding
$self->error($reqstate, 501, "chunked transfer encoding not supported");
return;
} elsif ($te) {
$self->error($reqstate, 501, "Unknown transfer encoding '$te'");
return;
}
my $pveclientip = $request->header('PVEClientIP');
# fixme: how can we make PVEClientIP header trusted?
if ($self->{trusted_env} && $pveclientip) {
$reqstate->{peer_host} = $pveclientip;
} else {
$request->header('PVEClientIP', $reqstate->{peer_host});
}
if (my $rpcenv = $self->{rpcenv}) {
$rpcenv->set_request_host($request->header('Host'));
}
return 1;
}
sub push_request_header { sub push_request_header {
my ($self, $reqstate) = @_; my ($self, $reqstate) = @_;