X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=aabfd4ffb46798f58240405f0cd70cb0d12fed79;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hp=388620e550c26db752f5b75f15d02fe05e257c28;hpb=83fedde4cde6539386c9d3ecf37fb99d74af8d93;p=public-inbox.git diff --git a/t/nntp.t b/t/nntp.t index 388620e5..aabfd4ff 100644 --- a/t/nntp.t +++ b/t/nntp.t @@ -1,20 +1,20 @@ -# Copyright (C) 2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2015-2019 all contributors +# License: AGPL-3.0+ use strict; use warnings; use Test::More; -use Data::Dumper; -foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) { +foreach my $mod (qw(DBD::SQLite Data::Dumper)) { eval "require $mod"; plan skip_all => "$mod missing for nntp.t" if $@; } use_ok 'PublicInbox::NNTP'; +use_ok 'PublicInbox::Inbox'; { sub quote_str { - my (undef, $s) = split(/ = /, Dumper($_[0]), 2); + my (undef, $s) = split(/ = /, Data::Dumper::Dumper($_[0]), 2); $s =~ s/;\n//; $s; } @@ -95,4 +95,45 @@ use_ok 'PublicInbox::NNTP'; } } +{ # test setting NNTP headers in HEAD and ARTICLE requests + require Email::MIME; + my $u = 'https://example.com/a/'; + my $ng = PublicInbox::Inbox->new({ name => 'test', + inboxdir => 'test.git', + address => 'a@example.com', + -primary_address => 'a@example.com', + newsgroup => 'test', + domain => 'example.com', + url => '//example.com/a'}); + is($ng->base_url, $u, 'URL expanded'); + 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 => [], + servername => 'example.com' } }; + PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid); + is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ], + 'Message-ID unchanged'); + is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ], + 'Archived-At: set'); + is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ], + 'List-Archive: set'); + is_deeply([ $mime->header('List-Post') ], [ '' ], + 'List-Post: set'); + is_deeply([ $mime->header('Newsgroups') ], [ 'test' ], + 'Newsgroups: set'); + is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ], + 'Xref: set'); + + $ng->{-base_url} = 'http://mirror.example.com/m/'; + PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid); + is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ], + 'Message-ID unchanged'); + is_deeply([ $mime->header('Archived-At') ], + [ "<${u}a\@b/>", '' ], + 'Archived-At: appended'); + is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ], + 'Old Xref: clobbered'); +} + done_testing();