support smart HTTP cloning

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index d00dfe7cccee56ac296560d162fc196ca8f8e0ae..b4b012f962fb81ce0f029f59231fa162b0b5db57 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -13,10 +13,12 @@ package PublicInbox::WWW;
 use 5.008;
 use strict;
 use warnings;
-use PublicInbox::Config;
+use PublicInbox::Config qw(try_cat);
 use URI::Escape qw(uri_escape_utf8 uri_unescape);
 use constant SSOMA_URL => 'http://ssoma.public-inbox.org/';
 use constant PI_URL => 'http://public-inbox.org/';
+require PublicInbox::Git;
+use PublicInbox::GitHTTPBackend;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
 our $END_RE = qr!(f/|T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
@@ -26,10 +28,17 @@ sub run {
        my ($cgi, $method) = @_;
        $pi_config ||= PublicInbox::Config->new;
        my $ctx = { cgi => $cgi, pi_config => $pi_config };
-       if ($method !~ /\AGET|HEAD\z/) {
+       my $path_info = $cgi->path_info;
+
+       if ($method eq 'POST' &&
+                $path_info =~ m!$LISTNAME_RE/(git-upload-pack)\z!) {
+               my $path = $2;
+               return (invalid_list($ctx, $1) ||
+                       serve_git($cgi, $ctx->{git}, $path));
+       }
+       elsif ($method !~ /\AGET|HEAD\z/) {
                return r(405, 'Method Not Allowed');
        }
-       my $path_info = $cgi->path_info;
 
        # top-level indices and feeds
        if ($path_info eq '/') {
@@ -41,12 +50,18 @@ sub run {
        } elsif ($path_info =~ m!$LISTNAME_RE/(?:atom\.xml|new\.atom)\z!o) {
                invalid_list($ctx, $1) || get_atom($ctx);
 
+       } elsif ($path_info =~ m!$LISTNAME_RE/
+                               ($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
+               my $path = $2;
+               invalid_list($ctx, $1) || serve_git($cgi, $ctx->{git}, $path);
        } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/$END_RE\z!o) {
                msg_page($ctx, $1, $2, $3);
 
        # in case people leave off the trailing slash:
        } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t)\z!o) {
-               r301($ctx, $1, $2, $3 eq 't' ? 't/#u' : $3);
+               my ($listname, $mid, $suffix) = ($1, $2, $3);
+               $suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
+               r301($ctx, $listname, $mid, $suffix);
 
        # convenience redirects order matters
        } elsif ($path_info =~ m!$LISTNAME_RE/([^/]{2,})\z!o) {
@@ -62,7 +77,6 @@ sub preload {
        require PublicInbox::Feed;
        require PublicInbox::View;
        require PublicInbox::Thread;
-       require PublicInbox::GitCatFile;
        require Email::MIME;
        require Digest::SHA;
        require POSIX;
@@ -96,6 +110,7 @@ sub invalid_list {
        my $git_dir = $pi_config->get($listname, "mainrepo");
        if (defined $git_dir) {
                $ctx->{git_dir} = $git_dir;
+               $ctx->{git} = PublicInbox::Git->new($git_dir);
                $ctx->{listname} = $listname;
                return;
        }
@@ -146,18 +161,7 @@ sub mid2blob {
        my ($ctx) = @_;
        require PublicInbox::MID;
        my $path = PublicInbox::MID::mid2path($ctx->{mid});
-       my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
-                       qw(cat-file blob), "HEAD:$path");
-       my $pid = open my $fh, '-|';
-       defined $pid or die "fork failed: $!\n";
-       if ($pid == 0) {
-               open STDERR, '>', '/dev/null'; # ignore errors
-               exec @cmd or die "exec failed: $!\n";
-       } else {
-               my $blob = eval { local $/; <$fh> };
-               close $fh;
-               $? == 0 ? \$blob : undef;
-       }
+       $ctx->{git}->cat_file("HEAD:$path");
 }
 
 # /$LISTNAME/$MESSAGE_ID/raw                    -> raw mbox
@@ -208,6 +212,7 @@ sub get_thread {
 
 sub self_url {
        my ($cgi) = @_;
+                                               # Plack::Request
        ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
 }
 
@@ -218,17 +223,6 @@ sub ctx_get {
        $val;
 }
 
-sub try_cat {
-       my ($path) = @_;
-       my $rv;
-       if (open(my $fh, '<', $path)) {
-               local $/;
-               $rv = <$fh>;
-               close $fh;
-       }
-       $rv;
-}
-
 sub footer {
        my ($ctx) = @_;
        return '' unless $ctx;
@@ -379,15 +373,19 @@ sub r301 {
        my ($ctx, $listname, $mid, $suffix) = @_;
        my $cgi = $ctx->{cgi};
        my $url;
+       my $qs;
        if (ref($cgi) eq 'CGI') {
                $url = $cgi->url(-base) . '/';
-       } else {
+               $qs = $cgi->query_string;
+       } else { # Plack::Request
                $url = $cgi->base->as_string;
+               $qs = $cgi->env->{QUERY_STRING};
        }
 
        $url .= $listname . '/';
        $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
+       $url .= "?$qs" if $qs ne '';
 
        [ 301,
          [ Location => $url, 'Content-Type' => 'text/plain' ],
@@ -409,4 +407,9 @@ sub msg_page {
        r404($ctx);
 }
 
+sub serve_git {
+       my ($cgi, $git, $path) = @_;
+       PublicInbox::GitHTTPBackend::serve($cgi, $git, $path);
+}
+
 1;