From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 97ECC6B0CA for ; Thu, 10 Dec 2020 15:03:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D8E71623F for ; Thu, 10 Dec 2020 15:03:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 28C1316218 for ; Thu, 10 Dec 2020 15:03:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EF0DA44FA6 for ; Thu, 10 Dec 2020 15:03:10 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 10 Dec 2020 15:02:50 +0100 Message-Id: <20201210140251.6127-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201210140251.6127-1-s.ivanov@proxmox.com> References: <20201210140251.6127-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.079 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH http-server v3 3/4] accept-phase: shutdown socket on early error X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 14:03:42 -0000 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.20.1