X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=PVE%2FAPIClient%2FCommands%2Flxc.pm;h=df7262571744323fb71eb6640bb1e823351e26bd;hp=250d5f3b1a675589a308a42383aeefa02a4cf20a;hb=1334102e03c47615e683479ce2eb1ede4bf5864b;hpb=69aa81b3966c2da1f071a624dc73edcc55268484 diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm index 250d5f3..df72625 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" @@ -69,15 +71,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; @@ -86,7 +86,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; @@ -95,11 +95,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; } @@ -108,7 +108,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); @@ -128,6 +128,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(1); + + # + # Reset the terminal parameters. + # + print "\e[24H\r\n"; + PVE::PTY::tcsetattr(*STDIN, $old_termios); +}; + __PACKAGE__->register_method ({ name => 'enter', path => 'enter', @@ -173,7 +202,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); @@ -205,8 +234,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)); @@ -214,25 +243,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 ({