X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FCgit.pm;h=472509a80852f398ecee8f598c896127d923992d;hb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;hp=ab4065bd258ecc65a8bbd186e412f4de030dab48;hpb=4bffd23fdd592c356c9b3d56b202d178a12fec43;p=public-inbox.git
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index ab4065bd..472509a8 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
# wrapper for cgit(1) and git-http-backend(1) for browsing and
@@ -8,20 +8,17 @@
package PublicInbox::Cgit;
use strict;
use PublicInbox::GitHTTPBackend;
+use PublicInbox::Git;
# not bothering with Exporter for a one-off
-*r = *PublicInbox::GitHTTPBackend::r;
-*input_prepare = *PublicInbox::GitHTTPBackend::input_prepare;
-*parse_cgi_headers = *PublicInbox::GitHTTPBackend::parse_cgi_headers;
-*serve = *PublicInbox::GitHTTPBackend::serve;
-use warnings;
+*input_prepare = \&PublicInbox::GitHTTPBackend::input_prepare;
+*serve = \&PublicInbox::GitHTTPBackend::serve;
use PublicInbox::Qspawn;
-use PublicInbox::WwwStatic;
-use Plack::MIME;
+use PublicInbox::WwwStatic qw(r);
sub locate_cgit ($) {
- my ($pi_config) = @_;
- my $cgit_bin = $pi_config->{'publicinbox.cgitbin'};
- my $cgit_data = $pi_config->{'publicinbox.cgitdata'};
+ my ($pi_cfg) = @_;
+ my $cgit_bin = $pi_cfg->{'publicinbox.cgitbin'};
+ my $cgit_data = $pi_cfg->{'publicinbox.cgitdata'};
# /var/www/htdocs/cgit is the default install path from cgit.git
# /usr/{lib,share}/cgit is where Debian puts cgit
@@ -54,28 +51,28 @@ sub locate_cgit ($) {
}
sub new {
- my ($class, $pi_config) = @_;
- my ($cgit_bin, $cgit_data) = locate_cgit($pi_config);
+ my ($class, $pi_cfg) = @_;
+ my ($cgit_bin, $cgit_data) = locate_cgit($pi_cfg);
my $self = bless {
cmd => [ $cgit_bin ],
cgit_data => $cgit_data,
- pi_config => $pi_config,
+ pi_cfg => $pi_cfg,
}, $class;
- $pi_config->fill_all; # fill in -code_repos mapped to inboxes
+ $pi_cfg->fill_all; # fill in -code_repos mapped to inboxes
# some cgit repos may not be mapped to inboxes, so ensure those exist:
- my $code_repos = $pi_config->{-code_repos};
- foreach my $k (keys %$pi_config) {
+ my $code_repos = $pi_cfg->{-code_repos};
+ foreach my $k (keys %$pi_cfg) {
$k =~ /\Acoderepo\.(.+)\.dir\z/ or next;
- my $dir = $pi_config->{$k};
+ my $dir = $pi_cfg->{$k};
$code_repos->{$1} ||= PublicInbox::Git->new($dir);
}
while (my ($nick, $repo) = each %$code_repos) {
$self->{"\0$nick"} = $repo;
}
- my $cgit_static = $pi_config->{-cgit_static};
+ my $cgit_static = $pi_cfg->{-cgit_static};
my $static = join('|', map { quotemeta $_ } keys %$cgit_static);
$self->{static} = qr/\A($static)\z/;
$self;
@@ -95,11 +92,7 @@ my @PASS_ENV = qw(
);
# XXX: cgit filters may care about more variables...
-sub cgit_parse_hdr { # {parse_hdr} for Qspawn
- my ($r, $bref) = @_;
- my $res = parse_cgi_headers($r, $bref) or return; # incomplete
- $res;
-}
+my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers;
sub call {
my ($self, $env) = @_;
@@ -109,14 +102,13 @@ sub call {
# handle requests without spawning cgit iff possible:
if ($path_info =~ m!\A/(.+?)/($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
my ($nick, $path) = ($1, $2);
- if (my $git = $self->{"\0$nick"}) {
+ if (my PublicInbox::Git $git = $self->{"\0$nick"}) {
return serve($env, $git, $path);
}
} elsif ($path_info =~ m!$self->{static}! &&
defined($cgit_data = $self->{cgit_data})) {
- my $f = $1;
- return PublicInbox::WwwStatic::response($env, [], $cgit_data.$f,
- Plack::MIME->mime_type($f));
+ my $f = $cgit_data.$1; # {static} only matches leading slash
+ return PublicInbox::WwwStatic::response($env, [], $f);
}
my $cgi_env = { PATH_INFO => $path_info };
@@ -128,8 +120,8 @@ sub call {
my $rdr = input_prepare($env) or return r(500);
my $qsp = PublicInbox::Qspawn->new($self->{cmd}, $cgi_env, $rdr);
- my $limiter = $self->{pi_config}->limiter('-cgit');
- $qsp->psgi_return($env, $limiter, \&cgit_parse_hdr);
+ my $limiter = $self->{pi_cfg}->limiter('-cgit');
+ $qsp->psgi_return($env, $limiter, $parse_cgi_headers);
}
1;