www: support git cloning via dumb HTTP

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 8f155063324bb715b786d719235451ba3f01ade6..1c6936f76bd2dcf6f3a4c4e64e8f4c8f90595523 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -1,6 +1,8 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 #
+# Main web interface for mailing list archives
+#
 # We focus on the lowest common denominators here:
 # - targeted at text-only console browsers (w3m, links, etc..)
 # - Only basic HTML, CSS only for line-wrapping <pre> text content for GUIs
@@ -11,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::GitHTTPDumb;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
 our $END_RE = qr!(f/|T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
@@ -39,12 +43,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::GitHTTPDumb::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) {
@@ -60,7 +70,6 @@ sub preload {
        require PublicInbox::Feed;
        require PublicInbox::View;
        require PublicInbox::Thread;
-       require PublicInbox::GitCatFile;
        require Email::MIME;
        require Digest::SHA;
        require POSIX;
@@ -94,6 +103,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;
        }
@@ -130,11 +140,10 @@ sub get_index {
        my ($ctx) = @_;
        require PublicInbox::Feed;
        my $srch = searcher($ctx);
-       my $q = $ctx->{cgi}->param('q');
        footer($ctx);
-       if (defined $q) {
+       if (defined $ctx->{cgi}->param('q')) {
                require PublicInbox::SearchView;
-               PublicInbox::SearchView::sres_top_html($ctx, $q);
+               PublicInbox::SearchView::sres_top_html($ctx);
        } else {
                PublicInbox::Feed::generate_html_index($ctx);
        }
@@ -145,18 +154,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
@@ -164,7 +162,7 @@ sub get_mid_txt {
        my ($ctx) = @_;
        my $x = mid2blob($ctx) or return r404($ctx);
        require PublicInbox::Mbox;
-       PublicInbox::Mbox::emit1($x);
+       PublicInbox::Mbox::emit1($ctx, $x);
 }
 
 # /$LISTNAME/$MESSAGE_ID/                   -> HTML content (short quotes)
@@ -207,6 +205,7 @@ sub get_thread {
 
 sub self_url {
        my ($cgi) = @_;
+                                               # Plack::Request
        ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
 }
 
@@ -217,17 +216,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;
@@ -378,15 +366,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' ],
@@ -408,4 +400,9 @@ sub msg_page {
        r404($ctx);
 }
 
+sub serve_git {
+       my ($cgi, $git, $path) = @_;
+       PublicInbox::GitHTTPDumb::serve($cgi, $git, $path);
+}
+
 1;