X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=21b5c560db1901989d58a98a2f9ab2c165f628d5;hb=6645b8d288752cc94324efeffe68ce8a704598a3;hp=551af2b21526c822e7f479186d668d4ed380be85;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 551af2b2..21b5c560 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);
-require './t/common.perl';
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) {
@@ -124,40 +122,84 @@ 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');
}
+{
+ 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 +313,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 +324,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 +338,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');
}
{
@@ -364,10 +422,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');
@@ -378,9 +433,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);
}
{
@@ -498,7 +551,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 +584,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');
@@ -553,21 +606,51 @@ SKIP: {
# filter out pipes inherited from the parent
my @this = `lsof -p $$`;
my $bad;
- sub extract_inodes {
+ my $extract_inodes = sub {
map {;
my @f = split(' ', $_);
my $inode = $f[-2];
$bad = $_ if $inode !~ /\A[0-9]+\z/;
$inode => 1;
} grep (/\bpipe\b/, @_);
- }
- my %child = extract_inodes(@lsof);
- my %parent = extract_inodes(@this);
+ };
+ my %child = $extract_inodes->(@lsof);
+ my %parent = $extract_inodes->(@this);
skip("inode not in expected format: $bad", 1) if defined($bad);
delete @child{(keys %parent)};
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 {