X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGitHTTPBackend.pm;h=b4851920fe04f55b51ede42fa6770b70982cf17e;hb=52052329acedddc0082487283a5a0390a8c86602;hp=70990ebc5a6a8fa3f76ac433d811f888cc264a58;hpb=311c2adc8c639813e0078631a8d97e5008452682;p=public-inbox.git diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index 70990ebc..b4851920 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -8,9 +8,9 @@ use strict; use warnings; use Fcntl qw(:seek); use IO::File; -use PublicInbox::Spawn qw(spawn); use HTTP::Date qw(time2str); use HTTP::Status qw(status_message); +use PublicInbox::Qspawn; # n.b. serving "description" and "cloneurl" should be innocuous enough to # not cause problems. serving "config" might... @@ -23,7 +23,7 @@ my @binary = qw! 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); @@ -40,15 +40,17 @@ sub r ($;$) { } sub serve { - my ($cgi, $git, $path) = @_; + my ($env, $git, $path) = @_; - my $service = $cgi->query_parameters->get('service') || ''; - if ($service =~ /\Agit-\w+-pack\z/ || $path =~ /\Agit-\w+-pack\z/) { - my $ok = serve_smart($cgi, $git, $path); + # 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 ($@) { @@ -63,7 +65,7 @@ sub drop_client ($) { } sub serve_dumb { - my ($cgi, $git, $path) = @_; + my ($env, $git, $path) = @_; my @h; my $type; @@ -78,11 +80,10 @@ sub serve_dumb { return r(404); } - my $f = "$git->{git_dir}/$path"; + my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $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}; # TODO: If-Modified-Since and Last-Modified? open my $in, '<', $f or return r(404); @@ -90,7 +91,7 @@ sub serve_dumb { 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, [] ]; @@ -118,7 +119,7 @@ sub serve_dumb { } 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 '') { @@ -152,7 +153,7 @@ sub prepare_range { push @$h, "bytes $beg-$end/$size"; # FIXME: Plack::Middleware::Deflater bug? - $cgi->{env}->{'psgix.no-compress'} = 1; + $env->{'psgix.no-compress'} = 1; } } ($code, $len); @@ -160,18 +161,12 @@ sub prepare_range { # 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 @@ -184,78 +179,71 @@ sub serve_smart { my $val = $env->{$name}; $env{$name} = $val if defined $val; } - my $git_dir = $git->{git_dir}; + my $git_dir = ref $git ? $git->{git_dir} : $git; $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 $x = 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 = $x->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'}; + 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; + + $x->start(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 {