diff options
Diffstat (limited to 'lib/PublicInbox/Cgit.pm')
| -rw-r--r-- | lib/PublicInbox/Cgit.pm | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm index cc729aa2..78fc9ca0 100644 --- a/lib/PublicInbox/Cgit.pm +++ b/lib/PublicInbox/Cgit.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> # wrapper for cgit(1) and git-http-backend(1) for browsing and @@ -6,7 +6,8 @@ # directive to be set in the public-inbox config file. package PublicInbox::Cgit; -use strict; +use v5.12; +use parent qw(PublicInbox::WwwCoderepo); use PublicInbox::GitHTTPBackend; use PublicInbox::Git; # not bothering with Exporter for a one-off @@ -40,10 +41,9 @@ sub locate_cgit ($) { if (defined($cgit_bin) && $cgit_bin =~ m!\A(.+?)/[^/]+\z!) { unshift @dirs, $1 if -d $1; } - foreach my $d (@dirs) { - my $f = "$d/cgit.css"; - next unless -f $f; - $cgit_data = $d; + for (@dirs) { + next unless -f "$_/cgit.css"; + $cgit_data = $_; last; } } @@ -53,29 +53,18 @@ sub locate_cgit ($) { sub new { my ($class, $pi_cfg) = @_; my ($cgit_bin, $cgit_data) = locate_cgit($pi_cfg); - # TODO: support gitweb and other repository viewers? - if (defined(my $cgitrc = $pi_cfg->{-cgitrc_unparsed})) { - $pi_cfg->parse_cgitrc($cgitrc, 0); - } + $cgit_bin // return; # fall back in WWW->cgit my $self = bless { cmd => [ $cgit_bin ], cgit_data => $cgit_data, pi_cfg => $pi_cfg, + cgitrc => $pi_cfg->{'publicinbox.cgitrc'} // $ENV{CGIT_CONFIG}, }, $class; # some cgit repos may not be mapped to inboxes, so ensure those exist: - my $code_repos = $pi_cfg->{-code_repos}; - foreach my $k (keys %$pi_cfg) { - $k =~ /\Acoderepo\.(.+)\.dir\z/ or next; - my $dir = $pi_cfg->{$k}; - $code_repos->{$1} ||= $pi_cfg->fill_code_repo($1); - } - while (my ($nick, $repo) = each %$code_repos) { - $self->{"\0$nick"} = $repo; - } - my $cgit_static = $pi_cfg->{-cgit_static}; - my $static = join('|', map { quotemeta $_ } keys %$cgit_static); - $self->{static} = qr/\A($static)\z/; + PublicInbox::WwwCoderepo::prepare_coderepos($self); + my $s = join('|', map { quotemeta } keys %{$pi_cfg->{-cgit_static}}); + $self->{static} = qr/\A($s)\z/; $self; } @@ -96,14 +85,14 @@ my @PASS_ENV = qw( my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers; sub call { - my ($self, $env) = @_; + my ($self, $env, $ctx) = @_; # $ctx is optional, used by WWW my $path_info = $env->{PATH_INFO}; my $cgit_data; # handle requests without spawning cgit iff possible: if ($path_info =~ m!\A/(.+?)/($PublicInbox::GitHTTPBackend::ANY)\z!ox) { my ($nick, $path) = ($1, $2); - if (my PublicInbox::Git $git = $self->{"\0$nick"}) { + if (my $git = $self->{pi_cfg}->get_coderepo($nick)) { return serve($env, $git, $path); } } elsif ($path_info =~ m!$self->{static}! && @@ -112,17 +101,14 @@ sub call { return PublicInbox::WwwStatic::response($env, [], $f); } - my $cgi_env = { PATH_INFO => $path_info }; - foreach (@PASS_ENV) { - defined(my $v = $env->{$_}) or next; - $cgi_env->{$_} = $v; - } - $cgi_env->{'HTTPS'} = 'on' if $env->{'psgi.url_scheme'} eq 'https'; + my %cgi_env = (CGIT_CONFIG => $self->{cgitrc}, PATH_INFO => $path_info); + @cgi_env{@PASS_ENV} = @$env{@PASS_ENV}; # spawn ignores undef vals + $cgi_env{HTTPS} = 'on' if $env->{'psgi.url_scheme'} eq 'https'; my $rdr = input_prepare($env) or return r(500); - my $qsp = PublicInbox::Qspawn->new($self->{cmd}, $cgi_env, $rdr); + my $qsp = PublicInbox::Qspawn->new($self->{cmd}, \%cgi_env, $rdr); my $limiter = $self->{pi_cfg}->limiter('-cgit'); - $qsp->psgi_return($env, $limiter, $parse_cgi_headers); + $qsp->psgi_yield($env, $limiter, $parse_cgi_headers, $ctx); } 1; |