X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=PVE%2FAPIClient%2FCommands%2Flxc.pm;h=c092028a722ed7d4959dff6aea7a670ec10443d4;hp=8a5cfb4813be0e966cba27c99e8a7e75ec70d33e;hb=e4c016351a2e807c569c4706f778298529b16761;hpb=84d4c3e267b85215f825c903d8beed3068612246;ds=sidebyside

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index 8a5cfb4..c092028 100644
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -2,25 +2,28 @@ package PVE::APIClient::Commands::lxc;
 
 use strict;
 use warnings;
+use Errno qw(EINTR EAGAIN);
 use JSON;
 use URI::Escape;
 use IO::Select;
 use IO::Socket::SSL;
 use MIME::Base64;
 use Digest::SHA;
+use HTTP::Response;
 
 use PVE::Tools;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::CLIHandler;
+use PVE::PTY;
 
 use base qw(PVE::CLIHandler);
 use PVE::APIClient::Config;
 
 my $CRLF = "\x0D\x0A";
-my $max_payload_size = 65536;
+my $max_payload_size = 128*1024;
 
 my $build_web_socket_request = sub {
-    my ($path, $ticket, $termproxy) = @_;
+    my ($host, $path, $ticket, $termproxy) = @_;
 
     my $key = '';
     $key .= chr(int(rand(256))) for 1 .. 16;
@@ -35,6 +38,7 @@ my $build_web_socket_request = sub {
     my $request = "GET $path HTTP/1.1$CRLF"
 	. "Upgrade: WebSocket$CRLF"
 	. "Connection: Upgrade$CRLF"
+	. "Host: $host$CRLF"
 	. "Sec-WebSocket-Key: $enckey$CRLF"
 	. "Sec-WebSocket-Version: 13$CRLF"
 	. "Sec-WebSocket-Protocol: binary$CRLF"
@@ -68,15 +72,13 @@ my $create_websockt_frame = sub {
 my $parse_web_socket_frame = sub  {
     my ($wsbuf_ref) = @_;
 
-    my $wsbuf = $$wsbuf_ref;
-
     my $payload;
     my $req_close = 0;
 
-    while (my $len = length($wsbuf)) {
+    while (my $len = length($$wsbuf_ref)) {
 	last if $len < 2;
 
-	my $hdr = unpack('C', substr($wsbuf, 0, 1));
+	my $hdr = unpack('C', substr($$wsbuf_ref, 0, 1));
 	my $opcode = $hdr & 0b00001111;
 	my $fin = $hdr & 0b10000000;
 
@@ -85,7 +87,7 @@ my $parse_web_socket_frame = sub  {
 	my $rsv = $hdr & 0b01110000;
 	die "received websocket frame with RSV flags\n" if $rsv;
 
-	my $payload_len = unpack 'C', substr($wsbuf, 1, 1);
+	my $payload_len = unpack 'C', substr($$wsbuf_ref, 1, 1);
 
 	my $masked = $payload_len & 0b10000000;
 	die "received masked websocket frame from server\n" if $masked;
@@ -94,11 +96,11 @@ my $parse_web_socket_frame = sub  {
 	$payload_len = $payload_len & 0b01111111;
 	if ($payload_len == 126) {
 	    last if $len < 4;
-	    $payload_len = unpack('n', substr($wsbuf, $offset, 2));
+	    $payload_len = unpack('n', substr($$wsbuf_ref, $offset, 2));
 	    $offset += 2;
 	} elsif ($payload_len == 127) {
 	    last if $len < 10;
-	    $payload_len = unpack('Q>', substr($wsbuf, $offset, 8));
+	    $payload_len = unpack('Q>', substr($$wsbuf_ref, $offset, 8));
 	    $offset += 8;
 	}
 
@@ -107,7 +109,7 @@ my $parse_web_socket_frame = sub  {
 
 	last if $len < ($offset + $payload_len);
 
-	my $data = substr($wsbuf, 0, $offset + $payload_len, ''); # now consume data
+	my $data = substr($$wsbuf_ref, 0, $offset + $payload_len, ''); # now consume data
 
 	my $frame_data = substr($data, $offset, $payload_len);
 
@@ -127,6 +129,26 @@ my $parse_web_socket_frame = sub  {
     return ($payload, $req_close);
 };
 
+my $full_write = sub {
+    my ($fh, $data) = @_;
+
+    my $len = length($data);
+    my $todo = $len;
+    my $offset = 0;
+    while(1) {
+	my $nr = syswrite($fh, $data, $todo, $offset);
+	if (!defined($nr)) {
+	    next if $! == EINTR || $! == EAGAIN;
+	    die "console write error - $!\n"
+	}
+	$offset += $nr;
+	$todo -= $nr;
+	last if $todo <= 0;
+    }
+
+    return $len;
+};
+
 __PACKAGE__->register_method ({
     name => 'enter',
     path => 'enter',
@@ -146,7 +168,8 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	my $conn = PVE::APIClient::Config::get_remote_connection($param->{remote});
+	my $config = PVE::APIClient::Config->load();
+	my $conn = PVE::APIClient::Config->remote_conn($config, $param->{remote});
 
 	# Get the real node from the resources endpoint
 	my $resource_list = $conn->get("api2/json/cluster/resources", { type => 'vm'});
@@ -171,9 +194,9 @@ __PACKAGE__->register_method ({
 	# WebSocket Handshake
 
 	my ($request, $wskey) = $build_web_socket_request->(
-	    "/$api_path/vncwebsocket", $conn->{ticket}, $termproxy);
+	    $conn->{host}, "/$api_path/vncwebsocket", $conn->{ticket}, $termproxy);
 
-	$web_socket->syswrite($request);
+	$full_write->($web_socket, $request);
 
 	my $wsbuf = '';
 
@@ -203,34 +226,125 @@ __PACKAGE__->register_method ({
 
 	die "got invalid websocket reponse: $raw_response\n"
 	    if !(($response->code == 101) &&
-		 ($response->header('connection') eq 'upgrade') &&
-		 ($response->header('upgrade') eq 'websocket') &&
+		 (lc $response->header('connection') eq 'upgrade') &&
+		 (lc $response->header('upgrade') eq 'websocket') &&
 		 ($response->header('sec-websocket-protocol') eq 'binary') &&
 		 ($response->header('sec-websocket-accept') eq $wsaccept));
 
 	# send auth again...
 	my $frame = $create_websockt_frame->($termproxy->{user} . ":" . $termproxy->{ticket} . "\n");
-	$web_socket->syswrite($frame);
+	$full_write->($web_socket, $frame);
+
+	# Send resize command
+	my ($columns, $rows) = PVE::PTY::tcgetsize(*STDIN);
+	$frame = $create_websockt_frame->("1:$columns:$rows:");
+	$full_write->($web_socket, $frame);
+
+	# Set STDIN to "raw -echo" mode
+	my $old_termios = PVE::PTY::tcgetattr(*STDIN);
+	my $raw_termios = {%$old_termios};
 
 	my $select = IO::Select->new;
 
-	$web_socket->blocking(0);
-	$select->add($web_socket);
-
-	while(my @ready = $select->can_read) {
-	    foreach my $fh (@ready) {
-		if ($fh == $web_socket) {
-		    my $nr = $wb_socket_read_available_bytes->();
-		    my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
-		    print "GOT: $payload\n" if defined($payload);
-		    last if $req_close;
-		    last if !$nr; # eos
-		} else {
-		    die "internal error - unknown handle";
+	eval {
+	    $SIG{TERM} = $SIG{INT} = $SIG{KILL} = sub { die "received interrupt\n"; };
+
+	    PVE::PTY::cfmakeraw($raw_termios);
+	    PVE::PTY::tcsetattr(*STDIN, $raw_termios);
+
+	    # And set it to non-blocking so we can every char with IO::Select.
+	    STDIN->blocking(0);
+
+	    $web_socket->blocking(1);
+	    $select->add($web_socket);
+	    my $input_fh = fileno(STDIN);
+	    $select->add($input_fh);
+
+	    my $ctrl_a_pressed_before = 0;
+
+	    my $winch_received = 0;
+	    $SIG{WINCH} = sub { $winch_received = 1; };
+
+	    my $check_terminal_size = sub {
+		my ($ncols, $nrows) = PVE::PTY::tcgetsize(*STDIN);
+		if ($ncols != $columns or $nrows != $rows) {
+		    $columns = $ncols;
+		    $rows = $nrows;
+		    $frame = $create_websockt_frame->("1:$columns:$rows:");
+		    $full_write->($web_socket, $frame);
 		}
+		$winch_received = 0;
+	    };
+
+	    while (1) {
+		while(my ($readable) = IO::Select->select($select, undef, undef, 3)) {
+		    $check_terminal_size->() if $winch_received;
+
+		    foreach my $fh (@$readable) {
+
+			if ($fh == $web_socket) {
+			    # Read from WebSocket
+
+			    my $nr = $wb_socket_read_available_bytes->();
+			    if (!defined($nr)) {
+				die "web socket read error $!\n";
+			    } elsif ($nr == 0) {
+				return; # EOF
+			    } else {
+				my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
+				if ($payload) {
+				    $full_write->(\*STDOUT, $payload);
+				}
+				return if $req_close;
+			    }
+
+			} elsif ($fh == $input_fh) {
+			    # Read from STDIN
+
+			    my $nr = read(\*STDIN, my $buff, 4096);
+			    return if !$nr; # EOF or error
+
+			    my $char = ord($buff);
+
+			    # check for CTRL-a-q
+			    return if $ctrl_a_pressed_before == 1 && $char == hex("0x71");
+
+			    $ctrl_a_pressed_before = ($char == hex("0x01") && $ctrl_a_pressed_before == 0) ? 1 : 0;
+
+			    my $frame = $create_websockt_frame->("0:" . $nr . ":" . $buff);
+			    $full_write->($web_socket, $frame);
+			}
+		    }
+		}
+		$check_terminal_size->() if $winch_received;
+
+		# got timeout
+		$full_write->($web_socket, $create_websockt_frame->("2")); # ping server to keep connection alive
 	    }
-	}
+	};
+	my $err = $@;
+
+	eval {  # cleanup
+
+	    # switch back to blocking mode (else later shell commands will fail).
+	    STDIN->blocking(1);
+
+	    if ($web_socket->connected) {
+		# close connection
+		my $msg = "\x88" . pack('N', 0) . pack('n', 0); # Opcode, mask, statuscode
+		$full_write->($web_socket, $msg);
+		close($web_socket);
+	    }
+
+	    # Reset the terminal parameters.
+	    $full_write->(\*STDOUT, "\e[24H\r\n");
+	    PVE::PTY::tcsetattr(*STDIN, $old_termios);
+	};
+	warn $@ if $@; # show cleanup errors
+
+	print STDERR "\nERROR: $err" if $err;
 
+	return undef;
     }});
 
 __PACKAGE__->register_method ({