From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 15/14] ds: don't try ->close after ->accept_SSL failure
Date: Thu, 2 Nov 2023 21:35:50 +0000 [thread overview]
Message-ID: <20231102213550.M92818@dcvr> (raw)
In-Reply-To: <20231102093539.2067470-4-e@80x24.org>
Eric Wong <e@80x24.org> wrote:
> --- a/lib/PublicInbox/DS.pm
> +++ b/lib/PublicInbox/DS.pm
> @@ -341,8 +341,8 @@ sub greet {
> my $ev = EPOLLIN;
> my $wbuf;
> if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
> - return CORE::close($sock) if $! != EAGAIN;
> - $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
> + return $sock->close if $! != EAGAIN;
> + $ev = PublicInbox::TLS::epollbit() or return $sock->close;
> $wbuf = [ \&accept_tls_step, $self->can('do_greet')];
> }
> new($self, $sock, $ev | EPOLLONESHOT);
Noticed this on deploy:
-----8<-----
Subject: [PATCH] ds: don't try ->close after ->accept_SSL failure
->accept_SSL failures leaves the socket ref as a GLOB (not
IO::Handle) and unable to respond to the ->close method.
Calling close in any form isn't actually necessary at all,
so just let refcounting destroy the socket.
---
lib/PublicInbox/DS.pm | 3 +--
t/nntpd-tls.t | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 33f80087..da26efc4 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -341,8 +341,7 @@ sub greet {
my $ev = EPOLLIN;
my $wbuf;
if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
- return $sock->close if $! != EAGAIN;
- $ev = PublicInbox::TLS::epollbit() or return $sock->close;
+ return if $! != EAGAIN || !($ev = PublicInbox::TLS::epollbit());
$wbuf = [ \&accept_tls_step, $self->can('do_greet')];
}
new($self, $sock, $ev | EPOLLONESHOT);
diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t
index cf3c95c9..a11a0dd9 100644
--- a/t/nntpd-tls.t
+++ b/t/nntpd-tls.t
@@ -185,6 +185,10 @@ for my $args (
is($x, undef, 'no BSD accept filter for plain NNTP');
};
+ my $s = tcp_connect($nntps);
+ syswrite($s, '->accept_SSL_ will fail on this!');
+ ok(!sysread($s, my $rbuf, 128), 'EOF or ECONNRESET on ->accept_SSL fail');
+
$c = undef;
$td->kill;
$td->join;
@@ -195,6 +199,7 @@ for my $args (
<$fh>;
};
unlike($eout, qr/wide/i, 'no Wide character warnings');
+ unlike($eout, qr/^E:/, 'no other errors');
}
done_testing();
next prev parent reply other threads:[~2023-11-02 21:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 9:35 [PATCH 00/14] IO/IPC-related cleanups Eric Wong
2023-11-02 9:35 ` [PATCH 01/14] xap_helper.pm: use do_fork to Reset and reseed Eric Wong
2023-11-02 9:35 ` [PATCH 02/14] ds: replace FD map hash table with array Eric Wong
2023-11-02 9:35 ` [PATCH 03/14] treewide: use ->close method rather than CORE::close Eric Wong
2023-11-02 21:35 ` Eric Wong [this message]
2023-11-02 9:35 ` [PATCH 04/14] cindex: drop redundant close on regular FH Eric Wong
2023-11-02 9:35 ` [PATCH 05/14] treewide: use ->close to call ProcessIO->CLOSE Eric Wong
2023-11-02 9:35 ` [PATCH 06/14] multi_git: use autodie Eric Wong
2023-11-02 9:35 ` [PATCH 07/14] git_credential: use autodie where appropriate Eric Wong
2023-11-02 9:35 ` [PATCH 08/14] replace ProcessIO with untied PublicInbox::IO Eric Wong
2023-11-02 9:35 ` [PATCH 09/14] io: introduce write_file helper sub Eric Wong
2023-11-02 9:35 ` [PATCH 10/14] spawn: support PerlIO layer in scalar redirects Eric Wong
2023-11-02 9:35 ` [PATCH 11/14] treewide: check alternates writes with eof + autodie Eric Wong
2023-11-02 9:35 ` [PATCH 12/14] treewide: use eof and close to detect readline errors Eric Wong
2023-11-02 9:35 ` [PATCH 13/14] move read_all, try_cat, and poll_in to PublicInbox::IO Eric Wong
2023-11-02 20:59 ` www: squash read_all usage fix Eric Wong
2023-11-02 9:35 ` [PATCH 14/14] t/cindex+extsearch: use write_file, autodie, etc Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231102213550.M92818@dcvr \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).