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

HTTPServer.pm: make split_abs_uri() private

Browse Source 
and rename baseuri to base_uri to be consistent

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-01-12 10:38:12 +01:00
parent 68d2366c32
commit 7edaceb484
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/HTTPServer.pm
View File

@ -49,16 +49,14 @@ my $known_methods = {
DELETE => 1, DELETE => 1,
}; };
sub split_abs_uri { my $split_abs_uri = sub {
my ($self, $abs_uri) = @_; my ($abs_uri, $base_uri) = @_;
my $baseuri = $self->{baseuri}; my ($format, $rel_uri) = $abs_uri =~ m/^\Q$base_uri\E\/+([a-z][a-z0-9]+)(\/.*)?$/;
my ($format, $rel_uri) = $abs_uri =~ m/^\Q$baseuri\E\/+([a-z][a-z0-9]+)(\/.*)?$/;
$rel_uri = '/' if !$rel_uri; $rel_uri = '/' if !$rel_uri;
return wantarray ? ($rel_uri, $format) : $rel_uri; return wantarray ? ($rel_uri, $format) : $rel_uri;
} };
# generic formatter support # generic formatter support
@ -732,7 +730,7 @@ sub handle_api2_request {
eval { eval {
my $r = $reqstate->{request}; my $r = $reqstate->{request};
my ($rel_uri, $format) = $self->split_abs_uri($path); my ($rel_uri, $format) = &$split_abs_uri($path, $self->{base_uri});
my $formatter = get_formatter($format); my $formatter = get_formatter($format);
@ -973,7 +971,7 @@ sub handle_spice_proxy_request {
sub handle_request { sub handle_request {
my ($self, $reqstate, $auth, $method, $path) = @_; my ($self, $reqstate, $auth, $method, $path) = @_;
my $baseuri = $self->{baseuri}; my $base_uri = $self->{base_uri};
eval { eval {
my $r = $reqstate->{request}; my $r = $reqstate->{request};
@ -982,7 +980,7 @@ sub handle_request {
# we re-enable timeout in response() # we re-enable timeout in response()
$reqstate->{hdl}->timeout(0); $reqstate->{hdl}->timeout(0);
if ($path =~ m/^\Q$baseuri\E/) { if ($path =~ m/^\Q$base_uri\E/) {
$self->handle_api2_request($reqstate, $auth, $method, $path); $self->handle_api2_request($reqstate, $auth, $method, $path);
return; return;
} }
@ -1235,7 +1233,7 @@ sub unshift_read_header {
} }
my $pveclientip = $r->header('PVEClientIP'); my $pveclientip = $r->header('PVEClientIP');
my $baseuri = $self->{baseuri}; my $base_uri = $self->{base_uri};
# fixme: how can we make PVEClientIP header trusted? # fixme: how can we make PVEClientIP header trusted?
if ($self->{trusted_env} && $pveclientip) { if ($self->{trusted_env} && $pveclientip) {
@ -1258,12 +1256,12 @@ sub unshift_read_header {
} }
$self->handle_spice_proxy_request($reqstate, $connect_str, $vmid, $node, $port); $self->handle_spice_proxy_request($reqstate, $connect_str, $vmid, $node, $port);
return; return;
} elsif ($path =~ m/^\Q$baseuri\E/) { } elsif ($path =~ m/^\Q$base_uri\E/) {
my $token = $r->header('CSRFPreventionToken'); my $token = $r->header('CSRFPreventionToken');
my $cookie = $r->header('Cookie'); my $cookie = $r->header('Cookie');
my $ticket = extract_auth_cookie($cookie, $self->{cookie_name}); my $ticket = extract_auth_cookie($cookie, $self->{cookie_name});
my ($rel_uri, $format) = $self->split_abs_uri($path); my ($rel_uri, $format) = &$split_abs_uri($path, $self->{base_uri});
if (!$format) { if (!$format) {
$self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri"); $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri");
return; return;
@ -1653,7 +1651,7 @@ sub new {
my $self = bless { %args }, $class; my $self = bless { %args }, $class;
$self->{cookie_name} //= 'PVEAuthCookie'; $self->{cookie_name} //= 'PVEAuthCookie';
$self->{baseuri} //= "/api2"; $self->{base_uri} //= "/api2";
# init inotify # init inotify
PVE::INotify::inotify_init(); PVE::INotify::inotify_init();