proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-16 14:49:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTPServer.pm: factor out code which refers to PVE::Cluster

Browse Source 
This will make it easier to move HTTPServer to a separate package.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2017-01-12 12:14:53 +01:00 committed by Fabian Grünbichler
parent 7e017024a7
commit 7e5f7c618b
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PVE/HTTPServer.pm
View File

@ -636,12 +636,12 @@ sub proxy_request {
# we don't care about intermediate or root certificates # we don't care about intermediate or root certificates
return 1 if $depth != 0; return 1 if $depth != 0;
# check server certificate against cache of pinned FPs # check server certificate against cache of pinned FPs
return PVE::Cluster::check_cert_fingerprint($cert); return $self->check_cert_fingerprint($cert);
}, },
}; };
# load and cache cert fingerprint if first time we proxy to this node # load and cache cert fingerprint if first time we proxy to this node
PVE::Cluster::initialize_cert_cache($node); $self->initialize_cert_cache($node);
my $w; $w = http_request( my $w; $w = http_request(
$method => $target, $method => $target,
@ -852,8 +852,7 @@ sub handle_spice_proxy_request {
my $remip; my $remip;
if ($node ne 'localhost' && PVE::INotify::nodename() !~ m/^$node$/i) { if ($node ne 'localhost' && PVE::INotify::nodename() !~ m/^$node$/i) {
$remip = PVE::Cluster::remote_node_ip($node); $remip = $self->remote_node_ip($node);
die "unable to get remote IP address for node '$node'\n" if !$remip;
print "REMOTE CONNECT $vmid, $remip, $connect_str\n" if $self->{debug}; print "REMOTE CONNECT $vmid, $remip, $connect_str\n" if $self->{debug};
} else { } else {
print "$$: CONNECT $vmid, $node, $spiceport\n" if $self->{debug}; print "$$: CONNECT $vmid, $node, $spiceport\n" if $self->{debug};
@ -1841,7 +1840,7 @@ sub rest_handler {
if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) { if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
die "unable to proxy file uploads" if $auth->{isUpload}; die "unable to proxy file uploads" if $auth->{isUpload};
$remip = PVE::Cluster::remote_node_ip($node); $remip = $self->remote_node_ip($node);
} }
}; };
if (my $err = $@) { if (my $err = $@) {
@ -1879,6 +1878,28 @@ sub rest_handler {
return $resp; return $resp;
} }
sub check_cert_fingerprint {
my ($self, $cert) = @_;
return PVE::Cluster::check_cert_fingerprint($cert);
}
sub initialize_cert_cache {
my ($self, $node) = @_;
PVE::Cluster::initialize_cert_cache($node);
}
sub remote_node_ip {
my ($self, $node) = @_;
my $remip = PVE::Cluster::remote_node_ip($node);
die "unable to get remote IP address for node '$node'\n" if !$remip;
return $remip;
}
sub run { sub run {
my ($self) = @_; my ($self) = @_;