X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=89f2866b55682215811eec1e87b7abc269b4a4d3;hb=4da62f284003d75abe7cb35594414eb2224f42bc;hp=fb3ffcf1fba6abaadd38ca95ea754a8c2e56d947;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git diff --git a/t/httpd-corner.t b/t/httpd-corner.t index fb3ffcf1..89f2866b 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 all contributors +# Copyright (C) 2016-2020 all contributors # License: AGPL-3.0+ # note: our HTTP server should be standalone and capable of running # generic PSGI/Plack apps. @@ -7,19 +7,15 @@ use warnings; use Test::More; use Time::HiRes qw(gettimeofday tv_interval); use PublicInbox::Spawn qw(which spawn); - -foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) { - eval "require $mod"; - plan skip_all => "$mod missing for httpd-corner.t" if $@; -} - +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 PublicInbox::TestCommon; my ($tmpdir, $for_destroy) = tmpdir(); my $fifo = "$tmpdir/fifo"; ok(defined mkfifo($fifo, 0777), 'created FIFO'); @@ -27,16 +23,18 @@ my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; 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); +my ($defer_accept_val, $accf_arg, $TCP_DEFER_ACCEPT); if ($^O eq 'linux') { - setsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT(), 5) or die; - my $x = getsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT()); + $TCP_DEFER_ACCEPT = eval { Socket::TCP_DEFER_ACCEPT() } // 9; + setsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT, 5) or die; + my $x = getsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT); defined $x or die "getsockopt: $!"; $defer_accept_val = unpack('i', $x); if ($defer_accept_val <= 0) { @@ -158,6 +156,38 @@ SKIP: { like($head, qr/\b413\b/, 'got 413 response'); } +{ + my $conn = conn_for($sock, '1.1 Transfer-Encoding bogus'); + $conn->write("PUT /sha1 HTTP/1.1\r\nTransfer-Encoding: bogus\r\n\r\n"); + $conn->read(my $buf, 4096); + like($buf, qr!\AHTTP/1\.[0-9] 400 !, 'got 400 response on bogus TE'); +} +{ + my $conn = conn_for($sock, '1.1 Content-Length bogus'); + $conn->write("PUT /sha1 HTTP/1.1\r\nContent-Length: 3.3\r\n\r\n"); + $conn->read(my $buf, 4096); + like($buf, qr!\AHTTP/1\.[0-9] 400 !, 'got 400 response on bad length'); +} + +{ + my $req = "PUT /sha1 HTTP/1.1\r\nContent-Length: 3\r\n" . + "Content-Length: 3\r\n\r\n"; + # this is stricter than it needs to be. Due to the way + # Plack::HTTPParser, PSGI specs, and how hash tables work in common + # languages; it's not possible to tell the difference between folded + # and intentionally bad commas (e.g. "Content-Length: 3, 3") + if (0) { + require Plack::HTTPParser; # XS or pure Perl + require Data::Dumper; + Plack::HTTPParser::parse_http_request($req, my $env = {}); + diag Data::Dumper::Dumper($env); # "Content-Length: 3, 3" + } + my $conn = conn_for($sock, '1.1 Content-Length dupe'); + $conn->write($req); + $conn->read(my $buf, 4096); + like($buf, qr!\AHTTP/1\.[0-9] 400 !, 'got 400 response on dupe length'); +} + { my $conn = conn_for($sock, 'chunk with pipeline'); my $n = 10; @@ -271,7 +301,7 @@ SKIP: { my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url]; open my $cout, '+>', undef or die; open my $cerr, '>', undef or die; - my $rdr = { 0 => fileno($r), 1 => fileno($cout), 2 => fileno($cerr) }; + my $rdr = { 0 => $r, 1 => $cout, 2 => $cerr }; my $pid = spawn($cmd, undef, $rdr); close $r or die "close read pipe: $!"; foreach my $c ('a'..'z') { @@ -282,7 +312,7 @@ SKIP: { waitpid($pid, 0); is($?, 0, 'curl exited successfully'); is(-s $cerr, 0, 'no errors from curl'); - $cout->seek(0, SEEK_SET); + seek($cout, 0, SEEK_SET); is(<$cout>, sha1_hex($str), 'read expected body'); open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!; @@ -296,6 +326,22 @@ SKIP: { close $fh or die "curl errored out \$?=$?"; 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 \$?=$?"; + 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'); } { @@ -498,7 +544,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"); @@ -531,7 +577,7 @@ SKIP: { SKIP: { skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux'; - my $var = Socket::TCP_DEFER_ACCEPT(); + my $var = $TCP_DEFER_ACCEPT; defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die; is(unpack('i', $x), $defer_accept_val, 'TCP_DEFER_ACCEPT unchanged if previously set'); @@ -568,6 +614,36 @@ SKIP: { is_deeply([], [keys %child], 'no extra pipes with -W0'); }; +# ensure compatibility with other PSGI servers +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) = @_; + my $req = GET('http://example.com/psgi-return-gzip'); + my $res = $cb->($req); + my $buf = $res->content; + IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out)); + 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(); sub capture {