X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=783c0076e7d0771ba76f6a607be63f26c54ba80a;hb=2fcf2b14a9ce3336af3f58fd23bc18f9a6876718;hp=87ddf7a4af83312e41edc775e0794066d73e6ce3;hpb=54c25a9cfb9a5eee44672b126eb75b9bb20aa957;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 87ddf7a4..783c0076 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -53,7 +53,7 @@ sub new ($$$) {
 	my $wbuf;
 	if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
 		return CORE::close($sock) if $! != EAGAIN;
-		$ev = PublicInbox::TLS::epollbit();
+		$ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
 		$wbuf = [ \&PublicInbox::DS::accept_tls_step, \&greet ];
 	}
 	$self->SUPER::new($sock, $ev | EPOLLONESHOT);
@@ -411,8 +411,8 @@ sub xref ($$$$) {
 	$ret;
 }
 
-sub set_nntp_headers ($$$) {
-	my ($self, $hdr, $smsg) = @_;
+sub set_nntp_headers ($$) {
+	my ($hdr, $smsg) = @_;
 	my ($mid) = $smsg->{mid};
 
 	# why? leafnode requires a Path: header for some inexplicable
@@ -432,22 +432,27 @@ sub set_nntp_headers ($$$) {
 		$hdr->header_set('X-Alt-Message-ID', @alt);
 	}
 
-	# clobber some
-	my $ng = $self->{ng};
-	my $xref = xref($self, $ng, $smsg->{num}, $mid);
+	# clobber some existing headers
+	my $ibx = $smsg->{-ibx};
+	my $xref = xref($smsg->{nntp}, $ibx, $smsg->{num}, $mid);
 	$hdr->header_set('Xref', $xref);
-	$xref =~ s/:[0-9]+//g;
-	$hdr->header_set('Newsgroups', (split(/ /, $xref, 2))[1]);
-	header_append($hdr, 'List-Post', "<mailto:$ng->{-primary_address}>");
-	if (my $url = $ng->base_url) {
+
+	# RFC 5536 3.1.4
+	my $newsgroups = (split(/ /, $xref, 2))[1]; # drop server name
+	$newsgroups =~ s/:[0-9]+\b//g; # drop NNTP article numbers
+	$newsgroups =~ tr/ /,/;
+	$hdr->header_set('Newsgroups', $newsgroups);
+
+	header_append($hdr, 'List-Post', "<mailto:$ibx->{-primary_address}>");
+	if (my $url = $ibx->base_url) {
 		$mid = mid_escape($mid);
 		header_append($hdr, 'Archived-At', "<$url$mid/>");
 		header_append($hdr, 'List-Archive', "<$url>");
 	}
 }
 
-sub art_lookup ($$) {
-	my ($self, $art) = @_;
+sub art_lookup ($$$) {
+	my ($self, $art, $code) = @_;
 	my $ng = $self->{ng};
 	my ($n, $mid);
 	my $err;
@@ -483,7 +488,18 @@ find_mid:
 	}
 found:
 	my $smsg = $ng->over->get_art($n) or return $err;
-	$smsg;
+	$smsg->{-ibx} = $ng;
+	if ($code == 223) { # STAT
+		set_art($self, $n);
+		"223 $n <$smsg->{mid}> article retrieved - " .
+			"request text separately";
+	} else { # HEAD | BODY | ARTICLE
+		$smsg->{nntp} = $self;
+		$smsg->{nntp_code} = $code;
+		set_art($self, $art);
+		# this dereferences to `undef'
+		${git_async_cat($ng->git, $smsg->{blob}, \&blob_cb, $smsg)};
+	}
 }
 
 sub msg_body_write ($$) {
@@ -501,9 +517,9 @@ sub set_art {
 	$self->{article} = $art if defined $art && $art =~ /\A[0-9]+\z/;
 }
 
-sub msg_hdr_write ($$$) {
-	my ($self, $eml, $smsg) = @_;
-	set_nntp_headers($self, $eml, $smsg);
+sub msg_hdr_write ($$) {
+	my ($eml, $smsg) = @_;
+	set_nntp_headers($eml, $smsg);
 
 	my $hdr = $eml->{hdr} // \(my $x = '');
 	# fixup old bug from import (pre-a0c07cba0e5d8b6a)
@@ -513,17 +529,17 @@ sub msg_hdr_write ($$$) {
 	# for leafnode compatibility, we need to ensure Message-ID headers
 	# are only a single line.
 	$$hdr =~ s/^(Message-ID:)[ \t]*\r\n[ \t]+([^\r]+)\r\n/$1 $2\r\n/igsm;
-	$self->msg_more($$hdr);
+	$smsg->{nntp}->msg_more($$hdr);
 }
 
 sub blob_cb { # called by git->cat_async via git_async_cat
 	my ($bref, $oid, $type, $size, $smsg) = @_;
 	my $self = $smsg->{nntp};
-	my $code = $smsg->{nntp_code} // 220;
+	my $code = $smsg->{nntp_code};
 	if (!defined($oid)) {
 		# it's possible to have TOCTOU if an admin runs
 		# public-inbox-(edit|purge), just move onto the next message
-		warn "E: $smsg->{blob} missing in $self->{ng}->{inboxdir}\n";
+		warn "E: $smsg->{blob} missing in $smsg->{-ibx}->{inboxdir}\n";
 		return $self->requeue;
 	} elsif ($smsg->{blob} ne $oid) {
 		$self->close;
@@ -533,12 +549,12 @@ sub blob_cb { # called by git->cat_async via git_async_cat
 	my $eml = PublicInbox::Eml->new($bref);
 	if ($code == 220) {
 		more($self, $r .= 'head and body follow');
-		msg_hdr_write($self, $eml, $smsg);
+		msg_hdr_write($eml, $smsg);
 		$self->msg_more("\r\n");
 		msg_body_write($self, $bref);
 	} elsif ($code == 221) {
 		more($self, $r .= 'head follows');
-		msg_hdr_write($self, $eml, $smsg);
+		msg_hdr_write($eml, $smsg);
 	} elsif ($code == 222) {
 		more($self, $r .= 'body follows');
 		msg_body_write($self, $bref);
@@ -552,40 +568,22 @@ sub blob_cb { # called by git->cat_async via git_async_cat
 
 sub cmd_article ($;$) {
 	my ($self, $art) = @_;
-	my $smsg = art_lookup($self, $art);
-	return $smsg unless ref $smsg;
-	set_art($self, $art);
-	$smsg->{nntp} = $self;
-	${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+	art_lookup($self, $art, 220);
 }
 
 sub cmd_head ($;$) {
 	my ($self, $art) = @_;
-	my $smsg = art_lookup($self, $art);
-	return $smsg unless ref $smsg;
-	set_art($self, $art);
-	$smsg->{nntp} = $self;
-	$smsg->{nntp_code} = 221;
-	${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+	art_lookup($self, $art, 221);
 }
 
 sub cmd_body ($;$) {
 	my ($self, $art) = @_;
-	my $smsg = art_lookup($self, $art);
-	return $smsg unless ref $smsg;
-	set_art($self, $art);
-	$smsg->{nntp} = $self;
-	$smsg->{nntp_code} = 222;
-	${git_async_cat($self->{ng}->git, $smsg->{blob}, \&blob_cb, $smsg)};
+	art_lookup($self, $art, 222);
 }
 
 sub cmd_stat ($;$) {
 	my ($self, $art) = @_;
-	my $r = art_lookup($self, $art);
-	return $r unless ref $r;
-	my ($n, $mid) = @$r;
-	set_art($self, $art);
-	"223 $n <$mid> article retrieved - request text separately";
+	art_lookup($self, $art, 223); # art may be msgid
 }
 
 sub cmd_ihave ($) { '435 article not wanted - do not send it' }