proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-05-02 16:20:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AnyEvent/websocket_proxy: drop handling of websocket subprotocols

Browse Source 
We do not support any, and we only ever send binary frames, so drop
trying to parse the header.

For compatibility with current clients (novnc, pve-xtermjs), we have
to reply with the protocols it sent.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-05-17 15:07:35 +02:00 committed by Fabian Grünbichler
parent 1201435994
commit e7eb716588
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/PVE/APIServer/AnyEvent.pm
View File

@ -650,11 +650,13 @@ sub websocket_proxy {
# todo: use stop_read/start_read if write buffer grows to much # todo: use stop_read/start_read if write buffer grows to much
# for backwards, compatibility, we have to reply with the websocket
# subprotocol from the request
my $res = "$proto 101 Switching Protocols\015\012" . my $res = "$proto 101 Switching Protocols\015\012" .
"Upgrade: websocket\015\012" . "Upgrade: websocket\015\012" .
"Connection: upgrade\015\012" . "Connection: upgrade\015\012" .
"Sec-WebSocket-Accept: $wsaccept\015\012" . "Sec-WebSocket-Accept: $wsaccept\015\012" .
"Sec-WebSocket-Protocol: $wsproto\015\012" . ($wsproto ne "" ? "Sec-WebSocket-Protocol: $wsproto\015\012" : "") .
"\015\012"; "\015\012";
$self->dprint($res); $self->dprint($res);
@ -902,14 +904,7 @@ sub handle_api2_request {
die "unable to upgrade to protocol '$upgrade'\n" if !$upgrade || ($upgrade ne 'websocket'); die "unable to upgrade to protocol '$upgrade'\n" if !$upgrade || ($upgrade ne 'websocket');
my $wsver = $r->header('sec-websocket-version'); my $wsver = $r->header('sec-websocket-version');
die "unsupported websocket-version '$wsver'\n" if !$wsver || ($wsver ne '13'); die "unsupported websocket-version '$wsver'\n" if !$wsver || ($wsver ne '13');
my $wsproto_str = $r->header('sec-websocket-protocol'); my $wsproto = $r->header('sec-websocket-protocol') // "";
die "missing websocket-protocol header" if !$wsproto_str;
my $wsproto;
foreach my $p (PVE::Tools::split_list($wsproto_str)) {
$wsproto = $p if !$wsproto && $p eq 'base64';
$wsproto = $p if $p eq 'binary';
}
die "unsupported websocket-protocol protocol '$wsproto_str'\n" if !$wsproto;
my $wskey = $r->header('sec-websocket-key'); my $wskey = $r->header('sec-websocket-key');
die "missing websocket-key\n" if !$wskey; die "missing websocket-key\n" if !$wskey;
# Note: Digest::SHA::sha1_base64 has wrong padding # Note: Digest::SHA::sha1_base64 has wrong padding