From: René Jochum <r.jochum@proxmox.com>
Date: Tue, 5 Jun 2018 16:03:41 +0000 (+0200)
Subject: Fix the WebSocket client to work with none PVE servers.
X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=commitdiff_plain;h=6bb43016652af4ab78d34420ff0c8a5c5b0c9758

Fix the WebSocket client to work with none PVE servers.

For debugging I tested the WebSocket client with my Protocol::WebSocket
server (i have hexdumps in it), this patch is required to make it work
with it. I'm pretty sure we need it for Proxies too.
---

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index 250d5f3..e6ebb6c 100644
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -21,7 +21,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 +36,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"
@@ -173,7 +174,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 +206,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));