use strict;
use warnings;
use Fcntl qw(:seek);
-use IO::File;
-use PublicInbox::Spawn qw(spawn);
+use IO::Handle;
use HTTP::Date qw(time2str);
use HTTP::Status qw(status_message);
+use Plack::Util;
+use PublicInbox::Qspawn;
+
+# 32 is same as the git-daemon connection limit
+my $default_limiter = PublicInbox::Qspawn::Limiter->new(32);
# n.b. serving "description" and "cloneurl" should be innocuous enough to
# not cause problems. serving "config" might...
objects/pack/pack-[a-f0-9]{40}\.(?:pack|idx)
!;
-our $ANY = join('|', @binary, @text);
+our $ANY = join('|', @binary, @text, 'git-upload-pack');
my $BIN = join('|', @binary);
my $TEXT = join('|', @text);
'Pragma', 'no-cache',
'Cache-Control', 'no-cache, max-age=0, must-revalidate');
-my $nextq;
-sub do_next () {
- my $q = $nextq;
- $nextq = undef;
- while (my $cb = shift @$q) {
- $cb->(); # this may redefine nextq
- }
-}
-
sub r ($;$) {
my ($code, $msg) = @_;
$msg ||= status_message($code);
}
sub serve {
- my ($cgi, $git, $path) = @_;
+ my ($env, $git, $path) = @_;
- my $service = $cgi->param('service') || '';
- if ($service =~ /\Agit-\w+-pack\z/ || $path =~ /\Agit-\w+-pack\z/) {
- my $ok = serve_smart($cgi, $git, $path);
+ # XXX compatibility... ugh, can we stop supporting this?
+ $git = PublicInbox::Git->new($git) unless ref($git);
+
+ # Documentation/technical/http-protocol.txt in git.git
+ # requires one and exactly one query parameter:
+ if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ ||
+ $path =~ /\Agit-\w+-pack\z/) {
+ my $ok = serve_smart($env, $git, $path);
return $ok if $ok;
}
- serve_dumb($cgi, $git, $path);
+ serve_dumb($env, $git, $path);
}
sub err ($@) {
}
}
+my $prev = 0;
+my $exp;
+sub cache_one_year {
+ my ($h) = @_;
+ my $t = time + 31536000;
+ push @$h, 'Expires', $t == $prev ? $exp : ($exp = time2str($prev = $t)),
+ 'Cache-Control', 'public, max-age=31536000';
+}
+
sub serve_dumb {
- my ($cgi, $git, $path) = @_;
+ my ($env, $git, $path) = @_;
my @h;
my $type;
- if ($path =~ /\A(?:$BIN)\z/o) {
- $type = 'application/octet-stream';
- push @h, 'Expires', time2str(time + 31536000);
- push @h, 'Cache-Control', 'public, max-age=31536000';
+ if ($path =~ m!\Aobjects/[a-f0-9]{2}/[a-f0-9]{38}\z!) {
+ $type = 'application/x-git-loose-object';
+ cache_one_year(\@h);
+ } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.pack\z!) {
+ $type = 'application/x-git-packed-objects';
+ cache_one_year(\@h);
+ } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.idx\z!) {
+ $type = 'application/x-git-packed-objects-toc';
+ cache_one_year(\@h);
} elsif ($path =~ /\A(?:$TEXT)\z/o) {
$type = 'text/plain';
push @h, @no_cache;
return r(404);
}
- my $f = "$git->{git_dir}/$path";
+ my $f = $git->{git_dir} . '/' . $path;
return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
- my @st = stat(_);
- my $size = $st[7];
- my $env = $cgi->{env};
+ my $size = -s _;
# TODO: If-Modified-Since and Last-Modified?
open my $in, '<', $f or return r(404);
my $code = 200;
push @h, 'Content-Type', $type;
if (($env->{HTTP_RANGE} || '') =~ /\bbytes=(\d*)-(\d*)\z/) {
- ($code, $len) = prepare_range($cgi, $in, \@h, $1, $2, $size);
+ ($code, $len) = prepare_range($env, $in, \@h, $1, $2, $size);
if ($code == 416) {
push @h, 'Content-Range', "bytes */$size";
return [ 416, \@h, [] ];
}
sub prepare_range {
- my ($cgi, $in, $h, $beg, $end, $size) = @_;
+ my ($env, $in, $h, $beg, $end, $size) = @_;
my $code = 200;
my $len = $size;
if ($beg eq '') {
push @$h, "bytes $beg-$end/$size";
# FIXME: Plack::Middleware::Deflater bug?
- $cgi->{env}->{'psgix.no-compress'} = 1;
+ $env->{'psgix.no-compress'} = 1;
}
}
($code, $len);
# returns undef if 403 so it falls back to dumb HTTP
sub serve_smart {
- my ($cgi, $git, $path) = @_;
- my $env = $cgi->{env};
+ my ($env, $git, $path) = @_;
my $in = $env->{'psgi.input'};
my $fd = eval { fileno($in) };
unless (defined $fd && $fd >= 0) {
$in = input_to_file($env) or return r(500);
}
- my ($rpipe, $wpipe);
- unless (pipe($rpipe, $wpipe)) {
- err($env, "error creating pipe: $! - going static");
- return;
- }
my %env = %ENV;
# GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL
# may be set in the server-process and are passed as-is
my $val = $env->{$name};
$env{$name} = $val if defined $val;
}
+ my $limiter = $git->{-httpbackend_limiter} || $default_limiter;
my $git_dir = $git->{git_dir};
$env{GIT_HTTP_EXPORT_ALL} = '1';
$env{PATH_TRANSLATED} = "$git_dir/$path";
- my %rdr = ( 0 => fileno($in), 1 => fileno($wpipe) );
- my $pid = spawn([qw(git http-backend)], \%env, \%rdr);
- unless (defined $pid) {
- err($env, "error spawning: $! - going static");
- return;
- }
- $wpipe = $in = undef;
+ my $rdr = { 0 => fileno($in) };
+ my $qsp = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, $rdr);
+ my ($fh, $rpipe);
my $end = sub {
- $rpipe = undef;
- my $e = $pid == waitpid($pid, 0) ?
- $? : "PID:$pid still running?";
- if ($e) {
- err($env, "git http-backend ($git_dir): $e");
- drop_client($env);
+ if (my $err = $qsp->finish) {
+ err($env, "git http-backend ($git_dir): $err");
}
+ $fh->close if $fh; # async-only
};
# Danga::Socket users, we queue up the read_enable callback to
# fire after pending writes are complete:
my $buf = '';
- if (my $async = $env->{'pi-httpd.async'}) {
- my $res;
- my $q = sub {
- $async->close;
- $end->();
- $res->(@_);
- };
- # $async is PublicInbox::HTTPD::Async->new($rpipe, $cb)
- $async = $async->($rpipe, sub {
- my $r = sysread($rpipe, $buf, 1024, length($buf));
- if (!defined $r || $r == 0) {
- return $q->(r(500, 'http-backend error'));
+ my $rd_hdr = sub {
+ my $r = sysread($rpipe, $buf, 1024, length($buf));
+ return if !defined($r) && ($!{EINTR} || $!{EAGAIN});
+ return r(500, 'http-backend error') unless $r;
+ $r = parse_cgi_headers(\$buf) or return; # incomplete headers
+ $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
+ };
+ my $res;
+ my $async = $env->{'pi-httpd.async'}; # XXX unstable API
+ my $io = $env->{'psgix.io'};
+ my $cb = sub {
+ my $r = $rd_hdr->() or return;
+ $rd_hdr = undef;
+ if (scalar(@$r) == 3) { # error:
+ if ($async) {
+ $async->close; # calls rpipe->close
+ } else {
+ $rpipe->close;
+ $end->();
}
- $r = parse_cgi_headers(\$buf) or return;
- if ($r->[0] == 403) {
- return $q->(serve_dumb($cgi, $git, $path));
+ return $res->($r);
+ }
+ if ($async) {
+ $fh = $res->($r);
+ return $async->async_pass($io, $fh, \$buf);
+ }
+
+ # for synchronous PSGI servers
+ require PublicInbox::GetlineBody;
+ $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
+ $res->($r);
+ };
+ sub {
+ ($res) = @_;
+
+ # hopefully this doesn't break any middlewares,
+ # holding the input here is a waste of FDs and memory
+ $env->{'psgi.input'} = undef;
+
+ $qsp->start($limiter, sub { # may run later, much later...
+ ($rpipe) = @_;
+ $in = undef;
+ if ($async) {
+ $async = $async->($rpipe, $cb, $end);
+ } else { # generic PSGI
+ $cb->() while $rd_hdr;
}
- my $fh = $res->($r);
- $fh->write($buf);
- $buf = undef;
- my $dst = Plack::Util::inline_object(
- write => sub { $fh->write(@_) },
- close => sub {
- $end->();
- $fh->close;
- });
- $async->async_pass($env->{'psgix.io'}, $dst);
});
- sub { ($res) = @_ }; # let Danga::Socket handle the rest.
- } else { # getline + close for other PSGI servers
- my $r;
- do {
- $r = read($rpipe, $buf, 1024, length($buf));
- if (!defined $r || $r == 0) {
- return r(500, 'http-backend error');
- }
- $r = parse_cgi_headers(\$buf);
- } until ($r);
- return serve_dumb($cgi, $git, $path) if $r->[0] == 403;
- $r->[2] = Plack::Util::inline_object(
- close => sub { $end->() },
- getline => sub {
- my $ret = $buf;
- $buf = undef;
- defined $ret ? $ret : $rpipe->getline;
- });
- $r;
-
- }
+ };
}
sub input_to_file {
my ($env) = @_;
- my $in = IO::File->new_tmpfile;
+ open(my $in, '+>', undef);
+ unless (defined $in) {
+ err($env, "could not open temporary file: $!");
+ return;
+ }
my $input = $env->{'psgi.input'};
my $buf;
while (1) {
err($env, "error reading input: $!");
return;
}
- last if ($r == 0);
- $in->write($buf);
+ my $off = 0;
+ while ($r > 0) {
+ my $w = syswrite($in, $buf, $r, $off);
+ if (defined $w) {
+ $r -= $w;
+ $off += $w;
+ } else {
+ err($env, "error writing temporary file: $!");
+ return;
+ }
+ }
+ }
+ unless (defined(sysseek($in, 0, SEEK_SET))) {
+ err($env, "error seeking temporary file: $!");
+ return;
}
- $in->flush;
- $in->sysseek(0, SEEK_SET);
return $in;
}