nntp: NNTPS and NNTP+STARTTLS working

[public-inbox.git] / t / nntpd.t

diff --git a/t/nntpd.t b/t/nntpd.t
index aa62ff6036b86648ec9303f20d5cfee07b1fe784..6cba2be435089207d7ad8a33d76b23f11d417461 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -19,7 +19,7 @@ use Sys::Hostname;
 require './t/common.perl';
 
 # FIXME: make easier to test both versions
-my $version = $ENV{PI_VERSION} || 2;
+my $version = $ENV{PI_TEST_VERSION} || 2;
 require_git('2.6') if $version == 2;
 
 my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
@@ -91,7 +91,7 @@ EOF
                $im->add($mime);
                $im->done;
                if ($version == 1) {
-                       my $s = PublicInbox::SearchIdx->new($mainrepo, 1);
+                       my $s = PublicInbox::SearchIdx->new($ibx, 1);
                        $s->index_sync;
                }
        }
@@ -106,6 +106,8 @@ EOF
        is_deeply($list, { $group => [ qw(1 1 n) ] }, 'LIST works');
        is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works');
        is_deeply($n->listgroup($group), [1], 'listgroup OK');
+       ok(!$n->starttls, 'STARTTLS fails when unconfigured');
+       is($n->code, 580, 'got 580 code on server w/o TLS');
 
        %opts = (
                PeerAddr => $host_port,
@@ -231,6 +233,43 @@ EOF
                ok($date >= $t0, 'valid date after start');
                ok($date <= $t1, 'valid date before stop');
        }
+       if ('leafnode interop') {
+               my $for_leafnode = PublicInbox::MIME->new(<<"");
+From: longheader\@example.com
+To: $addr
+Subject: none
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+               my $long_hdr = 'for-leafnode-'.('y'x200).'@example.com';
+               $for_leafnode->header_set('Message-ID', "<$long_hdr>");
+               $im->add($for_leafnode);
+               $im->done;
+               if ($version == 1) {
+                       my $s = PublicInbox::SearchIdx->new($ibx, 1);
+                       $s->index_sync;
+               }
+               my $hdr = $n->head("<$long_hdr>");
+               my $expect = qr/\AMessage-ID: /i . qr/\Q<$long_hdr>\E/;
+               ok(scalar(grep(/$expect/, @$hdr)), 'Message-ID not folded');
+               ok(scalar(grep(/^Path:/, @$hdr)), 'Path: header found');
+
+               # it's possible for v2 messages to have 2+ Message-IDs,
+               # but leafnode can't handle it
+               if ($version != 1) {
+                       my @mids = ("<$long_hdr>", '<2mid@wtf>');
+                       $for_leafnode->header_set('Message-ID', @mids);
+                       $for_leafnode->body_set('not-a-dupe');
+                       my $warn = '';
+                       $SIG{__WARN__} = sub { $warn .= join('', @_) };
+                       $im->add($for_leafnode);
+                       $im->done;
+                       like($warn, qr/reused/, 'warned for reused MID');
+                       $hdr = $n->head('<2mid@wtf>');
+                       my @hmids = grep(/\AMessage-ID: /i, @$hdr);
+                       is(scalar(@hmids), 1, 'Single Message-ID in header');
+                       like($hmids[0], qr/: <2mid\@wtf>/, 'got expected mid');
+               }
+       }
 
        # pipelined requests:
        {