X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=PVE%2FAPIClient%2FCommands%2Flxc.pm;h=23f33b2a68ee3a7285218b17a341c9749b5e3c2d;hp=7403143e9f2d581ea5e59197a917dd433cd4649f;hb=3226300c1bdd86a31d5efd7b81a4b02ed543d02e;hpb=06039c7f9bb20ba7259cdf5dbc4f6fff5fd05efc

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index 7403143..23f33b2 100644
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -13,6 +13,7 @@ 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;
@@ -21,7 +22,7 @@ my $CRLF = "\x0D\x0A";
 my $max_payload_size = 65536;
 
 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;
@@ -36,6 +37,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"
@@ -128,6 +130,35 @@ my $parse_web_socket_frame = sub  {
     return ($payload, $req_close);
 };
 
+my $client_exit = sub {
+    my ($select, $web_socket, $old_termios) = @_;
+
+    foreach my $fh ($select->handles) {
+	$select->remove($fh);
+
+	if ($fh == $web_socket) {
+	    if ($fh->connected) {
+
+		# close connection
+		# Opcode, mask, statuscode
+		my $msg = "\x88" . pack('N', 0) . pack('n', 0);
+		$fh->syswrite($msg);
+		close($fh);
+	    }
+	}
+
+    }
+
+    # switch back to blocking mode (else later shell commands will fail).
+    STDIN->blocking(0);
+
+    #
+    # Reset the terminal parameters.
+    #
+    print "\e[24H\r\n";
+    PVE::PTY::tcsetattr(*STDIN, $old_termios);
+};
+
 __PACKAGE__->register_method ({
     name => 'enter',
     path => 'enter',
@@ -147,7 +178,8 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	my $conn = PVE::APIClient::Config->new()->remote_conn($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'});
@@ -172,7 +204,7 @@ __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);
 
@@ -204,8 +236,8 @@ __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));
 
@@ -213,25 +245,95 @@ __PACKAGE__->register_method ({
 	my $frame = $create_websockt_frame->($termproxy->{user} . ":" . $termproxy->{ticket} . "\n");
 	$web_socket->syswrite($frame);
 
+	# Send resize command
+	my ($columns, $rows) = PVE::PTY::tcgetsize(*STDIN);
+	$frame = $create_websockt_frame->("1:$columns:$rows:");
+	$web_socket->syswrite($frame);
+
+	# Set STDIN to "raw -echo" mode
+	my $old_termios = PVE::PTY::tcgetattr(*STDIN);
+	my $raw_termios = {%$old_termios};
+	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);
+
 	my $select = IO::Select->new;
 
 	$web_socket->blocking(0);
 	$select->add($web_socket);
+	$select->add(fileno(STDIN));
+
+	my @messages;
+	my $ctrl_a_pressed_before = 0;
+	my $next_ping = time() + 3;
+
+	eval {
+	    while (1) {
+		# Ping server every 3 seconds.
+		my $now = time();
+		if ($now >= $next_ping) {
+		    push(@messages, $create_websockt_frame->("2"));
+		    $next_ping = $now + 3;
+		}
 
-	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";
+		# Write
+		foreach my $fh ($select->can_write(0.5)) {
+		    if ($fh == $web_socket and my $msg = shift @messages) {
+			$fh->syswrite($msg, length($msg));
+		    }
+		}
+
+		# Read
+		foreach my $fh ($select->can_read(0.5)) {
+
+		    # From Web Socket
+		    if ($fh == $web_socket) {
+			# Read from WebSocket
+			my $nr = $wb_socket_read_available_bytes->();
+			my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
+
+			if ($payload ne "OK") {
+			    syswrite(\*STDOUT, $payload, length($payload));
+			}
+		    }
+
+		    # From STDIN
+		    elsif ($fh == fileno(STDIN)) {
+
+			# Read from STDIN
+			my $nr = read(\*STDIN, my $buff, 4096);
+			if (!$nr) {
+			    next;
+			}
+
+			my $char = ord($buff);
+
+			if ($ctrl_a_pressed_before == 1 && $char == hex("0x71")) {
+			    $client_exit->($select, $web_socket, $old_termios);
+			    return;
+			}
+
+			if ($char == hex("0x01")) {
+			    if ($ctrl_a_pressed_before == 0) {
+				$ctrl_a_pressed_before = 1;
+			    }
+			}
+			else {
+			    $ctrl_a_pressed_before = 0;
+			}
+
+			push(@messages, $create_websockt_frame->("0:" . $nr . ":" . $buff));
+		    }
 		}
 	    }
-	}
+	};
+	print "ERROR: " . $@ . ".\n" if $@;
+
+	$client_exit->($select, $web_socket, $old_termios);
 
+	return undef
     }});
 
 __PACKAGE__->register_method ({