]> git.proxmox.com Git - pve-manager.git/blobdiff - PVE/HTTPServer.pm
depend on pve-docs package
[pve-manager.git] / PVE / HTTPServer.pm
index 33cb7ef91eb4ad4e9f0cbc65ac52ec26af044142..fbf8cc53c2e7592a27ad797724b70b9976b39f5d 100755 (executable)
@@ -2,13 +2,20 @@ package PVE::HTTPServer;
 
 use strict;
 use warnings;
+use Time::HiRes qw(usleep ualarm gettimeofday tv_interval);
 use Socket qw(IPPROTO_TCP TCP_NODELAY SOMAXCONN);
 use POSIX qw(strftime EINTR EAGAIN);
 use Fcntl;
+use IO::File;
 use File::stat qw();
-use AnyEvent::Strict;
+use MIME::Base64;
+use Digest::MD5;
+use Digest::SHA;
+# use AnyEvent::Strict; # only use this for debugging
 use AnyEvent::Util qw(guard fh_nonblocking WSAEWOULDBLOCK WSAEINPROGRESS);
+use AnyEvent::Socket;
 use AnyEvent::Handle;
+use Net::SSLeay;
 use AnyEvent::TLS;
 use AnyEvent::IO;
 use AnyEvent::HTTP;
@@ -19,18 +26,18 @@ use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::REST;
 
+use Net::IP;
 use URI;
+use URI::Escape;
 use HTTP::Status qw(:constants);
 use HTTP::Headers;
 use HTTP::Response;
+use Data::Dumper;
 
-use CGI; # fixme: remove this!
-# DOS attack prevention
-# fixme: remove CGI.pm
-$CGI::DISABLE_UPLOADS = 1; # no uploads
-$CGI::POST_MAX = 1024 * 10; # max 10K posts
+my $limit_max_headers = 30;
+my $limit_max_header_size = 8*1024;
+my $limit_max_post = 16*1024;
 
