-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
-use Test::More;
-
-foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
- HTTP::Date HTTP::Status)) {
- eval "require $mod";
- plan skip_all => "$mod missing for httpd.t" if $@;
-}
-use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
-use IO::Socket;
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-require './t/common.perl';
+use v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
+use Socket qw(IPPROTO_TCP SOL_SOCKET);
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
# FIXME: too much setup
-my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/pi-home";
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
-my $maindir = "$tmpdir/main.git";
+my $inboxdir = "$tmpdir/i.git";
my $group = 'test-httpd';
my $addr = $group . '@example.com';
-my $cfgpfx = "publicinbox.$group";
-my $httpd = 'blib/script/public-inbox-httpd';
-my $init = 'blib/script/public-inbox-init';
-
-my %opts = (
- LocalAddr => '127.0.0.1',
- ReuseAddr => 1,
- Proto => 'tcp',
- Type => SOCK_STREAM,
- Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
-my $pid;
-use_ok 'PublicInbox::Git';
-use_ok 'PublicInbox::Import';
-use_ok 'Email::MIME';
-END { kill 'TERM', $pid if defined $pid };
+my $sock = tcp_server();
+my $td;
{
- local $ENV{HOME} = $home;
- ok(!system($init, $group, $maindir, 'http://example.com/', $addr),
- 'init ran properly');
-
- # ensure successful message delivery
- {
- my $mime = Email::MIME->new(<<EOF);
+ create_inbox 'test', tmpdir => $inboxdir, sub {
+ my ($im, $ibx) = @_;
+ $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT;
From: Me <me\@example.com>
To: You <you\@example.com>
Cc: $addr
nntp
EOF
-
- my $git = PublicInbox::Git->new($maindir);
- my $im = PublicInbox::Import->new($git, 'test', $addr);
- $im->add($mime);
- $im->done($mime);
+ };
+ my $i2 = create_inbox 'test-2', sub {
+ my ($im, $ibx) = @_;
+ $im->add(eml_load('t/plack-qp.eml')) or xbail '->add';
+ };
+ local $ENV{HOME} = $home;
+ my $cmd = [ '-init', $group, $inboxdir, 'http://example.com/', $addr ];
+ ok(run_script($cmd), 'init ran properly');
+ $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+ $td = start_script($cmd, undef, { 3 => $sock });
+ my $http_pfx = 'http://'.tcp_host_port($sock);
+ {
+ my $bad = tcp_connect($sock);
+ print $bad "GETT / HTTP/1.0\r\n\r\n" or die;
+ like(<$bad>, qr!\AHTTP/1\.[01] 405\b!, 'got 405 on bad req');
}
- ok($sock, 'sock created');
- my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err" ];
- $pid = spawn_listener(undef, $cmd, [$sock]);
- my $host = $sock->sockhost;
- my $port = $sock->sockport;
- my $conn = IO::Socket::INET->new(PeerAddr => $host,
- PeerPort => $port,
- Proto => 'tcp',
- Type => SOCK_STREAM);
- ok($conn, 'connected');
+ my $conn = tcp_connect($sock);
ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket');
{
my $buf;
is($conn->read($buf, 1), 0, "EOF");
}
- is(system(qw(git clone -q --mirror),
- "http://$host:$port/$group", "$tmpdir/clone.git"),
+ is(xsys(qw(git clone -q --mirror),
+ "$http_pfx/$group", "$tmpdir/clone.git"),
0, 'smart clone successful');
# ensure dumb cloning works, too:
- is(system('git', "--git-dir=$maindir",
+ is(xsys('git', "--git-dir=$inboxdir",
qw(config http.uploadpack false)),
0, 'disable http.uploadpack');
- is(system(qw(git clone -q --mirror),
- "http://$host:$port/$group", "$tmpdir/dumb.git"),
+ is(xsys(qw(git clone -q --mirror),
+ "$http_pfx/$group", "$tmpdir/dumb.git"),
0, 'clone successful');
- ok(kill('TERM', $pid), 'killed httpd');
- $pid = undef;
- waitpid(-1, 0);
+ # test config reload
+ my $cfg = "$home/.public-inbox/config";
+ open my $fh, '>>', $cfg or xbail "open: $!";
+ print $fh <<EOM or xbail "print $!";
+[publicinbox "test-2"]
+ inboxdir = $i2->{inboxdir}
+ address = test-2\@example.com
+ url = https://example.com/test-2
+EOM
+ close $fh or xbail "close $!";
+ $td->kill('HUP') or BAIL_OUT "failed to kill -httpd: $!";
+ tick; # wait for HUP to take effect
+ my $buf = do {
+ my $c2 = tcp_connect($sock);
+ $c2->write("GET /test-2/qp\@example.com/raw HTTP/1.0\r\n\r\n")
+ or xbail "c2 write: $!";
+ local $/;
+ <$c2>
+ };
+ like($buf, qr!\AHTTP/1\.0 200\b!s, 'got 200 after reload for test-2');
- is(system('git', "--git-dir=$tmpdir/clone.git",
+ ok($td->kill, 'killed httpd');
+ $td->join;
+
+ is(xsys('git', "--git-dir=$tmpdir/clone.git",
qw(fsck --no-verbose)), 0,
'fsck on cloned directory successful');
}
-done_testing();
+SKIP: {
+ skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
+ my $var = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
+ defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
+ ok(unpack('i', $x) > 0, 'TCP_DEFER_ACCEPT set');
+};
+SKIP: {
+ skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
+ if (system('kldstat -m accf_http >/dev/null') != 0) {
+ skip 'accf_http not loaded: kldload accf_http', 1;
+ }
+ require PublicInbox::Daemon;
+ ok(defined($PublicInbox::Daemon::SO_ACCEPTFILTER),
+ 'SO_ACCEPTFILTER defined');
+ my $x = getsockopt($sock, SOL_SOCKET,
+ $PublicInbox::Daemon::SO_ACCEPTFILTER);
+ like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP');
+};
-1;
+done_testing;