git: allow cloning from the URL root, too

[public-inbox.git] / lib / PublicInbox / GitHTTPBackend.pm

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 9464cb499a3f0c4744b8b33eec1559e415da4887..b4851920fe04f55b51ede42fa6770b70982cf17e 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -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,8 +161,7 @@ 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) {
@@ -179,17 +179,15 @@ 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) );
        my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
        my ($fh, $rpipe);
        my $end = sub {
-               $rpipe = undef;
                if (my $err = $x->finish) {
                        err($env, "git http-backend ($git_dir): $err");
-                       drop_client($env);
                }
                $fh->close if $fh; # async-only
        };
@@ -201,8 +199,8 @@ sub serve_smart {
                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;
-               $r->[0] == 403 ? serve_dumb($cgi, $git, $path) : $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'};
@@ -211,7 +209,12 @@ sub serve_smart {
                my $r = $rd_hdr->() or return;
                $rd_hdr = undef;
                if (scalar(@$r) == 3) { # error:
-                       $async->close if $async;
+                       if ($async) {
+                               $async->close; # calls rpipe->close
+                       } else {
+                               $rpipe->close;
+                               $end->();
+                       }
                        return $res->($r);
                }
                if ($async) {
@@ -220,13 +223,8 @@ sub serve_smart {
                }
 
                # for synchronous PSGI servers
-               $r->[2] = Plack::Util::inline_object(
-                       close => $end,
-                       getline => sub {
-                               my $ret = $buf;
-                               $buf = undef;
-                               defined $ret ? $ret : $rpipe->getline;
-                       });
+               require PublicInbox::GetlineBody;
+               $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
                $res->($r);
        };
        sub {