update copyrights for 2018

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index ed8fdf004c6ced412c1238ef8d10250e2402d6c0..4d2816a00c4b92b8a9b562906b9d944f567eadaa 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # when no endpoints match, fallback to this and serve a static file
@@ -7,7 +7,7 @@ package PublicInbox::GitHTTPBackend;
 use strict;
 use warnings;
 use Fcntl qw(:seek);
-use IO::File;
+use IO::Handle;
 use HTTP::Date qw(time2str);
 use HTTP::Status qw(status_message);
 use Plack::Util;
@@ -46,6 +46,9 @@ sub r ($;$) {
 sub serve {
        my ($env, $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/ ||
@@ -98,7 +101,7 @@ sub serve_dumb {
                return r(404);
        }
 
-       my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $path;
+       my $f = $git->{git_dir} . '/' . $path;
        return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
        my $size = -s _;
 
@@ -179,7 +182,6 @@ sub prepare_range {
 # returns undef if 403 so it falls back to dumb HTTP
 sub serve_smart {
        my ($env, $git, $path) = @_;
-       my $limiter = $default_limiter;
        my $in = $env->{'psgi.input'};
        my $fd = eval { fileno($in) };
        unless (defined $fd && $fd >= 0) {
@@ -197,14 +199,15 @@ sub serve_smart {
                my $val = $env->{$name};
                $env{$name} = $val if defined $val;
        }
-       my $git_dir = ref $git ? $git->{git_dir} : $git;
+       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) );
-       my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
+       my $rdr = { 0 => fileno($in) };
+       my $qsp = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, $rdr);
        my ($fh, $rpipe);
        my $end = sub {
-               if (my $err = $x->finish) {
+               if (my $err = $qsp->finish) {
                        err($env, "git http-backend ($git_dir): $err");
                }
                $fh->close if $fh; # async-only
@@ -221,8 +224,7 @@ sub serve_smart {
                $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
        };
        my $res;
-       my $async = $env->{'pi-httpd.async'};
-       my $io = $env->{'psgix.io'};
+       my $async = $env->{'pi-httpd.async'}; # XXX unstable API
        my $cb = sub {
                my $r = $rd_hdr->() or return;
                $rd_hdr = undef;
@@ -233,17 +235,16 @@ sub serve_smart {
                                $rpipe->close;
                                $end->();
                        }
-                       return $res->($r);
-               }
-               if ($async) {
+                       $res->($r);
+               } elsif ($async) {
                        $fh = $res->($r);
-                       return $async->async_pass($io, $fh, \$buf);
+                       $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);
                }
-
-               # for synchronous PSGI servers
-               require PublicInbox::GetlineBody;
-               $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
-               $res->($r);
        };
        sub {
                ($res) = @_;
@@ -252,7 +253,7 @@ sub serve_smart {
                # holding the input here is a waste of FDs and memory
                $env->{'psgi.input'} = undef;
 
-               $x->start($limiter, sub { # may run later, much later...
+               $qsp->start($limiter, sub { # may run later, much later...
                        ($rpipe) = @_;
                        $in = undef;
                        if ($async) {
@@ -266,7 +267,11 @@ sub serve_smart {
 
 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) {
@@ -275,11 +280,22 @@ sub input_to_file {
                        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;
 }