-use Data::Dumper; # fixme: remove
 
 my $known_methods = {
     GET => 1,
@@ -39,6 +46,67 @@ my $known_methods = {
     DELETE => 1,
 };
 
+my $baseuri = "/api2";
+
+sub split_abs_uri {
+    my ($abs_uri) = @_;
+
+    my ($format, $rel_uri) = $abs_uri =~ m/^\Q$baseuri\E\/+([a-z][a-z0-9]+)(\/.*)?$/;
+    $rel_uri = '/' if !$rel_uri;
+    return wantarray ? ($rel_uri, $format) : $rel_uri;
+}
+
+# generic formatter support
+
+my $formatter_hash = {};
+
+sub register_formatter {
+    my ($format, $func) = @_;
+
+    die "formatter '$format' already defined" if $formatter_hash->{$format};
+
+    $formatter_hash->{$format} = {
+       func => $func,
+    };
+}
+
+sub get_formatter {
+    my ($format) = @_; 
+
+     return undef if !$format;
+
+    my $info = $formatter_hash->{$format};
+    return undef if !$info;
+
+    return $info->{func};
+}
+
+my $login_formatter_hash = {};
+
+sub register_login_formatter {
+    my ($format, $func) = @_;
+
+    die "login formatter '$format' already defined" if $login_formatter_hash->{$format};
+
+    $login_formatter_hash->{$format} = {
+       func => $func,
+    };
+}
+
+sub get_login_formatter {
+    my ($format) = @_; 
+
+    return undef if !$format;
+
+    my $info = $login_formatter_hash->{$format};
+    return undef if !$info;
+
+    return $info->{func};
+}
+
+# server implementation
+
 sub log_request {
     my ($self, $reqstate) = @_;
 
@@ -47,6 +115,9 @@ sub log_request {
     # like apache2 common log format
     # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
 
+    return if $loginfo->{written}; # avoid duplicate logs
+    $loginfo->{written} = 1;
+
     my $peerip = $reqstate->{peer_host} || '-';
     my $userid = $loginfo->{userid} || '-';
     my $content_length = defined($loginfo->{content_length}) ? $loginfo->{content_length} : '-';
@@ -72,9 +143,40 @@ sub log_aborted_request {
     $self->log_request($reqstate);
 }
 
+sub cleanup_reqstate {
+    my ($reqstate) = @_;
+
+    delete $reqstate->{log};
+    delete $reqstate->{request};
+    delete $reqstate->{proto};
+    delete $reqstate->{accept_gzip};
+    delete $reqstate->{starttime};
+
+    if ($reqstate->{tmpfilename}) {
+       unlink $reqstate->{tmpfilename};
+       delete $reqstate->{tmpfilename};
+    }
+}
+
 sub client_do_disconnect {
     my ($self, $reqstate) = @_;
 
+    cleanup_reqstate($reqstate);
+
+    my $shutdown_hdl = sub {
+       my $hdl = shift;
+
+       shutdown($hdl->{fh}, 1);
+       # clear all handlers
+       $hdl->on_drain(undef);
+       $hdl->on_read(undef);
+       $hdl->on_eof(undef);
+    };
+
+    if (my $proxyhdl = delete $reqstate->{proxyhdl}) {
+       &$shutdown_hdl($proxyhdl);
+    }
+
     my $hdl = delete $reqstate->{hdl};
 
     if (!$hdl) {
@@ -82,13 +184,10 @@ sub client_do_disconnect {
        return;
     }
 
-    #print "close connection $hdl\n";
+    print "close connection $hdl\n" if $self->{debug};
+
+    &$shutdown_hdl($hdl);
 
-    shutdown($hdl->{fh}, 1);
-    # clear all handlers
-    $hdl->on_drain(undef);
-    $hdl->on_read(undef);
-    $hdl->on_eof(undef);
     $self->{conn_count}--;
 
     print "$$: CLOSE FH" .  $hdl->{fh}->fileno() . " CONN$self->{conn_count}\n" if $self->{debug};
@@ -99,12 +198,10 @@ sub finish_response {
 
     my $hdl = $reqstate->{hdl};
 
-    delete $reqstate->{log};
-    delete $reqstate->{request};
-    delete $reqstate->{proto};
+    cleanup_reqstate($reqstate);
 
     if (!$self->{end_loop} && $reqstate->{keep_alive} > 0) {
-       # print "KEEPALIVE $reqstate->{keep_alive}\n";
+       # print "KEEPALIVE $reqstate->{keep_alive}\n" if $self->{debug};
        $hdl->on_read(sub {
            eval { $self->push_request_header($reqstate); };
            warn $@ if $@;
@@ -120,10 +217,16 @@ sub finish_response {
 }
 
 sub response {
-    my ($self, $reqstate, $resp, $mtime, $nocomp) = @_;
+    my ($self, $reqstate, $resp, $mtime, $nocomp, $delay) = @_;
 
     #print "$$: send response: " . Dumper($resp);
 
+    # activate timeout
+    $reqstate->{hdl}->timeout_reset();
+    $reqstate->{hdl}->timeout($self->{timeout});
+
+    $nocomp = 1 if !$reqstate->{accept_gzip};
+
     my $code = $resp->code;
     my $msg = $resp->message || HTTP::Status::status_message($code);
     ($msg) = $msg =~m/^(.*)$/m;
@@ -134,11 +237,12 @@ sub response {
        $content = "";
     }
 
-    $reqstate->{keep_alive} = 0 if ($code >= 300) || $self->{end_loop};
+    $reqstate->{keep_alive} = 0 if ($code >= 400) || $self->{end_loop};
 
     $reqstate->{log}->{code} = $code;
 
-    my $res = "HTTP/1.0 $code $msg\015\012";
+    my $proto = $reqstate->{proto} ? $reqstate->{proto}->{str} : 'HTTP/1.0';
+    my $res = "$proto $code $msg\015\012";
 
     my $ctime = time();
     my $date = HTTP::Date::time2str($ctime);
@@ -181,12 +285,20 @@ sub response {
     #print "SEND(without content) $res\n" if $self->{debug};
 
     $res .= "\015\012";
-    $res .= $content;
+    $res .= $content if $content;
 
     $self->log_request($reqstate, $reqstate->{request});
-
-    $reqstate->{hdl}->push_write($res);
-    $self->finish_response($reqstate);
+    
+    if ($delay && $delay > 0) {
+       my $w; $w = AnyEvent->timer(after => $delay, cb => sub {
+           undef $w; # delete reference
+           $reqstate->{hdl}->push_write($res);
+           $self->finish_response($reqstate);
+       });
+    } else {
+       $reqstate->{hdl}->push_write($res);
+       $self->finish_response($reqstate);
+    }
 }
 
 sub error {
@@ -207,33 +319,70 @@ sub send_file_start {
        # Note: aio_load() this is not really async unless we use IO::AIO!
        eval {
 
+           my $r = $reqstate->{request};
+
            my $fh = IO::File->new($filename, '<') ||
                die "$!\n";
            my $stat = File::stat::stat($fh) ||
                die "$!\n";
+           
+           my $mtime = $stat->mtime;
+
+           if (my $ifmod = $r->header('if-modified-since')) {
+               my $iftime = HTTP::Date::str2time($ifmod);
+               if ($mtime <= $iftime) {
+                   my $resp = HTTP::Response->new(304, "NOT MODIFIED");
+                   $self->response($reqstate, $resp, $mtime);
+                   return;
+               }
+           }
 
            my $data;
            my $len = sysread($fh, $data,  $stat->size);
            die "got short file\n" if !defined($len) || $len != $stat->size;
 
            my $ct;
+           my $nocomp;
            if ($filename =~ m/\.css$/) {
                $ct = 'text/css';
+           } elsif ($filename =~ m/\.html$/) {
+               $ct = 'text/html';
            } elsif ($filename =~ m/\.js$/) {
                $ct = 'application/javascript';
            } elsif ($filename =~ m/\.png$/) {
                $ct = 'image/png';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.ico$/) {
+               $ct = 'image/x-icon';
+               $nocomp = 1;
            } elsif ($filename =~ m/\.gif$/) {
                $ct = 'image/gif';
+               $nocomp = 1;
            } elsif ($filename =~ m/\.jar$/) {
                $ct = 'application/java-archive';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.woff$/) {
+               $ct = 'application/font-woff';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.woff2$/) {
+               $ct = 'application/font-woff2';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.ttf$/) {
+               $ct = 'application/font-snft';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.pdf$/) {
+               $ct = 'application/pdf';
+               $nocomp = 1;
+           } elsif ($filename =~ m/\.epub$/) {
+               $ct = 'application/epub+zip';
+               $nocomp = 1;
            } else {
                die "unable to detect content type";
            }
 
            my $header = HTTP::Headers->new(Content_Type => $ct);
            my $resp = HTTP::Response->new(200, "OK", $header, $data);
-           $self->response($reqstate, $resp, $stat->mtime);
+           $self->response($reqstate, $resp, $mtime, $nocomp);
        };
        if (my $err = $@) {
            $self->error($reqstate, 501, $err);
@@ -243,15 +392,210 @@ sub send_file_start {
     warn $@ if $@;
 }
 
+sub websocket_proxy {
+    my ($self, $reqstate, $wsaccept, $wsproto, $param) = @_;
+
+    eval {
+       my $remhost;
+       my $remport;
+
+       my $max_payload_size = 65536;
+
+       my $binary;
+       if ($wsproto eq 'binary') {
+           $binary = 1;
+       } elsif ($wsproto eq 'base64') {
+           $binary = 0;
+       } else {
+           die "websocket_proxy: unsupported protocol '$wsproto'\n";
+       }
+
+       if ($param->{port}) {
+           $remhost = 'localhost';
+           $remport = $param->{port};
+       } elsif ($param->{socket}) {
+           $remhost = 'unix/';
+           $remport = $param->{socket};
+       } else {
+           die "websocket_proxy: missing port or socket\n";
+       }
+
+       tcp_connect $remhost, $remport, sub {
+           my ($fh) = @_ 
+               or die "connect to '$remhost:$remport' failed: $!";
+       
+           print "$$: CONNECTed to '$remhost:$remport'\n" if $self->{debug};
+
+           $reqstate->{proxyhdl} = AnyEvent::Handle->new(
+               fh => $fh,
+               rbuf_max => 64*1024,
+               wbuf_max => 64*10*1024,
+               timeout => 5,
+               on_eof => sub {
+                   my ($hdl) = @_;
+                   eval {
+                       $self->log_aborted_request($reqstate);
+                       $self->client_do_disconnect($reqstate);
+                   };
+                   if (my $err = $@) { syslog('err', $err); }
+               },
+               on_error => sub {
+                   my ($hdl, $fatal, $message) = @_;
+                   eval {
+                       $self->log_aborted_request($reqstate, $message);
+                       $self->client_do_disconnect($reqstate);
+                   };
+                   if (my $err = $@) { syslog('err', "$err"); }
+               });
+
+           my $proxyhdlreader = sub {
+               my ($hdl) = @_;
+               
+               my $len = length($hdl->{rbuf});
+               my $data = substr($hdl->{rbuf}, 0, $len, '');
+
+               my $string;
+               my $payload;
+
+               if ($binary) {
+                   $string = "\x82"; # binary frame
+                   $payload = $data;
+               } else {
+                   $string = "\x81"; # text frame
+                   $payload = encode_base64($data, '');
+               }
+
+               my $payload_len = length($payload);
+               if ($payload_len <= 125) {
+                   $string .= pack 'C', $payload_len;
+               } elsif ($payload_len <= 0xffff) {
+                   $string .= pack 'C', 126; 
+                   $string .= pack 'n', $payload_len;
+               } else {
+                   $string .= pack 'C', 127; 
+                   $string .= pack 'Q>', $payload_len;
+               }
+               $string .= $payload;
+
+               $reqstate->{hdl}->push_write($string) if $reqstate->{hdl};
+           };
+
+           my $hdlreader = sub {
+               my ($hdl) = @_;
+
+               my $len = length($hdl->{rbuf});
+               return if $len < 2;
+
+               my $hdr = unpack('C', substr($hdl->{rbuf}, 0, 1));
+               my $opcode = $hdr & 0b00001111;
+               my $fin = $hdr & 0b10000000;
+
+               die "received fragmented websocket frame\n" if !$fin;
+
+               my $rsv = $hdr & 0b01110000;
+               die "received websocket frame with RSV flags\n" if $rsv;
+
+               my $payload_len = unpack 'C', substr($hdl->{rbuf}, 1, 1);
+
+               my $masked = $payload_len & 0b10000000;
+               die "received unmasked websocket frame from client\n" if !$masked;
+
+               my $offset = 2;
+               $payload_len = $payload_len & 0b01111111;
+               if ($payload_len == 126) {
+                   return if $len < 4;
+                   $payload_len = unpack('n', substr($hdl->{rbuf}, $offset, 2));
+                   $offset += 2;
+               } elsif ($payload_len == 127) {
+                   return if $len < 10;
+                   $payload_len = unpack('Q>', substr($hdl->{rbuf}, $offset, 8));
+                   $offset += 8;
+               }
+
+               die "received too large websocket frame (len = $payload_len)\n" 
+                   if ($payload_len > $max_payload_size) || ($payload_len < 0);
+
+               return if $len < ($offset + 4 + $payload_len);
+
+               my $data = substr($hdl->{rbuf}, 0, $len, ''); # now consume data
+               
+               my @mask = (unpack('C', substr($data, $offset+0, 1)),
+                           unpack('C', substr($data, $offset+1, 1)),
+                           unpack('C', substr($data, $offset+2, 1)),
+                           unpack('C', substr($data, $offset+3, 1)));
+
+               $offset += 4;
+
+               my $payload = substr($data, $offset, $payload_len);
+
+               for (my $i = 0; $i < $payload_len; $i++) {
+                   my $d = unpack('C', substr($payload, $i, 1));
+                   my $n = $d ^ $mask[$i % 4];
+                   substr($payload, $i, 1, pack('C', $n));
+               }
+
+               $payload = decode_base64($payload) if !$binary;
+
+               if ($opcode == 1 || $opcode == 2) {
+                   $reqstate->{proxyhdl}->push_write($payload) if $reqstate->{proxyhdl};
+               } elsif ($opcode == 8) {
+                   print "websocket received close\n" if $self->{debug};
+                   if ($reqstate->{proxyhdl}) {
+                       $reqstate->{proxyhdl}->push_write($payload);
+                       $reqstate->{proxyhdl}->push_shutdown();
+                   }
+                   $hdl->push_shutdown();
+               } else {
+                   die "received unhandled websocket opcode $opcode\n";
+               }
+           };
+
+           my $proto = $reqstate->{proto} ? $reqstate->{proto}->{str} : 'HTTP/1.1';
+
+           $reqstate->{proxyhdl}->timeout(0);
+           $reqstate->{proxyhdl}->on_read($proxyhdlreader);
+           $reqstate->{hdl}->on_read($hdlreader);
+
+           # todo: use stop_read/start_read if write buffer grows to much
+
+           my $res = "$proto 101 Switching Protocols\015\012" .
+               "Upgrade: websocket\015\012" .
+               "Connection: upgrade\015\012" .
+               "Sec-WebSocket-Accept: $wsaccept\015\012" .
+               "Sec-WebSocket-Protocol: $wsproto\015\012" .
+               "\015\012";
+
+           print $res if $self->{debug};
+
+           $reqstate->{hdl}->push_write($res);
+
+           # log early
+           $reqstate->{log}->{code} = 101;
+           $self->log_request($reqstate);
+       };
+
+    };
+    if (my $err = $@) {
+       warn $err;
+       $self->log_aborted_request($reqstate, $err);
+       $self->client_do_disconnect($reqstate);
+    }
+}
+
 sub proxy_request {
-    my ($self, $reqstate, $r, $clientip, $host, $method, $abs_uri, $ticket, $token, $params) = @_;
+    my ($self, $reqstate, $clientip, $host, $method, $uri, $ticket, $token, $params) = @_;
 
     eval {
        my $target;
+       my $keep_alive = 1;
        if ($host eq 'localhost') {
-           $target = "http://$host:85$abs_uri";
+           $target = "http://$host:85$uri";
+           # keep alive for localhost is not worth (connection setup is about 0.2ms)
+           $keep_alive = 0;
+       } elsif (Net::IP::ip_is_ipv6($host)) {
+           $target = "https://[$host]:8006$uri";
        } else {
-           $target = "https://$host:8006$abs_uri";
+           $target = "https://$host:8006$uri";
        }
 
        my $headers = {
@@ -259,17 +603,15 @@ sub proxy_request {
            PVEClientIP => $clientip,
        };
 
-       my $cookie_name = 'PVEAuthCookie';
-
        $headers->{'cookie'} = PVE::REST::create_auth_cookie($ticket) if $ticket;
        $headers->{'CSRFPreventionToken'} = $token if $token;
+       $headers->{'Accept-Encoding'} = 'gzip' if $reqstate->{accept_gzip};
 
        my $content;
 
        if  ($method eq 'POST' || $method eq 'PUT') {
            $headers->{'Content-Type'} = 'application/x-www-form-urlencoded';
-           # We use a temporary URI object to format
-           # the application/x-www-form-urlencoded content.
+           # use URI object to format application/x-www-form-urlencoded content.
            my $url = URI->new('http:');
            $url->query_form(%$params);
            $content = $url->query;
@@ -282,20 +624,33 @@ sub proxy_request {
            $method => $target,
            headers => $headers,
            timeout => 30,
-           resurse => 0,
+           recurse => 0,
+           proxy => undef, # avoid use of $ENV{HTTP_PROXY}
+           keepalive => $keep_alive,
            body => $content,
+           tls_ctx => $self->{tls_ctx},
            sub {
                my ($body, $hdr) = @_;
 
                undef $w;
 
+               if (!$reqstate->{hdl}) {
+                   warn "proxy detected vanished client connection\n";
+                   return;
+               }
+
                eval {
                    my $code = delete $hdr->{Status};
                    my $msg = delete $hdr->{Reason};
                    delete $hdr->{URL};
                    delete $hdr->{HTTPVersion};
                    my $header = HTTP::Headers->new(%$hdr);
+                   if (my $location = $header->header('Location')) {
+                       $location =~ s|^http://localhost:85||;
+                       $header->header(Location => $location);
+                   }
                    my $resp = HTTP::Response->new($code, $msg, $header, $body);
+                   # Note: disable compression, because body is already compressed
                    $self->response($reqstate, $resp, undef, 1);
                };
                warn $@ if $@;
@@ -304,118 +659,311 @@ sub proxy_request {
     warn $@ if $@;
 }
 
-my $extract_params = sub {
-    my ($r, $method) = @_;
+# return arrays as \0 separated strings (like CGI.pm)
+sub decode_urlencoded {
+    my ($data) = @_;
 
-    # NOTE: HTTP::Request::Params return undef instead of ''
-    #my $parser = HTTP::Request::Params->new({req => $r});
-    #my $params = $parser->params;
+    my $res = {};
 
-    my $post_params = {};
+    return $res if !$data;
+
+    foreach my $kv (split(/[\&\;]/, $data)) {
+       my ($k, $v) = split(/=/, $kv);
+       $k =~s/\+/ /g;
+       $k =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr(hex($1))/eg;
+       $v =~s/\+/ /g;
+       $v =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr(hex($1))/eg;
+
+       if (defined(my $old = $res->{$k})) {
+           $res->{$k} = "$old\0$v";
+       } else {
+           $res->{$k} = $v;
+       }       
+    }
+    return $res;
+}
+
+sub extract_params {
+    my ($r, $method) = @_;
+
+    my $params = {};
 
     if ($method eq 'PUT' || $method eq 'POST') {
-       $post_params = CGI->new($r->content())->Vars;
+       $params = decode_urlencoded($r->content);
     }
 
-    my $query_params = CGI->new($r->url->query)->Vars;
-    my $params = $post_params || {};
+    my $query_params = decode_urlencoded($r->url->query());
 
     foreach my $k (keys %{$query_params}) {
        $params->{$k} = $query_params->{$k};
     }
 
     return PVE::Tools::decode_utf8_parameters($params);
-};
+}
 
 sub handle_api2_request {
-    my ($self, $reqstate) = @_;
+    my ($self, $reqstate, $auth, $method, $path, $upload_state) = @_;
 
     eval {
        my $r = $reqstate->{request};
-       my $method = $r->method();
-       my $path = $r->uri->path();
 
-       my ($rel_uri, $format) = PVE::REST::split_abs_uri($path);
-       if (!$format) {
-           $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri");
+       my ($rel_uri, $format) = split_abs_uri($path);
+
+       my $formatter = get_formatter($format);
+
+       if (!defined($formatter)) {
+           $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri $rel_uri, $format");
            return;
        }
 
+       #print Dumper($upload_state) if $upload_state;
+
        my $rpcenv = $self->{rpcenv};
-       my $headers = $r->headers;
 
-       my $token = $headers->header('CSRFPreventionToken');
+       my $params;
 
-       my $cookie = $headers->header('Cookie');
+       if ($upload_state) {
+           $params = $upload_state->{params};
+       } else {
+           $params = extract_params($r, $method);
+       }
 
-       my $ticket = PVE::REST::extract_auth_cookie($cookie);
+       delete $params->{_dc}; # remove disable cache parameter
 
-       my $params = &$extract_params($r, $method);
+       my $clientip = $reqstate->{peer_host};
 
-       my $clientip = $headers->header('PVEClientIP');
+       $rpcenv->init_request();
 
-       $rpcenv->init_request(params => $params);
+       my $res = PVE::REST::rest_handler($rpcenv, $clientip, $method, $rel_uri, $auth, $params);
 
-       my $res = PVE::REST::rest_handler($rpcenv, $clientip, $method, $path, $rel_uri, $ticket, $token);
+       AnyEvent->now_update(); # in case somebody called sleep()
 
-       # todo: eval { $userid = $rpcenv->get_user(); };
-       my $userid = $rpcenv->{user}; # this is faster
        $rpcenv->set_user(undef); # clear after request
 
-       $reqstate->{log}->{userid} = $userid;
+       my $upgrade = $r->header('upgrade');
+       $upgrade = lc($upgrade) if $upgrade;
 
-       if ($res->{proxy}) {
+       if (my $host = $res->{proxy}) {
 
            if ($self->{trusted_env}) {
                $self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy not allowed");
                return;
            }
 
-           $self->proxy_request($reqstate, $r, $clientip, $res->{proxy}, $method,
-                                $r->uri, $ticket, $token, $res->{proxy_params});
+           if ($host ne 'localhost' && $r->header('PVEDisableProxy')) {
+               $self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy loop detected");
+               return;
+           }
+
+           $res->{proxy_params}->{tmpfilename} = $reqstate->{tmpfilename} if $upload_state;
+
+           $self->proxy_request($reqstate, $clientip, $host, $method,
+                                $r->uri, $auth->{ticket}, $auth->{token}, $res->{proxy_params});
            return;
 
+       } elsif ($upgrade && ($method eq 'GET') && ($path =~ m|websocket$|)) {
+           die "unable to upgrade to protocol '$upgrade'\n" if !$upgrade || ($upgrade ne 'websocket');
+           my $wsver = $r->header('sec-websocket-version');
+           die "unsupported websocket-version '$wsver'\n" if !$wsver || ($wsver ne '13');
+           my $wsproto_str = $r->header('sec-websocket-protocol');
+           die "missing websocket-protocol header" if !$wsproto_str;
+           my $wsproto;
+           foreach my $p (PVE::Tools::split_list($wsproto_str)) {
+               $wsproto = $p if !$wsproto && $p eq 'base64';
+               $wsproto = $p if $p eq 'binary';
+           }
+           die "unsupported websocket-protocol protocol '$wsproto_str'\n" if !$wsproto;
+           my $wskey = $r->header('sec-websocket-key');
+           die "missing websocket-key\n" if !$wskey;
+           # Note: Digest::SHA::sha1_base64 has wrong padding
+           my $wsaccept = Digest::SHA::sha1_base64("${wskey}258EAFA5-E914-47DA-95CA-C5AB0DC85B11") . "=";
+           if ($res->{status} == HTTP_OK) {
+               $self->websocket_proxy($reqstate, $wsaccept, $wsproto, $res->{data});
+               return;
+           }
        }
 
-       PVE::REST::prepare_response_data($format, $res);
-       my ($raw, $ct) = PVE::REST::format_response_data($format, $res, $path);
+       my $delay = 0;
+       if ($res->{status} == HTTP_UNAUTHORIZED) {
+           # always delay unauthorized calls by 3 seconds
+           $delay = 3 - tv_interval($reqstate->{starttime});
+           $delay = 0 if $delay < 0;
+       }
 
-       my $resp = HTTP::Response->new($res->{status}, $res->{message});
-       $resp->header("Content-Type" => $ct);
-       $resp->content($raw);
-       $self->response($reqstate, $resp);
+       if ($res->{info} && $res->{info}->{formatter}) {
+           if (defined(my $func = $res->{info}->{formatter}->{$format})) {
+               $formatter = $func;
+           }
+       }
 
-       return;
+       my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $params, $path, $auth);
+
+       my $resp;
+       if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
+           $resp = $raw;
+       } else {
+           $resp = HTTP::Response->new($res->{status}, $res->{message});
+           $resp->header("Content-Type" => $ct);
+           $resp->content($raw);
+       }
+       $self->response($reqstate, $resp, undef, $nocomp, $delay);
     };
-    warn $@ if $@;
+    if (my $err = $@) {
+       $self->error($reqstate, 501, $err);
+    }
 }
 
-sub handle_request {
-    my ($self, $reqstate) = @_;
-
-    #print "REQUEST" . Dumper($reqstate->{request});
+sub handle_spice_proxy_request {
+    my ($self, $reqstate, $connect_str, $vmid, $node, $spiceport) = @_;
 
     eval {
+
+        die "Port $spiceport is not allowed" if ($spiceport < 61000 || $spiceport > 61099);
+
+       my $rpcenv = $self->{rpcenv};
+       $rpcenv->init_request();
+
+       my $clientip = $reqstate->{peer_host};
        my $r = $reqstate->{request};
-       my $method = $r->method();
-       my $path = $r->uri->path();
 
-       # print "REQUEST $path\n";
+        my $remip;
 
-       if (!$known_methods->{$method}) {
-           my $resp = HTTP::Response->new(HTTP_NOT_IMPLEMENTED, "method '$method' not available");
-           $self->response($reqstate, $resp);
+        if ($node ne 'localhost' && PVE::INotify::nodename() !~ m/^$node$/i) {
+            $remip = PVE::Cluster::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};
+        } else {
+           print "$$: CONNECT $vmid, $node, $spiceport\n" if $self->{debug};
+       }
+
+       if ($remip && $r->header('PVEDisableProxy')) {
+           $self->error($reqstate, HTTP_INTERNAL_SERVER_ERROR, "proxy loop detected");
            return;
        }
 
-       if ($path =~ m!/api2!) {
-           $self->handle_api2_request($reqstate);
+       $reqstate->{hdl}->timeout(0);
+       $reqstate->{hdl}->wbuf_max(64*10*1024);
+
+       my $remhost = $remip ? $remip : "localhost";
+       my $remport = $remip ? 3128 : $spiceport;
+
+       tcp_connect $remhost, $remport, sub {
+           my ($fh) = @_ 
+               or die "connect to '$remhost:$remport' failed: $!";
+
+           print "$$: CONNECTed to '$remhost:$remport'\n" if $self->{debug};
+           $reqstate->{proxyhdl} = AnyEvent::Handle->new(
+               fh => $fh,
+               rbuf_max => 64*1024,
+               wbuf_max => 64*10*1024,
+               timeout => 5,
+               on_eof => sub {
+                   my ($hdl) = @_;
+                   eval {
+                       $self->log_aborted_request($reqstate);
+                       $self->client_do_disconnect($reqstate);
+                   };
+                   if (my $err = $@) { syslog('err', $err); }
+               },
+               on_error => sub {
+                   my ($hdl, $fatal, $message) = @_;
+                   eval {
+                       $self->log_aborted_request($reqstate, $message);
+                       $self->client_do_disconnect($reqstate);
+                   };
+                   if (my $err = $@) { syslog('err', "$err"); }
+               });
+
+
+           my $proxyhdlreader = sub {
+               my ($hdl) = @_;
+
+               my $len = length($hdl->{rbuf});
+               my $data = substr($hdl->{rbuf}, 0, $len, '');
+
+               #print "READ1 $len\n";
+               $reqstate->{hdl}->push_write($data) if $reqstate->{hdl};
+           };
+
+           my $hdlreader = sub {
+               my ($hdl) = @_;
+
+               my $len = length($hdl->{rbuf});
+               my $data = substr($hdl->{rbuf}, 0, $len, '');
+
+               #print "READ0 $len\n";
+               $reqstate->{proxyhdl}->push_write($data) if $reqstate->{proxyhdl};
+           };
+
+           my $proto = $reqstate->{proto} ? $reqstate->{proto}->{str} : 'HTTP/1.0';
+
+           my $startproxy = sub {
+               $reqstate->{proxyhdl}->timeout(0);
+               $reqstate->{proxyhdl}->on_read($proxyhdlreader);
+               $reqstate->{hdl}->on_read($hdlreader);
+
+               # todo: use stop_read/start_read if write buffer grows to much
+
+               my $res = "$proto 200 OK\015\012"; # hope this is the right answer?
+               $reqstate->{hdl}->push_write($res);
+
+               # log early
+               $reqstate->{log}->{code} = 200;
+               $self->log_request($reqstate);
+           };
+
+           if ($remip) {
+               my $header = "CONNECT ${connect_str} $proto\015\012" .
+                   "Host: ${connect_str}\015\012" .
+                   "Proxy-Connection: keep-alive\015\012" .
+                   "User-Agent: spiceproxy\015\012" .
+                   "PVEDisableProxy: true\015\012" .
+                   "PVEClientIP: $clientip\015\012" .
+                   "\015\012";
+
+               $reqstate->{proxyhdl}->push_write($header);
+               $reqstate->{proxyhdl}->push_read(line => sub {
+                   my ($hdl, $line) = @_;
+                   
+                   if ($line =~ m!^$proto 200 OK$!) {
+                       &$startproxy();
+                   } else {
+                       $reqstate->{hdl}->push_write($line);
+                       $self->client_do_disconnect($reqstate);
+                   }
+                });
+           } else {
+               &$startproxy();
+           }
+
+       };
+    };
+    if (my $err = $@) {
+       warn $err;
+       $self->log_aborted_request($reqstate, $err);
+       $self->client_do_disconnect($reqstate);
+    }
+}
+
+sub handle_request {
+    my ($self, $reqstate, $auth, $method, $path) = @_;
+
+    eval {
+       my $r = $reqstate->{request};
+       
+       # disable timeout on handle (we already have all data we need)
+       # we re-enable timeout in response()
+       $reqstate->{hdl}->timeout(0);
+
+       if ($path =~ m!$baseuri!) {
+           $self->handle_api2_request($reqstate, $auth, $method, $path);
            return;
        }
 
        if ($self->{pages} && ($method eq 'GET') && (my $handler = $self->{pages}->{$path})) {
            if (ref($handler) eq 'CODE') {
-               my ($resp, $userid) = &$handler($self, $reqstate->{request});
+               my $params = decode_urlencoded($r->url->query());
+               my ($resp, $userid) = &$handler($self, $reqstate->{request}, $params);
                $self->response($reqstate, $resp);
            } elsif (ref($handler) eq 'HASH') {
                if (my $filename = $handler->{file}) {
@@ -452,24 +1000,194 @@ sub handle_request {
     }
 }
 
+sub file_upload_multipart {
+    my ($self, $reqstate, $auth, $method, $path, $rstate) = @_;
+
+    eval {
+       my $boundary = $rstate->{boundary};
+       my $hdl = $reqstate->{hdl};
+
+       my $startlen = length($hdl->{rbuf});
+
+       if ($rstate->{phase} == 0) { # skip everything until start
+           if ($hdl->{rbuf} =~ s/^.*?--\Q$boundary\E  \015?\012
+                       ((?:[^\015]+\015\012)* ) \015?\012//xs) {
+               my $header = $1;
+               my ($ct, $disp, $name, $filename);
+               foreach my $line (split(/\015?\012/, $header)) {
+                   # assume we have single line headers
+                   if ($line =~ m/^Content-Type\s*:\s*(.*)/i) {
+                       $ct = parse_content_type($1);
+                   } elsif ($line =~ m/^Content-Disposition\s*:\s*(.*)/i) {
+                       ($disp, $name, $filename) = parse_content_disposition($1);
+                   }
+               }
+
+               if (!($disp && $disp eq 'form-data' && $name)) {
+                   syslog('err', "wrong content disposition in multipart - abort upload");
+                   $rstate->{phase} = -1;
+               } else {
+
+                   $rstate->{fieldname} = $name;
+
+                   if ($filename) {
+                       if ($name eq 'filename') {
+                           # found file upload data
+                           $rstate->{phase} = 1;
+                           $rstate->{filename} = $filename;
+                       } else {
+                           syslog('err', "wrong field name for file upload - abort upload");
+                           $rstate->{phase} = -1;
+                       }
+                   } else {
+                       # found form data for field $name
+                       $rstate->{phase} = 2;
+                   }
+               }
+           } else {
+               my $len = length($hdl->{rbuf});
+               substr($hdl->{rbuf}, 0, $len - $rstate->{maxheader}, '') 
+                   if $len > $rstate->{maxheader}; # skip garbage
+           }
+       } elsif ($rstate->{phase} == 1) { # inside file - dump until end marker
+           if ($hdl->{rbuf} =~ s/^(.*?)\015?\012(--\Q$boundary\E(--)? \015?\012(.*))$/$2/xs) {
+               my ($rest, $eof) = ($1, $3);
+               my $len = length($rest);
+               die "write to temporary file failed - $!" 
+                   if syswrite($rstate->{outfh}, $rest) != $len;
+               $rstate->{ctx}->add($rest);
+               $rstate->{params}->{filename} = $rstate->{filename};
+               $rstate->{md5sum} = $rstate->{ctx}->hexdigest;
+               $rstate->{bytes} += $len;
+               $rstate->{phase} =  $eof ? 100 : 0;
+           } else {
+               my $len = length($hdl->{rbuf});
+               my $wlen = $len - $rstate->{boundlen};
+               if ($wlen > 0) {
+                   my $data = substr($hdl->{rbuf}, 0, $wlen, '');
+                   die "write to temporary file failed - $!" 
+                       if syswrite($rstate->{outfh}, $data) != $wlen;
+                   $rstate->{bytes} += $wlen;
+                   $rstate->{ctx}->add($data);
+               }
+           }
+       } elsif ($rstate->{phase} == 2) { # inside normal field
+
+           if ($hdl->{rbuf} =~ s/^(.*?)\015?\012(--\Q$boundary\E(--)? \015?\012(.*))$/$2/xs) {
+               my ($rest, $eof) = ($1, $3);
+               my $len = length($rest);
+               $rstate->{post_size} += $len;
+               if ($rstate->{post_size} < $limit_max_post) {
+                   $rstate->{params}->{$rstate->{fieldname}} = $rest;
+                   $rstate->{phase} = $eof ? 100 : 0;
+               } else {
+                   syslog('err', "form data to large - abort upload");
+                   $rstate->{phase} = -1; # skip
+               }
+           }
+       } else { # skip 
+           my $len = length($hdl->{rbuf});
+           substr($hdl->{rbuf}, 0, $len, ''); # empty rbuf
+       }
+
+       $rstate->{read} += ($startlen - length($hdl->{rbuf}));
+
+       if (!$rstate->{done} && ($rstate->{read} + length($hdl->{rbuf})) >= $rstate->{size}) {
+           $rstate->{done} = 1; # make sure we dont get called twice 
+           if ($rstate->{phase} < 0 || !$rstate->{md5sum}) {
+               die "upload failed\n"; 
+           } else {
+               my $elapsed = tv_interval($rstate->{starttime});
+
+               my $rate = int($rstate->{bytes}/($elapsed*1024*1024));
+               syslog('info', "multipart upload complete " . 
+                      "(size: %d time: %ds rate: %.2fMiB/s md5sum: $rstate->{md5sum})", 
+                      $rstate->{bytes}, $elapsed, $rate);
+               $self->handle_api2_request($reqstate, $auth, $method, $path, $rstate);
+           }
+       }
+    };
+    if (my $err = $@) {
+       syslog('err', $err);
+       $self->error($reqstate, 501, $err);
+    }
+}
+
+sub parse_content_type {
+    my ($ctype) = @_;
+
+    my ($ct, @params) = split(/\s*[;,]\s*/o, $ctype);
+    
+    foreach my $v (@params) {
+       if ($v =~ m/^\s*boundary\s*=\s*(\S+?)\s*$/o) {
+           return wantarray ? ($ct, $1) : $ct;
+       }
+    }
+    return  wantarray ? ($ct) : $ct;
+}
+
+sub parse_content_disposition {
+    my ($line) = @_;
+
+    my ($disp, @params) = split(/\s*[;,]\s*/o, $line);
+    my $name;
+    my $filename;
+
+    foreach my $v (@params) {
+       if ($v =~ m/^\s*name\s*=\s*(\S+?)\s*$/o) {
+           $name = $1;
+           $name =~ s/^"(.*)"$/$1/;
+       } elsif ($v =~ m/^\s*filename\s*=\s*(.+?)\s*$/o) {
+           $filename = $1;
+           $filename =~ s/^"(.*)"$/$1/;
+       }
+    }
+    return  wantarray ? ($disp, $name, $filename) : $disp;
+}
+
+my $tmpfile_seq_no = 0;
+
+sub get_upload_filename {
+    # choose unpredictable tmpfile name
+  
+    $tmpfile_seq_no++;
+    return "/var/tmp/pveupload-" . Digest::MD5::md5_hex($tmpfile_seq_no . time() . $$);
+}
+
 sub unshift_read_header {
     my ($self, $reqstate, $state) = @_;
 
-    $state = {} if !$state;
+    $state = { size => 0, count => 0 } if !$state;
 
     $reqstate->{hdl}->unshift_read(line => sub {
        my ($hdl, $line) = @_;
 
        eval {
-           #print "$$: got header: $line\n";
+           # print "$$: got header: $line\n" if $self->{debug};
+
+           die "to many http header lines\n" if ++$state->{count} >= $limit_max_headers;
+           die "http header too large\n" if ($state->{size} += length($line)) >= $limit_max_header_size;
 
            my $r = $reqstate->{request};
            if ($line eq '') {
 
+               my $path = uri_unescape($r->uri->path());
+               my $method = $r->method();
+
                $r->push_header($state->{key}, $state->{val})
                    if $state->{key};
 
+               if (!$known_methods->{$method}) {
+                   my $resp = HTTP::Response->new(HTTP_NOT_IMPLEMENTED, "method '$method' not available");
+                   $self->response($reqstate, $resp);
+                   return;
+               }
+
                my $conn = $r->header('Connection');
+               my $accept_enc = $r->header('Accept-Encoding');
+               $reqstate->{accept_gzip} = ($accept_enc && $accept_enc =~ m/gzip/) ? 1 : 0;
 
                if ($conn) {
                    $reqstate->{keep_alive} = 0 if $conn =~ m/close/oi;
@@ -479,9 +1197,16 @@ sub unshift_read_header {
                    }
                }
 
-               # how much content to read?
                my $te  = $r->header('Transfer-Encoding');
-               my $len = $r->header('Content-Length');
+               if ($te && lc($te) eq 'chunked') {
+                   # Handle chunked transfer encoding
+                   $self->error($reqstate, 501, "chunked transfer encoding not supported");
+                   return;
+               } elsif ($te) {
+                   $self->error($reqstate, 501, "Unknown transfer encoding '$te'");
+                   return;
+               }
+
                my $pveclientip = $r->header('PVEClientIP');
 
                # fixme: how can we make PVEClientIP header trusted?
@@ -491,19 +1216,121 @@ sub unshift_read_header {
                    $r->header('PVEClientIP', $reqstate->{peer_host});
                }
 
-               if ($te && lc($te) eq 'chunked') {
-                   # Handle chunked transfer encoding
-                   $self->error($reqstate, 501, "chunked transfer encoding not supported");
-               } elsif ($te) {
-                   $self->error($reqstate, 501, "Unknown transfer encoding '$te'");
-               } elsif (defined($len)) {
-                   $reqstate->{hdl}->unshift_read (chunk => $len, sub {
-                       my ($hdl, $data) = @_;
-                       $r->content($data);
-                       $self->handle_request($reqstate);
-                                                   });
+               my $len = $r->header('Content-Length');
+
+               # header processing complete - authenticate now
+
+               my $auth = {};
+               if ($self->{spiceproxy}) {
+                   my $connect_str = $r->header('Host');
+                   my ($vmid, $node, $port) = PVE::AccessControl::verify_spice_connect_url($connect_str);
+                   if (!(defined($vmid) && $node && $port)) {
+                       $self->error($reqstate, HTTP_UNAUTHORIZED, "invalid ticket");
+                       return;
+                   }
+                   $self->handle_spice_proxy_request($reqstate, $connect_str, $vmid, $node, $port);
+                   return;
+               } elsif ($path =~ m!$baseuri!) {
+                   my $token = $r->header('CSRFPreventionToken');
+                   my $cookie = $r->header('Cookie');
+                   my $ticket = PVE::REST::extract_auth_cookie($cookie);
+
+                   my ($rel_uri, $format) = split_abs_uri($path);
+                   if (!$format) {
+                       $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri");
+                       return;
+                   }
+
+                   eval {
+                       $auth = PVE::REST::auth_handler($self->{rpcenv}, $reqstate->{peer_host}, $method, 
+                                                       $rel_uri, $ticket, $token);
+                   };
+                   if (my $err = $@) {
+                       # always delay unauthorized calls by 3 seconds
+                       my $delay = 3;
+                       if (my $formatter = get_login_formatter($format)) {
+                           my ($raw, $ct, $nocomp) = &$formatter($path, $auth);
+                           my $resp;
+                           if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
+                               $resp = $raw;
+                           } else {
+                               $resp = HTTP::Response->new(HTTP_UNAUTHORIZED, "Login Required");
+                               $resp->header("Content-Type" => $ct);
+                               $resp->content($raw);
+                           }
+                           $self->response($reqstate, $resp, undef, $nocomp, 3);
+                       } else {
+                           my $resp = HTTP::Response->new(HTTP_UNAUTHORIZED, $err);
+                           $self->response($reqstate, $resp, undef, 0, $delay);
+                       }
+                       return;
+                   }
+               }
+
+               $reqstate->{log}->{userid} = $auth->{userid};
+
+               if ($len) {
+
+                   if (!($method eq 'PUT' || $method eq 'POST')) {
+                       $self->error($reqstate, 501, "Unexpected content for method '$method'");
+                       return;
+                   }
+
+                   my $ctype = $r->header('Content-Type');
+                   my ($ct, $boundary) = parse_content_type($ctype) if $ctype;
+
+                   if ($auth->{isUpload} && !$self->{trusted_env}) {
+                       die "upload 'Content-Type '$ctype' not implemented\n" 
+                           if !($boundary && $ct && ($ct eq 'multipart/form-data'));
+
+                       die "upload without content length header not supported" if !$len;
+
+                       die "upload without content length header not supported" if !$len;
+
+                       print "start upload $path $ct $boundary\n" if $self->{debug};
+
+                       my $tmpfilename = get_upload_filename();
+                       my $outfh = IO::File->new($tmpfilename, O_RDWR|O_CREAT|O_EXCL, 0600) ||
+                           die "unable to create temporary upload file '$tmpfilename'";
+
+                       $reqstate->{keep_alive} = 0;
+
+                       my $boundlen = length($boundary) + 8; # \015?\012--$boundary--\015?\012
+
+                       my $state = {
+                           size => $len,
+                           boundary => $boundary,
+                           ctx => Digest::MD5->new,
+                           boundlen =>  $boundlen,
+                           maxheader => 2048 + $boundlen, # should be large enough
+                           params => decode_urlencoded($r->url->query()),
+                           phase => 0,
+                           read => 0,
+                           post_size => 0,
+                           starttime => [gettimeofday],
+                           outfh => $outfh,
+                       };
+                       $reqstate->{tmpfilename} = $tmpfilename;
+                       $reqstate->{hdl}->on_read(sub { $self->file_upload_multipart($reqstate, $auth, $method, $path, $state); });
+                       return;
+                   }
+
+                   if ($len > $limit_max_post) {
+                       $self->error($reqstate, 501, "for data too large");
+                       return;
+                   }
+
+                   if (!$ct || $ct eq 'application/x-www-form-urlencoded') {
+                       $reqstate->{hdl}->unshift_read(chunk => $len, sub {
+                           my ($hdl, $data) = @_;
+                           $r->content($data);
+                           $self->handle_request($reqstate, $auth, $method, $path);
+                       });
+                   } else {
+                       $self->error($reqstate, 506, "upload 'Content-Type '$ctype' not implemented");
+                   }
                } else {
-                   $self->handle_request($reqstate);
+                   $self->handle_request($reqstate, $auth, $method, $path);
                }
            } elsif ($line =~ /^([^:\s]+)\s*:\s*(.*)/) {
                $r->push_header($state->{key}, $state->{val}) if $state->{key};
@@ -528,12 +1355,12 @@ sub push_request_header {
            my ($hdl, $line) = @_;
 
            eval {
-               #print "got request header: $line\n";
+               # print "got request header: $line\n" if $self->{debug};
 
                $reqstate->{keep_alive}--;
 
                if ($line =~ /(\S+)\040(\S+)\040HTTP\/(\d+)\.(\d+)/o) {
-                   my ($method, $uri, $maj, $min) = ($1, $2, $3, $4);
+                   my ($method, $url, $maj, $min) = ($1, $2, $3, $4);
 
                    if ($maj != 1) {
                        $self->error($reqstate, 506, "http protocol version $maj.$min not supported");
@@ -545,10 +1372,12 @@ sub push_request_header {
                        $self->{end_loop} = 1;
                    }
                    $reqstate->{log} = { requestline => $line };
+                   $reqstate->{proto}->{str} = "HTTP/$maj.$min";
                    $reqstate->{proto}->{maj} = $maj;
                    $reqstate->{proto}->{min} = $min;
                    $reqstate->{proto}->{ver} = $maj*1000+$min;
-                   $reqstate->{request} = HTTP::Request->new($method, $uri);
+                   $reqstate->{request} = HTTP::Request->new($method, $url);
+                   $reqstate->{starttime} = [gettimeofday],
 
                    $self->unshift_read_header($reqstate);
                } elsif ($line eq '') {
@@ -616,11 +1445,18 @@ sub wait_end_loop {
 
     undef $self->{socket_watch};
 
+    $0 = "$0 (shutdown)" if $0 !~ m/\(shutdown\)$/;
+
     if ($self->{conn_count} <= 0) {
        $self->{end_cond}->send(1);
        return;
     }
 
+    # fork and exit, so that parent starts a new worker
+    if (fork()) {
+       exit(0);
+    }
+
     # else we need to wait until all open connections gets closed
     my $w; $w = AnyEvent->timer (after => 1, interval => 1, cb => sub {
        eval {
@@ -634,6 +1470,41 @@ sub wait_end_loop {
     });
 }
 
+
+sub check_host_access {
+    my ($self, $clientip) = @_;
+    
+    my $cip = Net::IP->new($clientip);
+
+    my $match_allow = 0;
+    my $match_deny = 0;
+
+    if ($self->{allow_from}) {
+       foreach my $t (@{$self->{allow_from}}) {
+           if ($t->overlaps($cip)) {
+               $match_allow = 1;
+               last;
+           }
+       }
+    }
+
+    if ($self->{deny_from}) {
+       foreach my $t (@{$self->{deny_from}}) {
+           if ($t->overlaps($cip)) {
+               $match_deny = 1;
+               last;
+           }
+       }
+    }
+
+    if ($match_allow == $match_deny) {
+       # match both allow and deny, or no match
+       return $self->{policy} && $self->{policy} eq 'allow' ? 1 : 0;
+    }
+
+    return $match_allow;
+}
+
 sub accept_connections {
     my ($self) = @_;
 
@@ -643,14 +1514,26 @@ sub accept_connections {
 
            my $reqstate = { keep_alive => $self->{keep_alive} };
 
+           # stop keep-alive when there are many open connections
+           if ($self->{conn_count} >= $self->{max_conn_soft_limit}) {
+               $reqstate->{keep_alive} = 0;
+           }
+
            if (my $sin = getpeername($clientfh)) {
-               my ($pport, $phost) = Socket::unpack_sockaddr_in($sin);
-               ($reqstate->{peer_port}, $reqstate->{peer_host}) = ($pport,  Socket::inet_ntoa($phost));
+               my ($pfamily, $pport, $phost) = PVE::Tools::unpack_sockaddr_in46($sin);
+               ($reqstate->{peer_port}, $reqstate->{peer_host}) = ($pport,  Socket::inet_ntop($pfamily, $phost));
+           }
+
+           if (!$self->{trusted_env} && !$self->check_host_access($reqstate->{peer_host})) {
+               print "$$: ABORT request from $reqstate->{peer_host} - access denied\n" if $self->{debug};
+               $reqstate->{log}->{code} = 403;
+               $self->log_request($reqstate);
+               next;
            }
 
            $reqstate->{hdl} = AnyEvent::Handle->new(
                fh => $clientfh,
-               rbuf_max => 32768, # fixme: set smaller max read buffer ?
+               rbuf_max => 64*1024,
                timeout => $self->{timeout},
                linger => 0, # avoid problems with ssh - really needed ?
                on_eof   => sub {
@@ -715,23 +1598,34 @@ sub write_log {
     }
 }
 
+sub atfork_handler {
+    my ($self) = @_;
+
+    eval {
+       # something else do to ?
+       close($self->{socket});
+    };
+    warn $@ if $@;
+}
+
 sub new {
     my ($this, %args) = @_;
 
     my $class = ref($this) || $this;
 
-    foreach my $req (qw(socket lockfh lockfile)) {
+    foreach my $req (qw(base_handler_class socket lockfh lockfile)) {
        die "misssing required argument '$req'" if !defined($args{$req});
     }
 
     my $self = bless { %args }, $class;
 
+    PVE::REST::set_base_handler_class($self->{base_handler_class});
+
     # init inotify
     PVE::INotify::inotify_init();
 
-    my $atfork = sub { close($self->{socket}); };
     $self->{rpcenv} = PVE::RPCEnvironment->init(
-       $self->{trusted_env} ? 'priv' : 'pub', atfork => $atfork);
+       $self->{trusted_env} ? 'priv' : 'pub', atfork =>  sub { $self-> atfork_handler() });
 
     fh_nonblocking($self->{socket}, 1);
 
@@ -743,14 +1637,23 @@ sub new {
     $self->{max_conn} = 800 if !$self->{max_conn};
     $self->{max_requests} = 8000 if !$self->{max_requests};
 
+    $self->{policy} = 'allow' if !$self->{policy};
+
     $self->{end_cond} = AnyEvent->condvar;
 
     if ($self->{ssl}) {
        $self->{tls_ctx} = AnyEvent::TLS->new(%{$self->{ssl}});
+       Net::SSLeay::CTX_set_options($self->{tls_ctx}->{ctx}, &Net::SSLeay::OP_NO_COMPRESSION);
+    }
+
+    if ($self->{spiceproxy}) {
+       $known_methods = { CONNECT => 1 };
     }
 
     $self->open_access_log($self->{logfile}) if $self->{logfile};
 
+    $self->{max_conn_soft_limit} = $self->{max_conn} > 100 ? $self->{max_conn} - 20 : $self->{max_conn};
+
     $self->{socket_watch} = AnyEvent->io(fh => $self->{socket}, poll => 'r', cb => sub {
        eval {
            if ($self->{conn_count} >= $self->{max_conn}) {