githttpbackend: check for other errors and relax CRLF check

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 54ccfa05c555ec193f7eea188806d449a9ab1515..cd8cdf84abde7addb167af5f0fec59c5030ed87d 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -18,7 +18,7 @@ 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...
-my @text = qw[HEAD info/refs
+my @text = qw[HEAD info/refs info/attributes
        objects/info/(?:http-alternates|alternates|packs)
        cloneurl description];
 
@@ -182,11 +182,6 @@ sub prepare_range {
 # returns undef if 403 so it falls back to dumb HTTP
 sub serve_smart {
        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 %env = %ENV;
        # GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL
        # may be set in the server-process and are passed as-is
@@ -200,79 +195,30 @@ sub serve_smart {
                $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) };
+       $env{PATH_TRANSLATED} = "$git->{git_dir}/$path";
+       my $rdr = input_prepare($env) or return r(500);
        my $qsp = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, $rdr);
-       my ($fh, $rpipe);
-       my $end = sub {
-               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 = '';
-       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 $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->();
-                       }
-                       $res->($r);
-               } elsif ($async) {
-                       $fh = $res->($r);
-                       $async->async_pass($env->{'psgix.io'}, $fh, \$buf);
-               } else { # 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;
-                       }
-               });
-       };
+       $qsp->psgi_return($env, $limiter, sub {
+               my ($r, $bref) = @_;
+               my $res = parse_cgi_headers($r, $bref) or return; # incomplete
+               $res->[0] == 403 ? serve_dumb($env, $git, $path) : $res;
+       });
 }
 
-sub input_to_file {
+sub input_prepare {
        my ($env) = @_;
+
+       my $input = $env->{'psgi.input'};
+       my $fd = eval { fileno($input) };
+       if (defined $fd && $fd >= 0) {
+               return { 0 => $fd };
+       }
        open(my $in, '+>', undef);
        unless (defined $in) {
                err($env, "could not open temporary file: $!");
                return;
        }
-       my $input = $env->{'psgi.input'};
        my $buf;
        while (1) {
                my $r = $input->read($buf, 8192);
@@ -297,16 +243,17 @@ sub input_to_file {
                err($env, "error seeking temporary file: $!");
                return;
        }
-       return $in;
+       { 0 => fileno($in), -hold => $in };
 }
 
 sub parse_cgi_headers {
-       my ($bref) = @_;
-       $$bref =~ s/\A(.*?)\r\n\r\n//s or return;
+       my ($r, $bref) = @_;
+       return r(500) unless defined $r && $r >= 0;
+       $$bref =~ s/\A(.*?)\r?\n\r?\n//s or return $r == 0 ? r(500) : undef;
        my $h = $1;
        my $code = 200;
        my @h;
-       foreach my $l (split(/\r\n/, $h)) {
+       foreach my $l (split(/\r?\n/, $h)) {
                my ($k, $v) = split(/:\s*/, $l, 2);
                if ($k =~ /\AStatus\z/i) {
                        ($code) = ($v =~ /\b(\d+)\b/);