-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# note: our HTTP server should be standalone and capable of running
# generic PSGI/Plack apps.
-use strict;
-use warnings;
-use Test::More;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use Time::HiRes qw(gettimeofday tv_interval);
-use PublicInbox::Spawn qw(which spawn popen_rd);
-use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(spawn popen_rd);
require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::SHA qw(sha1_hex);
use IO::Handle ();
-use IO::Socket;
use IO::Socket::UNIX;
use Fcntl qw(:seek);
use Socket qw(IPPROTO_TCP TCP_NODELAY SOL_SOCKET);
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $psgi = "./t/httpd-corner.psgi";
-my $sock = tcp_server() or die;
+my $sock = tcp_server();
my @zmods = qw(PublicInbox::GzipFilter IO::Uncompress::Gunzip);
# Make sure we don't clobber socket options set by systemd or similar
}
} elsif ($^O eq 'freebsd' && system('kldstat -m accf_data >/dev/null') == 0) {
require PublicInbox::Daemon;
- my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+ my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
$accf_arg = pack('a16a240', 'dataready', '');
setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!";
}
Listen => 1024,
Type => Socket::SOCK_STREAM(),
Local => $_[0],
- );
+ ) or BAIL_OUT "bind + listen $_[0]: $!";
$s->blocking(0);
$s;
}
my $upath = "$tmpdir/s";
my $unix = unix_server($upath);
-ok($unix, 'UNIX socket created');
+my $alt = tcp_server();
my $td;
my $spawn_httpd = sub {
my (@args) = @_;
- my $cmd = [ '-httpd', @args, "--stdout=$out", "--stderr=$err", $psgi ];
- $td = start_script($cmd, undef, { 3 => $sock, 4 => $unix });
+ my $x = tcp_host_port($alt);
+ my $cmd = [ '-httpd', @args, "--stdout=$out", "--stderr=$err", $psgi,
+ '-l', "http://$x/?psgi=t/alt.psgi,env.PI_CONFIG=/path/to/alt".
+ ",err=$tmpdir/alt.err" ];
+ my $env = { PI_CONFIG => '/dev/null' };
+ $td = start_script($cmd, $env, { 3 => $sock, 4 => $unix, 5 => $alt });
};
$spawn_httpd->();
+{
+ my $conn = conn_for($alt, 'alt PSGI path');
+ $conn->write("GET / HTTP/1.0\r\n\r\n");
+ $conn->read(my $buf, 4096);
+ like($buf, qr!^/path/to/alt\z!sm,
+ 'alt.psgi loaded on alt socket with correct env');
+
+ $conn = conn_for($sock, 'default PSGI path');
+ $conn->write("GET /PI_CONFIG HTTP/1.0\r\n\r\n");
+ $conn->read($buf, 4096);
+ like($buf, qr!^/dev/null\z!sm,
+ 'default PSGI on original socket');
+ my $log = capture("$tmpdir/alt.err");
+ ok(grep(/ALT/, @$log), 'alt psgi.errors written to');
+ $log = capture($err);
+ ok(!grep(/ALT/, @$log), 'STDERR not written to');
+ is(unlink($err, "$tmpdir/alt.err"), 2, 'unlinked stderr and alt.err');
+
+ $td->kill('USR1'); # trigger reopen_logs
+}
+
if ('test worker death') {
my $conn = conn_for($sock, 'killed worker');
$conn->write("GET /pid HTTP/1.1\r\nHost:example.com\r\n\r\n");
like($body, qr/\A[0-9]+\z/, '/pid response');
isnt($body, $pid, 'respawned worker');
}
-
+{ # check on prior USR1 signal
+ ok(-e $err, 'stderr recreated after USR1');
+ ok(-e "$tmpdir/alt.err", 'alt.err recreated after USR1');
+}
+{
+ my $conn = conn_for($sock, 'Header spaces bogus');
+ $conn->write("GET /empty HTTP/1.1\r\nSpaced-Out : 3\r\n\r\n");
+ $conn->read(my $buf, 4096);
+ like($buf, qr!\AHTTP/1\.[0-9] 400 !, 'got 400 response on bad request');
+}
{
my $conn = conn_for($sock, 'streaming callback');
$conn->write("GET /callback HTTP/1.0\r\n\r\n");
ok($u, 'unix socket connected');
$u->write("GET /host-port HTTP/1.0\r\n\r\n");
$u->read(my $buf, 4096);
- like($buf, qr!\r\n\r\n127\.0\.0\.1:0\z!,
+ like($buf, qr!\r\n\r\n127\.0\.0\.1 0\z!,
'set REMOTE_ADDR and REMOTE_PORT for Unix socket');
}
$conn->write("GET /host-port HTTP/1.0\r\n\r\n");
$conn->read(my $buf, 4096);
my ($head, $body) = split(/\r\n\r\n/, $buf);
- my ($addr, $port) = split(/:/, $body);
- is($addr, $conn->sockhost, 'host matches addr');
+ my ($addr, $port) = split(/ /, $body);
+ is($addr, (tcp_host_port($conn))[0], 'host matches addr');
is($port, $conn->sockport, 'port matches');
}
$spawn_httpd->('-W0');
}
-sub delay { select(undef, undef, undef, shift || rand(0.02)) }
+sub delay { tick(shift || rand(0.02)) }
my $str = 'abcdefghijklmnopqrstuvwxyz';
my $len = length $str;
};
SKIP: {
- my $curl = which('curl') or skip('curl(1) missing', 4);
- my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
+ my $curl = require_cmd('curl', 1) or skip('curl(1) missing', 4);
+ my $base = 'http://'.tcp_host_port($sock);
my $url = "$base/sha1";
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
- my $cmd = [$curl, qw(--tcp-nodelay -T- -HExpect: -sSN), $url];
+ my $cmd = [$curl, qw(--tcp-nodelay -T- -HExpect: -gsSN), $url];
open my $cout, '+>', undef or die;
open my $cerr, '>', undef or die;
my $rdr = { 0 => $r, 1 => $cout, 2 => $cerr };
seek($cout, 0, SEEK_SET);
is(<$cout>, sha1_hex($str), 'read expected body');
- my $fh = popen_rd([$curl, '-sS', "$base/async-big"]);
+ my $fh = popen_rd([$curl, '-gsS', "$base/async-big"]);
my $n = 0;
my $non_zero = 0;
while (1) {
is($non_zero, 0, 'read all zeros');
require_mods(@zmods, 4);
- my $buf = xqx([$curl, '-sS', "$base/psgi-return-gzip"]);
+ my $buf = xqx([$curl, '-gsS', "$base/psgi-return-gzip"]);
is($?, 0, 'curl succesful');
IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out));
is($out, "hello world\n");
my $curl_rdr = { 2 => \(my $curl_err = '') };
- $buf = xqx([$curl, qw(-sSv --compressed),
+ $buf = xqx([$curl, qw(-gsSv --compressed),
"$base/psgi-return-compressible"], undef, $curl_rdr);
is($?, 0, 'curl --compressed successful');
is($buf, "goodbye world\n", 'gzipped response as expected');
SKIP: {
skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
skip 'accf_data not loaded: kldload accf_data' if !defined $accf_arg;
- my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+ my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
};
SKIP: {
skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
- my $lsof = which('lsof') or skip 'no lsof in PATH', 1;
+ my $lsof = require_cmd('lsof', 1) or skip 'no lsof in PATH', 1;
my $null_in = '';
my $rdr = { 2 => \(my $null_err), 0 => \$null_in };
my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $rdr);
- is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+ my $d = [ grep(/\(deleted\)/, @lsof) ];
+ is_deeply($d, [], 'no lingering deleted inputs') or diag explain($d);
# filter out pipes inherited from the parent
my @this = xqx([$lsof, '-p', $$], undef, $rdr);