use Fcntl;
use IO::File;
use File::stat qw();
+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;
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$/) {
} 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";
}
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, $clientip, $host, $method, $uri, $ticket, $token, $params) = @_;
$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$uri";
}
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);
}
sub handle_api2_request {
- my ($self, $reqstate, $auth, $upload_state) = @_;
+ 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) = split_abs_uri($path);
$rpcenv->set_user(undef); # clear after request
+ my $upgrade = $r->header('upgrade');
+ $upgrade = lc($upgrade) if $upgrade;
+
if (my $host = $res->{proxy}) {
if ($self->{trusted_env}) {
$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;
+ }
}
my $delay = 0;
}
}
- my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $path, $auth);
+ my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $params, $path, $auth);
my $resp;
if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
$reqstate->{hdl}->timeout(0);
$reqstate->{hdl}->wbuf_max(64*10*1024);
- my $remhost = $remip ? $remip : "127.0.0.1";
+ my $remhost = $remip ? $remip : "localhost";
my $remport = $remip ? 3128 : $spiceport;
tcp_connect $remhost, $remport, sub {
}
sub handle_request {
- my ($self, $reqstate, $auth) = @_;
+ my ($self, $reqstate, $auth, $method, $path) = @_;
eval {
my $r = $reqstate->{request};
- my $method = $r->method();
- my $path = $r->uri->path();
# 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);
+ $self->handle_api2_request($reqstate, $auth, $method, $path);
return;
}
}
sub file_upload_multipart {
- my ($self, $reqstate, $auth, $rstate) = @_;
+ my ($self, $reqstate, $auth, $method, $path, $rstate) = @_;
eval {
my $boundary = $rstate->{boundary};
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, $rstate);
+ $self->handle_api2_request($reqstate, $auth, $method, $path, $rstate);
}
}
};
my $r = $reqstate->{request};
if ($line eq '') {
- my $path = $r->uri->path();
+ my $path = uri_unescape($r->uri->path());
my $method = $r->method();
$r->push_header($state->{key}, $state->{val})
outfh => $outfh,
};
$reqstate->{tmpfilename} = $tmpfilename;
- $reqstate->{hdl}->on_read(sub { $self->file_upload_multipart($reqstate, $auth, $state); });
+ $reqstate->{hdl}->on_read(sub { $self->file_upload_multipart($reqstate, $auth, $method, $path, $state); });
return;
}
$reqstate->{hdl}->unshift_read(chunk => $len, sub {
my ($hdl, $data) = @_;
$r->content($data);
- $self->handle_request($reqstate, $auth);
+ $self->handle_request($reqstate, $auth, $method, $path);
});
} else {
$self->error($reqstate, 506, "upload 'Content-Type '$ctype' not implemented");
}
} else {
- $self->handle_request($reqstate, $auth);
+ $self->handle_request($reqstate, $auth, $method, $path);
}
} elsif ($line =~ /^([^:\s]+)\s*:\s*(.*)/) {
$r->push_header($state->{key}, $state->{val}) if $state->{key};
$reqstate->{proto}->{maj} = $maj;
$reqstate->{proto}->{min} = $min;
$reqstate->{proto}->{ver} = $maj*1000+$min;
- $reqstate->{request} = HTTP::Request->new($method, uri_unescape($url));
+ $reqstate->{request} = HTTP::Request->new($method, $url);
$reqstate->{starttime} = [gettimeofday],
$self->unshift_read_header($reqstate);
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 {
}
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})) {
projects / pve-manager.git / blobdiff