From b1364a3c98958963c76be0d75e2f03da838a0313 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 11 Nov 2021 15:07:13 +0100 Subject: [PATCH] webproxy: handle unflushed write buffer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit for proxied requests, we usually tear down the proxy connection immediately when closing the source connection. this is not the correct course of action for bulk one-way data streams that are proxied, where the source connection might be closed, but the proxy connection might still have data in the write buffer that needs to be written out. push_shutdown already handles this case (closing the socket/FH after it has been fully drained). one example for such a proxied data stream is the 'migrate' data for a remote migration, which gets proxied over a websocket connection. terminating the proxied connection early makes the target VM crash for obvious reasons. Signed-off-by: Fabian Grünbichler --- src/PVE/APIServer/AnyEvent.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index 86d0e2e..ecf771f 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -144,7 +144,8 @@ sub client_do_disconnect { }; if (my $proxyhdl = delete $reqstate->{proxyhdl}) { - &$shutdown_hdl($proxyhdl); + &$shutdown_hdl($proxyhdl) + if !$proxyhdl->{block_disconnect}; } my $hdl = delete $reqstate->{hdl}; @@ -627,9 +628,10 @@ sub websocket_proxy { } elsif ($opcode == 8) { my $statuscode = unpack ("n", $payload); $self->dprint("websocket received close. status code: '$statuscode'"); - if ($reqstate->{proxyhdl}) { - $reqstate->{proxyhdl}->push_shutdown(); - } + if (my $proxyhdl = $reqstate->{proxyhdl}) { + $proxyhdl->{block_disconnect} = 1 if length $proxyhdl->{wbuf} > 0; + $proxyhdl->push_shutdown(); + } $hdl->push_shutdown(); } elsif ($opcode == 9) { # ping received, schedule pong -- 2.39.2