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|)!;
+our $END_RE = qr!(f/|T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
our $pi_config;
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 '/') {
} 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);
+ } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t|R)\z!o) {
+ 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) {
require PublicInbox::Feed;
require PublicInbox::View;
require PublicInbox::Thread;
- require PublicInbox::GitCatFile;
require Email::MIME;
require Digest::SHA;
require POSIX;
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;
}
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
[ PublicInbox::View::msg_html($ctx, $mime, undef, $foot)] ];
}
+# /$LISTNAME/$MESSAGE_ID/R/ -> HTML content (fullquotes)
+sub get_reply_html {
+ my ($ctx) = @_;
+ my $x = mid2blob($ctx) or return r404($ctx);
+
+ require PublicInbox::View;
+ my $foot = footer($ctx);
+ require Email::MIME;
+ my $hdr = Email::MIME->new($x)->header_obj;
+ [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
+ [ PublicInbox::View::msg_reply($ctx, $hdr, $foot)] ];
+}
+
# /$LISTNAME/$MESSAGE_ID/t/
sub get_thread {
my ($ctx, $flat) = @_;
PublicInbox::View::thread_html($ctx, $foot, $srch);
}
-sub self_url {
- my ($cgi) = @_;
- ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
-}
-
sub ctx_get {
my ($ctx, $key) = @_;
my $val = $ctx->{$key};
my $urls = try_cat("$git_dir/cloneurl");
my @urls = split(/\r?\n/, $urls || '');
- my $nurls = scalar @urls;
- if ($nurls == 0) {
- $urls = '($GIT_DIR/cloneurl missing)';
- } elsif ($nurls == 1) {
- $urls = "git URL for <a\nhref=\"" . SSOMA_URL .
- '">ssoma</a>: ' . $urls[0];
+ my %seen = map { $_ => 1 } @urls;
+ my $http = $ctx->{cgi}->base->as_string . $listname;
+ $seen{$http} or unshift @urls, $http;
+ if (scalar(@urls) == 1) {
+ $urls = "URL for <a\nhref=\"" . SSOMA_URL .
+ qq(">ssoma</a> or <b>git clone --mirror \$URL</b> :) .
+ $urls[0];
} else {
- $urls = "git URLs for <a\nhref=\"" . SSOMA_URL .
- "\">ssoma</a>:\n" . join("\n", map { "\t$_" } @urls);
+ $urls = "URLs for <a\nhref=\"" . SSOMA_URL .
+ qq(">ssoma</a> or <b>git clone --mirror \$URL</b>\n) .
+ join("\n", map { "\t$_" } @urls);
}
my $addr = $pi_config->get($listname, 'address');
sub get_thread_atom {
my ($ctx) = @_;
searcher($ctx) or return need_search($ctx);
- $ctx->{self_url} = self_url($ctx->{cgi});
+ $ctx->{self_url} = $ctx->{cgi}->uri->as_string;
require PublicInbox::Feed;
PublicInbox::Feed::generate_thread_atom($ctx);
}
my ($ctx, $listname, $mid, $suffix) = @_;
my $cgi = $ctx->{cgi};
my $url;
- if (ref($cgi) eq 'CGI') {
- $url = $cgi->url(-base) . '/';
- } else {
- $url = $cgi->base->as_string;
- }
-
- $url .= $listname . '/';
+ my $qs = $cgi->env->{QUERY_STRING};
+ $url = $cgi->base->as_string . $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' ],
'T/' eq $e and return get_thread($ctx, 1);
'raw' eq $e and return get_mid_txt($ctx);
'f/' eq $e and return get_full_html($ctx);
+ 'R/' eq $e and return get_reply_html($ctx);
}
r404($ctx);
}
+sub serve_git {
+ my ($cgi, $git, $path) = @_;
+ PublicInbox::GitHTTPBackend::serve($cgi, $git, $path);
+}
+
1;