ensure compatibility with libpve-http-server-perl

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/PMG/HTTPServer.pm b/src/PMG/HTTPServer.pm
index 8c29059cd0606953090f31db1587ce77a5214f95..eb48b5f97f9a69f5bce27c32758d6f1ba1cb0922 100755 (executable)
--- a/src/PMG/HTTPServer.pm
+++ b/src/PMG/HTTPServer.pm
@@ -42,7 +42,7 @@ sub generate_csrf_prevention_token {
 }
 
 sub auth_handler {
 }
 
 sub auth_handler {

-    my ($self, $method, $rel_uri, $ticket, $token, $peer_host) = @_;
+    my ($self, $method, $rel_uri, $ticket, $token, $api_token, $peer_host) = @_;

 
     my $rpcenv = $self->{rpcenv};
 
 
     my $rpcenv = $self->{rpcenv};
 


@@ -66,6 +66,8 @@ sub auth_handler {
 
     if ($require_auth) {
 
 
     if ($require_auth) {
 

+       die "API tokens not implemented\n" if $api_token;
+

        die "No ticket\n" if !$ticket;
 
        if ($ticket =~ m/^PMGQUAR:/) {
        die "No ticket\n" if !$ticket;
 
        if ($ticket =~ m/^PMGQUAR:/) {

diff --git a/src/PMG/Service/pmgproxy.pm b/src/PMG/Service/pmgproxy.pm
index e88d757e34381800317095308154c3e9326d36f2..ea58b5082182ff679ee8e83902f4a01a975d16be 100755 (executable)
--- a/src/PMG/Service/pmgproxy.pm
+++ b/src/PMG/Service/pmgproxy.pm
@@ -192,7 +192,7 @@ sub get_index {
                $lang = $newlang;
            }
        }
                $lang = $newlang;
            }
        }

-       my $ticket = PVE::APIServer::Formatter::extract_auth_cookie($cookie, $server->{cookie_name});
+       my $ticket = PVE::APIServer::Formatter::extract_auth_value($cookie, $server->{cookie_name});

 
        if ($ticket =~ m/^PMGQUAR:/) {
            $username = PMG::Ticket::verify_quarantine_ticket($ticket, 1);
 
        if ($ticket =~ m/^PMGQUAR:/) {
            $username = PMG::Ticket::verify_quarantine_ticket($ticket, 1);