wrap and sort + debhelper 10 buildep

[pmg-api.git] / PMG / HTTPServer.pm

diff --git a/PMG/HTTPServer.pm b/PMG/HTTPServer.pm
index c797c8f01b68f58c07d4b8b0dfd435fccc95e778..6997dd5cc704da27b382b2b5dab169a1bd0360c3 100755 (executable)
--- a/PMG/HTTPServer.pm
+++ b/PMG/HTTPServer.pm
@@ -27,7 +27,7 @@ sub new {
     my $class = ref($this) || $this;
 
     my $self = $class->SUPER::new(%args);
-    
+
     $self->{rpcenv} = PMG::RESTEnvironment->init(
        $self->{trusted_env} ? 'priv' : 'pub', atfork =>  sub { $self->atfork_handler() });
 
@@ -48,6 +48,7 @@ sub auth_handler {
 
     # set environment variables
     $rpcenv->set_user(undef);
+    $rpcenv->set_role(undef);
     $rpcenv->set_language('C');
     $rpcenv->set_client_ip($peer_host);
 
@@ -67,9 +68,17 @@ sub auth_handler {
 
        die "No ticket\n" if !$ticket;
 
-       ($username, $age) = PMG::Ticket::verify_ticket($ticket);
+       if ($ticket =~ m/^PMGQUAR:/) {
+           ($username, $age) = PMG::Ticket::verify_quarantine_ticket($ticket);
+           $rpcenv->set_user($username);
+           $rpcenv->set_role('quser');
+       } else {
+           ($username, $age) = PMG::Ticket::verify_ticket($ticket);
+           my $role = PMG::AccessControl::check_user_enabled($self->{usercfg}, $username);
+           $rpcenv->set_user($username);
+           $rpcenv->set_role($role);
+       }
 
-       $rpcenv->set_user($username);
        $rpcenv->set_ticket($ticket);
 
        my $euid = $>;
@@ -87,9 +96,10 @@ sub auth_handler {
 }
 
 sub rest_handler {
-    my ($self, $clientip, $method, $rel_uri, $auth, $params) = @_;
+    my ($self, $clientip, $method, $rel_uri, $auth, $params, $format) = @_;
 
     my $rpcenv = $self->{rpcenv};
+    $rpcenv->set_format($format);
 
     my $resp = {
        status => HTTP_NOT_IMPLEMENTED,
@@ -111,7 +121,7 @@ sub rest_handler {
        }
 
        # check access permissions
-       $rpcenv->check_api2_permissions($info->{permissions}, $auth->{userid}, $uri_param);
+       $rpcenv->check_api2_permissions($info->{permissions}, $uri_param);
 
        if (my $pn = $info->{proxyto}) {
 
@@ -143,12 +153,22 @@ sub rest_handler {
            }
        }
 
+
+       my $result = $handler->handle($info, $uri_param);
+
        $resp = {
-           data => $handler->handle($info, $uri_param),
            info => $info, # useful to format output
            status => HTTP_OK,
        };
 
+       if ($info->{download}) {
+           die "download methods should have return type 'string' - internal error"
+               if ($info->{returns}->{type} ne 'string');
+           $resp->{download} = $result;
+       } else {
+           $resp->{data} = $result;
+       }
+
        if (my $count = $rpcenv->get_result_attrib('total')) {
            $resp->{total} = $count;
        }
@@ -160,6 +180,8 @@ sub rest_handler {
     my $err = $@;
 
     $rpcenv->set_user(undef); # clear after request
+    $rpcenv->set_role(undef); # clear after request
+    $rpcenv->set_format(undef); # clear after request
 
     if ($err) {
        $resp = { info => $info };