[pve-devel] [PATCH http-server 2/3] accept-phase: shutdown socket on early error
Stoiko Ivanov
s.ivanov at proxmox.com
Thu Dec 3 19:43:21 CET 2020
if an error happens before AnyEvent::Handle registers the cleanup
callback, we should shutdown the socket, when handling it.
Co-Authored-by: Dominik Csapak <d.csapak at proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
PVE/APIServer/AnyEvent.pm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm
index c5f5fdc..7038b07 100644
--- a/PVE/APIServer/AnyEvent.pm
+++ b/PVE/APIServer/AnyEvent.pm
@@ -1552,9 +1552,13 @@ sub check_host_access {
sub accept_connections {
my ($self) = @_;
+ my ($clientfh, $early_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} };
@@ -1566,15 +1570,21 @@ 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;
+
$reqstate->{hdl} = AnyEvent::Handle->new(
fh => $clientfh,
rbuf_max => 64*1024,
@@ -1609,6 +1619,7 @@ sub accept_connections {
if (my $err = $@) {
syslog('err', $err);
+ shutdown($clientfh, 1) if $early_err;
$self->{end_loop} = 1;
}
--
2.20.1
More information about the pve-devel
mailing list