pass basic server configuration to formatter functions

diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm
index acf43a0347345b16c3a7ef3e400ff852b8dee0d4..0cf8cbcbc2d9f60abddb8c38324dcbc92482eab6 100755 (executable)
--- a/PVE/APIServer/AnyEvent.pm
+++ b/PVE/APIServer/AnyEvent.pm
@@ -733,9 +733,8 @@ sub handle_api2_request {
            $delay = 0 if $delay < 0;
        }
 
-       my $csrfgen_func = $self->can('generate_csrf_prevention_token');
-       my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $params, $path,
-                                             $auth, $csrfgen_func, $self->{title});
+       my ($raw, $ct, $nocomp) = $formatter->($res, $res->{data}, $params, $path,
+                                              $auth, $self->{formatter_config});
 
        my $resp;
        if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
@@ -1187,7 +1186,8 @@ sub unshift_read_header {
                        # always delay unauthorized calls by 3 seconds
                        my $delay = 3;
                        if (my $formatter = PVE::APIServer::Formatter::get_login_formatter($format)) {
-                           my ($raw, $ct, $nocomp) = &$formatter($path, $auth);
+                           my ($raw, $ct, $nocomp) =
+                               $formatter->($path, $auth, $self->{formatter_config});
                            my $resp;
                            if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
                                $resp = $raw;
@@ -1568,6 +1568,15 @@ sub new {
     $self->{dirs} //= {};
     $self->{title} //= 'API Inspector';
 
+    # formatter_config: we pass some configuration values to the Formatter
+    $self->{formatter_config} = {};
+    foreach my $p (qw(cookie_name base_uri title)) {
+       $self->{formatter_config}->{$p} = $self->{$p};
+    }
+    $self->{formatter_config}->{csrfgen_func} =
+       $self->can('generate_csrf_prevention_token');
+
+    # add default dirs which includes jquery and bootstrap
     my $base = '/usr/share/libpve-http-server-perl';
     add_dirs($self->{dirs}, '/css/' => "$base/css/");
     add_dirs($self->{dirs}, '/js/' => "$base/js/");
@@ -1690,7 +1699,6 @@ sub auth_handler {
     #    userid => $username,
     #    age => $age,
     #    isUpload => $isUpload,
-    #    cookie_name => $self->{cookie_name},
     #};
 }
 

diff --git a/PVE/APIServer/Formatter/Bootstrap.pm b/PVE/APIServer/Formatter/Bootstrap.pm
index f04c80589619633180b48ce095b4741f27531517..acfcabbde1063db8a0f185648595ed05f9b930a8 100644 (file)
--- a/PVE/APIServer/Formatter/Bootstrap.pm
+++ b/PVE/APIServer/Formatter/Bootstrap.pm
@@ -59,17 +59,17 @@ PVE.open_vm_console = function(node, vmid) {
 _EOJS
 
 sub new {
-    my ($class, $res, $url, $auth, $csrfgen_func, $title) = @_;
+    my ($class, $res, $url, $auth, $config) = @_;
 
     my $self = bless {
        url => $url,
-       title => $title,
-       cookie_name => $auth->{cookie_name},
+       title => $config->{title},
+       cookie_name => $config->{cookie_name},
        js => '',
     };
 
     if (my $username = $auth->{userid}) {
-       $self->{csrftoken} = &$csrfgen_func($username);
+       $self->{csrftoken} = $config->{csrfgen_func}->($username);
     }
 
     return $self;

diff --git a/PVE/APIServer/Formatter/HTML.pm b/PVE/APIServer/Formatter/HTML.pm
index b19e3e81d495dd2fcc4ef2d8e4d14718440e55e5..7a4f64fe25f13538d093232aa69eb8cf9534f949 100644 (file)
--- a/PVE/APIServer/Formatter/HTML.pm
+++ b/PVE/APIServer/Formatter/HTML.pm
@@ -14,11 +14,18 @@ use PVE::APIServer::Formatter::Standard;
 my $portal_format = 'html';
 my $portal_ct = 'text/html;charset=UTF-8';
 
-my $baseurl = "/api2/$portal_format";
-my $login_url = "$baseurl/access/ticket";
+my $get_portal_base_url = sub {
+    my ($config) = @_;
+    return "$config->{base_uri}/$portal_format";
+};
+
+my $get_portal_login_url = sub {
+    my ($config) = @_;
+    return "$config->{base_uri}/$portal_format/access/ticket";
+};
 
 sub render_page {
-    my ($doc, $html, $title) = @_;
+    my ($doc, $html, $config) = @_;
 
     my $items = [];
 
@@ -26,11 +33,12 @@ sub render_page {
        tag => 'li',
        cn => {
            tag => 'a',
-           href => $login_url,
+           href => $get_portal_login_url->($config),
            onClick => "PVE.delete_auth_cookie();",
            text => "Logout",
        }};
 
+    my $base_url = $get_portal_base_url->($config);
 
     my $nav = $doc->el(
        class => "navbar navbar-inverse navbar-fixed-top",
@@ -54,8 +62,8 @@ sub render_page {
                        {
                            tag => 'a',
                            class => "navbar-brand",
-                           href => $baseurl,
-                           text => $title,
+                           href => $base_url,
+                           text => $config->{title},
                        },
                    ],
                },
@@ -76,7 +84,7 @@ sub render_page {
     shift @pcomp; # api2
     shift @pcomp; # $format
 
-    my $href = $baseurl;
+    my $href = $base_url;
     push @$items, { tag => 'li', cn => {
        tag => 'a',
        href => $href,
@@ -96,7 +104,7 @@ sub render_page {
 }
 
 my $login_form = sub {
-    my ($doc, $param, $errmsg) = @_;
+    my ($config, $doc, $param, $errmsg) = @_;
 
     $param = {} if !$param;
 
@@ -139,7 +147,7 @@ my $login_form = sub {
            tag => 'form',
            role => 'form',
            method => 'POST',
-           action => $login_url,
+           action => $get_portal_login_url->($config),
            cn => [
                {
                    class => 'form-group',
@@ -158,21 +166,21 @@ my $login_form = sub {
 };
 
 PVE::APIServer::Formatter::register_login_formatter($portal_format, sub {
-    my ($path, $auth) = @_;
+    my ($path, $auth, $config) = @_;
 
-    my $headers = HTTP::Headers->new(Location => $login_url);
+    my $headers = HTTP::Headers->new(Location => $get_portal_login_url->($config));
     return HTTP::Response->new(301, "Moved", $headers);
 });
 
 PVE::APIServer::Formatter::register_formatter($portal_format, sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func, $title) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     # fixme: clumsy!
     PVE::APIServer::Formatter::Standard::prepare_response_data($portal_format, $res);
     $data = $res->{data};
 
     my $html = '';
-    my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $csrfgen_func, $title);
+    my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $config);
 
     if (!HTTP::Status::is_success($res->{status})) {
        $html .= $doc->alert(text => "Error $res->{status}: $res->{message}");
@@ -239,7 +247,7 @@ PVE::APIServer::Formatter::register_formatter($portal_format, sub {
 
     $html = $doc->el(class => 'container', html => $html);
 
-    my $raw = render_page($doc, $html, $title);
+    my $raw = render_page($doc, $html, $config);
     return ($raw, $portal_ct);
 });
 
@@ -248,13 +256,13 @@ PVE::APIServer::Formatter::register_page_formatter(
     method => 'GET',
     path => "/access/ticket",
     code => sub {
-       my ($res, $data, $param, $path, $auth, $csrfgen_func, $title) = @_;
+       my ($res, $data, $param, $path, $auth, $config) = @_;
 
-       my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $csrfgen_func, $title);
+       my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $config);
 
-       my $html = &$login_form($doc);
+       my $html = $login_form->($config, $doc);
 
-       my $raw = render_page($doc, $html, $title);
+       my $raw = render_page($doc, $html, $config);
        return ($raw, $portal_ct);
     });
 
@@ -263,13 +271,13 @@ PVE::APIServer::Formatter::register_page_formatter(
     method => 'POST',
     path => "/access/ticket",
     code => sub {
-       my ($res, $data, $param, $path, $auth, $csrfgen_func, $title) = @_;
+       my ($res, $data, $param, $path, $auth, $config) = @_;
 
        if (HTTP::Status::is_success($res->{status})) {
            my $cookie = PVE::APIServer::Formatter::create_auth_cookie(
-               $data->{ticket}, $auth->{cookie_name});
+               $data->{ticket}, $config->{cookie_name});
 
-           my $headers = HTTP::Headers->new(Location => $baseurl,
+           my $headers = HTTP::Headers->new(Location => $get_portal_base_url->($config),
                                             'Set-Cookie' => $cookie);
            return HTTP::Response->new(301, "Moved", $headers);
        }
@@ -277,11 +285,11 @@ PVE::APIServer::Formatter::register_page_formatter(
        # Note: HTTP server redirects to 'GET /access/ticket', so below
        # output is not really visible.
 
-       my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $csrfgen_func, $title);
+       my $doc = PVE::APIServer::Formatter::Bootstrap->new($res, $path, $auth, $config);
 
-       my $html = &$login_form($doc);
+       my $html = $login_form->($config, $doc);
 
-       my $raw = render_page($doc, $html, $title);
+       my $raw = render_page($doc, $html, $config);
        return ($raw, $portal_ct);
     });
 

diff --git a/PVE/APIServer/Formatter/Standard.pm b/PVE/APIServer/Formatter/Standard.pm
index b6da5266cc017f11a2c2b794f159e396a86844f3..c4def1609279a40cf11405555535efb393b55034 100644 (file)
--- a/PVE/APIServer/Formatter/Standard.pm
+++ b/PVE/APIServer/Formatter/Standard.pm
@@ -47,7 +47,7 @@ sub prepare_response_data {
 }
 
 PVE::APIServer::Formatter::register_formatter('json', sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     my $nocomp = 0;
 
@@ -62,7 +62,7 @@ PVE::APIServer::Formatter::register_formatter('json', sub {
 
 
 PVE::APIServer::Formatter::register_formatter('extjs', sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     my $nocomp = 0;
 
@@ -76,7 +76,7 @@ PVE::APIServer::Formatter::register_formatter('extjs', sub {
 });
 
 PVE::APIServer::Formatter::register_formatter('htmljs', sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     my $nocomp = 0;
 
@@ -93,7 +93,7 @@ PVE::APIServer::Formatter::register_formatter('htmljs', sub {
 
 
 PVE::APIServer::Formatter::register_formatter('spiceconfig', sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     my $nocomp = 0;
 
@@ -116,7 +116,7 @@ PVE::APIServer::Formatter::register_formatter('spiceconfig', sub {
 });
 
 PVE::APIServer::Formatter::register_formatter('png', sub {
-    my ($res, $data, $param, $path, $auth, $csrfgen_func) = @_;
+    my ($res, $data, $param, $path, $auth, $config) = @_;
 
     my $nocomp = 1;