X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=681486550688222d82fa0e8adbcd61256fb72527;hb=46742d95647c7a80cb2f60d5c134717dd91e22e2;hp=e50aa43682babfd66d006237eababf3c3863b054;hpb=a71cb67a1237c450a9cbbd6738c5af3b73ba4c61;p=public-inbox.git diff --git a/t/httpd-corner.t b/t/httpd-corner.t index e50aa436..68148655 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -6,15 +6,17 @@ use strict; use warnings; use Test::More; use Time::HiRes qw(gettimeofday tv_interval); -use PublicInbox::Spawn qw(which spawn); +use PublicInbox::Spawn qw(which spawn popen_rd); use PublicInbox::TestCommon; require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)); use Digest::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); use POSIX qw(mkfifo); +use Carp (); my ($tmpdir, $for_destroy) = tmpdir(); my $fifo = "$tmpdir/fifo"; ok(defined mkfifo($fifo, 0777), 'created FIFO'); @@ -24,9 +26,6 @@ my $psgi = "./t/httpd-corner.psgi"; my $sock = tcp_server() or die; my @zmods = qw(PublicInbox::GzipFilter IO::Uncompress::Gunzip); -# make sure stdin is not a pipe for lsof test to check for leaking pipes -open(STDIN, '<', '/dev/null') or die 'no /dev/null: $!'; - # Make sure we don't clobber socket options set by systemd or similar # using socket activation: my ($defer_accept_val, $accf_arg, $TCP_DEFER_ACCEPT); @@ -121,36 +120,48 @@ if ('test worker death') { is(scalar(grep(/CLOSE FAIL/, @$after)), 1, 'body->close not called'); } -SKIP: { +sub check_400 { + my ($conn) = @_; + my $r = $conn->read(my $buf, 8192); + # ECONNRESET and $r==0 are both observed on FreeBSD 11.2 + if (!defined($r)) { + ok($!{ECONNRESET}, 'ECONNRESET on read (BSD sometimes)'); + } elsif ($r > 0) { + like($buf, qr!\AHTTP/1\.\d 400 !, 'got 400 response'); + } else { + is($r, 0, 'got EOF (BSD sometimes)'); + } + close($conn); # ensure we don't get SIGPIPE later +} + +{ + local $SIG{PIPE} = 'IGNORE'; my $conn = conn_for($sock, 'excessive header'); - $SIG{PIPE} = 'IGNORE'; $conn->write("GET /callback HTTP/1.0\r\n"); foreach my $i (1..500000) { last unless $conn->write("X-xxxxxJunk-$i: omg\r\n"); } ok(!$conn->write("\r\n"), 'broken request'); - ok($conn->read(my $buf, 8192), 'read response'); - my ($head, $body) = split(/\r\n\r\n/, $buf); - like($head, qr/\b400\b/, 'got 400 response'); + check_400($conn); } { my $conn = conn_for($sock, 'excessive body Content-Length'); - $SIG{PIPE} = 'IGNORE'; my $n = (10 * 1024 * 1024) + 1; $conn->write("PUT /sha1 HTTP/1.0\r\nContent-Length: $n\r\n\r\n"); - ok($conn->read(my $buf, 8192), 'read response'); + my $r = $conn->read(my $buf, 8192); + ok($r > 0, 'read response'); my ($head, $body) = split(/\r\n\r\n/, $buf); like($head, qr/\b413\b/, 'got 413 response'); } { my $conn = conn_for($sock, 'excessive body chunked'); - $SIG{PIPE} = 'IGNORE'; my $n = (10 * 1024 * 1024) + 1; $conn->write("PUT /sha1 HTTP/1.1\r\nTransfer-Encoding: chunked\r\n"); $conn->write("\r\n".sprintf("%x\r\n", $n)); - ok($conn->read(my $buf, 8192), 'read response'); + my $r = $conn->read(my $buf, 8192); + ok($r > 0, 'read response'); my ($head, $body) = split(/\r\n\r\n/, $buf); like($head, qr/\b413\b/, 'got 413 response'); } @@ -285,6 +296,8 @@ my $len = length $str; is($len, 26, 'got the alphabet'); my $check_self = sub { my ($conn) = @_; + vec(my $rbits = '', fileno($conn), 1) = 1; + select($rbits, undef, undef, 30) or Carp::confess('timed out'); $conn->read(my $buf, 4096); my ($head, $body) = split(/\r\n\r\n/, $buf, 2); like($head, qr/\r\nContent-Length: 40\r\n/s, 'got expected length'); @@ -292,12 +305,12 @@ my $check_self = sub { }; SKIP: { - which('curl') or skip('curl(1) missing', 4); + my $curl = which('curl') or skip('curl(1) missing', 4); my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport; my $url = "$base/sha1"; my ($r, $w); pipe($r, $w) or die "pipe: $!"; - my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url]; + my $cmd = [$curl, qw(--tcp-nodelay -T- -HExpect: -sSN), $url]; open my $cout, '+>', undef or die; open my $cerr, '>', undef or die; my $rdr = { 0 => $r, 1 => $cout, 2 => $cerr }; @@ -314,7 +327,7 @@ SKIP: { seek($cout, 0, SEEK_SET); is(<$cout>, sha1_hex($str), 'read expected body'); - open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!; + my $fh = popen_rd([$curl, '-sS', "$base/async-big"]); my $n = 0; my $non_zero = 0; while (1) { @@ -322,19 +335,26 @@ SKIP: { $n += $r; $buf =~ /\A\0+\z/ or $non_zero++; } - close $fh or die "curl errored out \$?=$?"; + close $fh or die "close curl pipe: $!"; + is($?, 0, 'curl succesful'); is($n, 30 * 1024 * 1024, 'got expected output from curl'); is($non_zero, 0, 'read all zeros'); - require_mods(@zmods, 1); - open $fh, '-|', qw(curl -sS), "$base/psgi-return-gzip" or die; - binmode $fh; - my $buf = do { local $/; <$fh> }; - close $fh or die "curl errored out \$?=$?"; + require_mods(@zmods, 2); + my $buf = xqx([$curl, '-sS', "$base/psgi-return-gzip"]); + is($?, 0, 'curl succesful'); IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out)); is($out, "hello world\n"); } +{ + my $conn = conn_for($sock, 'psgi_return ENOENT'); + print $conn "GET /psgi-return-enoent HTTP/1.1\r\n\r\n" or die; + my $buf = ''; + sysread($conn, $buf, 16384, length($buf)) until $buf =~ /\r\n\r\n/; + like($buf, qr!HTTP/1\.[01] 500\b!, 'got 500 error on ENOENT'); +} + { my $conn = conn_for($sock, '1.1 pipeline together'); $conn->write("PUT /sha1 HTTP/1.1\r\nUser-agent: hello\r\n\r\n" . @@ -370,17 +390,20 @@ SKIP: { { my $conn = conn_for($sock, 'graceful termination during slow request'); - $conn->write("PUT /sha1 HTTP/1.0\r\n"); - delay(); - $conn->write("Content-Length: $len\r\n"); - delay(); - $conn->write("\r\n"); - is($td->kill, 1, 'started graceful shutdown'); - delay(); + $conn->write("PUT /sha1 HTTP/1.0\r\nContent-Length: $len\r\n\r\n"); + + # XXX ugh, want a reliable and non-intrusive way to detect + # that the server has started buffering our partial request so we + # can reliably test graceful termination. Maybe making this and + # similar tests dependent on Linux strace is a possibility? + delay(0.1); + + is($td->kill, 1, 'start graceful shutdown'); my $n = 0; foreach my $c ('a'..'z') { $n += $conn->write($c); } + ok(kill(0, $td->{pid}), 'graceful shutdown did not kill httpd'); is($n, $len, 'wrote alphabet'); $check_self->($conn); $td->join; @@ -401,10 +424,7 @@ SKIP: { ok($!, 'got error set in $!'); is($w, undef, 'write error happened'); ok($n > 0, 'was able to write'); - my $r = $conn->read(my $buf, 66666); - ok($r > 0, 'got non-empty response'); - like($buf, qr!HTTP/1\.\d 400 !, 'got 400 response'); - + check_400($conn); $conn = conn_for($sock, '1.1 chunk trailer excessive'); $conn->write("PUT /sha1 HTTP/1.1\r\nTransfer-Encoding:chunked\r\n\r\n"); is($conn->syswrite("1\r\na"), 4, 'wrote first header + chunk'); @@ -415,9 +435,7 @@ SKIP: { } ok($!, 'got error set in $!'); ok($n > 0, 'wrote part of chunk end (\r)'); - $r = $conn->read($buf, 66666); - ok($r > 0, 'got non-empty response'); - like($buf, qr!HTTP/1\.\d 400 !, 'got 400 response'); + check_400($conn); } { @@ -535,7 +553,7 @@ SKIP: { } { - my $conn = conn_for($sock, '1.1 Connnection: close'); + my $conn = conn_for($sock, '1.1 Connection: close'); $conn->write("PUT /sha1 HTTP/1.1\r\nConnection:close\r\n"); delay(); $conn->write("Content-Length: $len\r\n\r\n$str"); @@ -583,12 +601,14 @@ SKIP: { SKIP: { skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux'; - skip 'no lsof in PATH', 1 unless which('lsof'); - my @lsof = `lsof -p $td->{pid}`; + my $lsof = which('lsof') 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'); # filter out pipes inherited from the parent - my @this = `lsof -p $$`; + my @this = xqx([$lsof, '-p', $$], undef, $rdr); my $bad; my $extract_inodes = sub { map {; @@ -610,6 +630,11 @@ SKIP: { require_mods(@zmods, qw(Plack::Test HTTP::Request::Common), 3); use_ok 'HTTP::Request::Common'; use_ok 'Plack::Test'; + STDERR->flush; + open my $olderr, '>&', \*STDERR or die "dup stderr: $!"; + open my $tmperr, '+>', undef or die; + open STDERR, '>&', $tmperr or die; + STDERR->autoflush(1); my $app = require $psgi; test_psgi($app, sub { my ($cb) = @_; @@ -617,8 +642,17 @@ SKIP: { my $res = $cb->($req); my $buf = $res->content; IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out)); - is($out, "hello world\n"); + is($out, "hello world\n", 'got expected output'); + + $req = GET('http://example.com/psgi-return-enoent'); + $res = $cb->($req); + is($res->code, 500, 'got error on ENOENT'); + seek($tmperr, 0, SEEK_SET) or die; + my $errbuf = do { local $/; <$tmperr> }; + like($errbuf, qr/this-better-not-exist/, + 'error logged about missing command'); }); + open STDERR, '>&', $olderr or die "restore stderr: $!"; } done_testing();