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 BEC3C68E30 for ; Fri, 4 Dec 2020 18:57:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0A81D38F for ; Fri, 4 Dec 2020 18:56:50 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E92D3D250 for ; Fri, 4 Dec 2020 18:56:48 +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 AF25844D59 for ; Fri, 4 Dec 2020 18:56:48 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 4 Dec 2020 18:56:27 +0100 Message-Id: <20201204175629.30116-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201204175629.30116-1-s.ivanov@proxmox.com> References: <20201204175629.30116-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [anyevent.pm] Subject: [pve-devel] [PATCH http-server v2 3/5] 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: Fri, 04 Dec 2020 17:57:20 -0000 if an error happens before AnyEvent::Handle registers the cleanup callback, we should shutdown the socket, when handling it. Co-Authored-by: Dominik Csapak Signed-off-by: Stoiko Ivanov --- PVE/APIServer/AnyEvent.pm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm index af2fde8..a679006 100644 --- a/PVE/APIServer/AnyEvent.pm +++ b/PVE/APIServer/AnyEvent.pm @@ -1535,6 +1535,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; @@ -1567,10 +1572,13 @@ sub check_host_access { sub accept_connections { my ($self) = @_; - my $hdl_err; + my ($clientfh, $early_err, $hdl_err); eval { - while (my $clientfh = $self->accept()) { + while (1) { + $early_err = 1; + $clientfh = $self->accept(); + last if !$clientfh; my $reqstate = { keep_alive => $self->{keep_alive} }; @@ -1582,14 +1590,19 @@ 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 { + shutdown($clientfh, 1); + next; } if (!$self->{trusted_env} && !$self->check_host_access($reqstate->{peer_host})) { print "$$: ABORT request from $reqstate->{peer_host} - access denied\n" if $self->{debug}; $reqstate->{log}->{code} = 403; $self->log_request($reqstate); + shutdown($clientfh, 1); next; } + $early_err = 0; $hdl_err = 1; $self->{conn_count}++; @@ -1625,6 +1638,7 @@ sub accept_connections { if (my $err = $@) { syslog('err', $err); + shutdown($clientfh, 1) if $early_err || $hdl_err; if ($hdl_err) { if ($self->{conn_count} <= 0) { my $msg = "connection count <= 0 not decrementing!\n"; -- 2.20.1