From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS63949 45.79.64.0/19 X-Spam-Status: No, score=-3.0 required=3.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from ms.lwn.net (ms.lwn.net [45.79.88.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 08EEE1F97F for ; Sat, 13 Oct 2018 21:42:35 +0000 (UTC) Received: from meer.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id C234872D; Sat, 13 Oct 2018 21:42:34 +0000 (UTC) From: Jonathan Corbet To: meta@public-inbox.org Cc: Eric Wong , Jonathan Corbet Subject: [PATCH 1/2] Put the NNTP server name into Xref lines Date: Sat, 13 Oct 2018 15:42:20 -0600 Message-Id: <20181013214221.7568-2-corbet@lwn.net> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181013214221.7568-1-corbet@lwn.net> References: <20181013214221.7568-1-corbet@lwn.net> List-Id: RFC 5536 sec 3.2.14 says that the server-name in an Xref line is "which news server generated the header field"; indeed, that is necessary for newsreaders like gnus to handle references properly. So pick up the server name from the config if available (the first name if there's more than one), from the host name otherwise, and use it rather than the domain name of the list server. Tests have been adjusted to match the new behavior. --- lib/PublicInbox/NNTP.pm | 4 ++-- lib/PublicInbox/NNTPD.pm | 10 ++++++++++ t/nntp.t | 3 ++- t/nntpd.t | 9 ++++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index cdbd8e9..cbd4ecf 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -94,7 +94,7 @@ sub new ($$$) { my $self = fields::new($class); $self->SUPER::new($sock); $self->{nntpd} = $nntpd; - res($self, '201 server ready - post via email'); + res($self, '201 ' . $nntpd->{servername} . ' ready - post via email'); $self->{rbuf} = ''; $self->watch_read(1); update_idle_time($self); @@ -410,7 +410,7 @@ sub header_append ($$$) { sub xref ($$$$) { my ($self, $ng, $n, $mid) = @_; - my $ret = "$ng->{domain} $ng->{newsgroup}:$n"; + my $ret = $self->{nntpd}->{servername} . " $ng->{newsgroup}:$n"; # num_for is pretty cheap and sometimes we'll lookup the existence # of an article without getting even the OVER info. In other words, diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm index 117c9c0..32848d7 100644 --- a/lib/PublicInbox/NNTPD.pm +++ b/lib/PublicInbox/NNTPD.pm @@ -6,15 +6,25 @@ package PublicInbox::NNTPD; use strict; use warnings; +use Sys::Hostname; require PublicInbox::Config; sub new { my ($class) = @_; + my $pi_config = PublicInbox::Config->new; + my $name = $pi_config->{'publicinbox.nntpserver'}; + if (!defined($name) or $name eq '') { + $name = hostname; + } elsif (ref($name) eq 'ARRAY') { + $name = $name->[0]; + } + bless { groups => {}, err => \*STDERR, out => \*STDOUT, grouplist => [], + servername => $name, }, $class; } diff --git a/t/nntp.t b/t/nntp.t index 57fef48..6df7db8 100644 --- a/t/nntp.t +++ b/t/nntp.t @@ -110,7 +110,8 @@ use_ok 'PublicInbox::Inbox'; my $mid = 'a@b'; my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n"); my $hdr = $mime->header_obj; - my $mock_self = { nntpd => { grouplist => [] } }; + my $mock_self = { nntpd => { grouplist => [], + servername => 'example.com' } }; PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid); is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ], 'Message-ID unchanged'); diff --git a/t/nntpd.t b/t/nntpd.t index 960e83c..f859908 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -16,6 +16,7 @@ use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); use File::Temp qw/tempdir/; use Net::NNTP; +use Sys::Hostname; my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; @@ -140,13 +141,14 @@ EOF 'from' => "El\xc3\xa9anor ", 'to' => "El\xc3\xa9anor ", 'cc' => $addr, - 'xref' => "example.com $group:1", + 'xref' => hostname . " $group:1", 'references' => '', ); my $s = IO::Socket::INET->new(%opts); sysread($s, my $buf, 4096); - is($buf, "201 server ready - post via email\r\n", 'got greeting'); + is($buf, "201 " . hostname . " ready - post via email\r\n", + 'got greeting'); $s->autoflush(1); ok(syswrite($s, " \r\n"), 'wrote spaces'); @@ -156,7 +158,8 @@ EOF $s = IO::Socket::INET->new(%opts); sysread($s, $buf, 4096); - is($buf, "201 server ready - post via email\r\n", 'got greeting'); + is($buf, "201 " . hostname . " ready - post via email\r\n", + 'got greeting'); $s->autoflush(1); syswrite($s, "NEWGROUPS 19990424 000000 GMT\r\n"); -- 2.17.2