nntp: allow and ignore empty commands

Somebody hitting "\n" into telnet shouldn't hold a client up
indefinitely and prevent shutdown.

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 23be7754445b01686a6df0e209ef539cd285553b..c574c9e62290dc2dbea4085d866675983126c414 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -116,6 +116,7 @@ sub args_ok ($$) {
 sub process_line ($$) {
        my ($self, $l) = @_;
        my ($req, @args) = split(/\s+/, $l);
+       return unless defined($req);
        $req = lc($req);
        $req = eval {
                no strict 'refs';
@@ -955,7 +956,7 @@ sub event_read {
                $self->{rbuf} .= $$buf;
        }
        my $r = 1;
-       while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]+)\r?\n//) {
+       while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]*)\r?\n//) {
                my $line = $1;
                return $self->close if $line =~ /[[:cntrl:]]/s;
                my $t0 = now();
@@ -975,7 +976,7 @@ sub event_read {
 sub watch_read {
        my ($self, $bool) = @_;
        my $rv = $self->SUPER::watch_read($bool);
-       if ($bool && $self->{rbuf} ne '') {
+       if ($bool && index($self->{rbuf}, "\n") >= 0) {
                # Force another read if there is a pipelined request.
                # We don't know if the socket has anything for us to read,
                # and we must double-check again by the time the timer fires

diff --git a/t/nntpd.t b/t/nntpd.t
index 2815d8d641694073b2a62ee852735303c77c15ea..20191cb68a398b6c7822abe05901f3442dbb59a4 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -122,6 +122,8 @@ EOF
        is($buf, "201 server ready - post via email\r\n", 'got greeting');
        $s->autoflush(1);
 
+       ok(syswrite($s, "   \r\n"), 'wrote spaces');
+       ok(syswrite($s, "\r\n"), 'wrote nothing');
        syswrite($s, "NEWGROUPS\t19990424 000000 \033GMT\007\r\n");
        is(0, sysread($s, $buf, 4096), 'GOT EOF on cntrl');