AnyEvent/websocket_proxy: remove 'base64' handling

novnc does not support this anymore since 2015, and neither does
our xtermjs client. it is also not listed in IANAs list of websocket
protocols [0].

so simply drop it and only send out binary frames and don't decode text frames

0: https://www.iana.org/assignments/websocket/websocket.xml#subprotocol-name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm
index f0e2e68739f6b83740a77e54dd1031d7032939aa..a7d31cc476b602cc28058e15307c0a8beb8892ef 100644 (file)
--- a/src/PVE/APIServer/AnyEvent.pm
+++ b/src/PVE/APIServer/AnyEvent.pm
@@ -496,15 +496,6 @@ sub websocket_proxy {
 
        my $max_payload_size = 128*1024;
 
-       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};
@@ -520,13 +511,9 @@ sub websocket_proxy {
 
            my $string;
            my $payload;
-           if ($binary) {
-               $string = $opcode ? $opcode : "\x82"; # binary frame
-               $payload = $$data;
-           } else {
-               $string = $opcode ? $opcode : "\x81"; # text frame
-               $payload = encode_base64($$data, '');
-           }
+
+           $string = $opcode ? $opcode : "\x82"; # binary frame
+           $payload = $$data;
 
            my $payload_len = length($payload);
            if ($payload_len <= 125) {
@@ -635,8 +622,6 @@ sub websocket_proxy {
                        $payload ^= $mask;
                    }
 
-                   $payload = decode_base64($payload) if !$binary;
-
                    if ($opcode == 1 || $opcode == 2) {
                        $reqstate->{proxyhdl}->push_write($payload) if $reqstate->{proxyhdl};
                    } elsif ($opcode == 8) {