From ebcaaf4606234a259120cd6f1d59e66979e3065c Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 10 Dec 2020 15:02:50 +0100 Subject: [PATCH] accept-phase: shutdown socket on early error if an error happens before AnyEvent::Handle registers the cleanup callback, we should shutdown/close the socket, when handling it. Using close, instead of shutdown($sock, SHUT_WR) here, since we are in an error-state, and would not read from the socket anyways. (Additionally close sends just on packet (RST,ACK), vs shutdown (FIN,ACK+RST,ACK) in its use here). Co-Authored-by: Dominik Csapak Signed-off-by: Stoiko Ivanov --- PVE/APIServer/AnyEvent.pm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm index be60f2e..d3b48b7 100644 --- a/PVE/APIServer/AnyEvent.pm +++ b/PVE/APIServer/AnyEvent.pm @@ -1532,6 +1532,11 @@ sub check_host_access { my $cip = Net::IP->new($clientip); + if (!$cip) { + $self->dprint("client IP not parsable: $@"); + return 0; + } + my $match_allow = 0; my $match_deny = 0; @@ -1564,10 +1569,10 @@ sub check_host_access { sub accept_connections { my ($self) = @_; - my $handle_creation; + my ($clientfh, $handle_creation); eval { - while (my $clientfh = $self->accept()) { + while ($clientfh = $self->accept()) { my $reqstate = { keep_alive => $self->{keep_alive} }; @@ -1579,12 +1584,16 @@ sub accept_connections { if (my $sin = getpeername($clientfh)) { my ($pfamily, $pport, $phost) = PVE::Tools::unpack_sockaddr_in46($sin); ($reqstate->{peer_port}, $reqstate->{peer_host}) = ($pport, Socket::inet_ntop($pfamily, $phost)); + } else { + close($clientfh); + next; } if (!$self->{trusted_env} && !$self->check_host_access($reqstate->{peer_host})) { $self->dprint("ABORT request from $reqstate->{peer_host} - access denied"); $reqstate->{log}->{code} = 403; $self->log_request($reqstate); + close($clientfh); next; } @@ -1625,6 +1634,7 @@ sub accept_connections { if (my $err = $@) { syslog('err', $err); + close($clientfh); if ($handle_creation) { if ($self->{conn_count} <= 0) { warn "connection count <= 0 not decrementing!\n"; -- 2.39.2