cleanup: use '$ibx' consistently when referring to Inbox refs

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 406802a95767f409f49fb2247ee8e52e7328e512..6e69001c4c4d78fa2e52fc851525c30bfd8f7a59 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -14,6 +14,8 @@ package PublicInbox::WWW;
 use 5.008;
 use strict;
 use warnings;
+use bytes (); # only for bytes::length
+use Plack::Util;
 use PublicInbox::Config;
 use PublicInbox::Hval;
 use URI::Escape qw(uri_unescape);
@@ -153,6 +155,7 @@ sub preload {
                eval "require $_;";
        }
        if (ref($self)) {
+               $self->cgit;
                $self->stylesheets_prepare($_) for ('', '../', '../../');
        }
 }
@@ -172,14 +175,20 @@ sub r404 {
 # simple response for errors
 sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 
+sub news_cgit_fallback ($) {
+       my ($ctx) = @_;
+       my $www = $ctx->{www};
+       my $env = $ctx->{env};
+       my $res = $www->news_www->call($env);
+       $res->[0] == 404 ? $www->cgit->call($env) : $res;
+}
+
 # returns undef if valid, array ref response if invalid
 sub invalid_inbox ($$) {
        my ($ctx, $inbox) = @_;
-       my $www = $ctx->{www};
-       my $obj = $www->{pi_config}->lookup_name($inbox);
-       if (defined $obj) {
-               $ctx->{git} = $obj->git;
-               $ctx->{-inbox} = $obj;
+       my $ibx = $ctx->{www}->{pi_config}->lookup_name($inbox);
+       if (defined $ibx) {
+               $ctx->{-inbox} = $ibx;
                return;
        }
 
@@ -187,7 +196,7 @@ sub invalid_inbox ($$) {
        # generation and link things intended for nntp:// to https?://,
        # so try to infer links and redirect them to the appropriate
        # list URL.
-       $www->news_www->call($ctx->{env});
+       news_cgit_fallback($ctx);
 }
 
 # returns undef if valid, array ref response if invalid
@@ -387,19 +396,19 @@ sub legacy_redirects {
        } elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
                r301($ctx, $1, $2);
        } else {
-               $ctx->{www}->news_www->call($ctx->{env});
+               news_cgit_fallback($ctx);
        }
 }
 
 sub r301 {
        my ($ctx, $inbox, $mid_ue, $suffix) = @_;
-       my $obj = $ctx->{-inbox};
-       unless ($obj) {
+       my $ibx = $ctx->{-inbox};
+       unless ($ibx) {
                my $r404 = invalid_inbox($ctx, $inbox);
                return $r404 if $r404;
-               $obj = $ctx->{-inbox};
+               $ibx = $ctx->{-inbox};
        }
-       my $url = $obj->base_url($ctx->{env});
+       my $url = $ibx->base_url($ctx->{env});
        my $qs = $ctx->{env}->{QUERY_STRING};
        if (defined $mid_ue) {
                # common, and much nicer as '@' than '%40':
@@ -466,6 +475,20 @@ sub news_www {
        }
 }
 
+sub cgit {
+       my ($self) = @_;
+       $self->{cgit} ||= do {
+               my $pi_config = $self->{pi_config};
+
+               if (defined($pi_config->{'publicinbox.cgitrc'})) {
+                       require PublicInbox::Cgit;
+                       PublicInbox::Cgit->new($pi_config);
+               } else {
+                       Plack::Util::inline_object(call => sub { r404() });
+               }
+       }
+}
+
 sub get_attach {
        my ($ctx, $idx, $fn) = @_;
        require PublicInbox::WwwAttach;
@@ -511,8 +534,9 @@ sub stylesheets_prepare ($$) {
                if (defined $attr->{href}) {
                        $inline_ok = 0;
                } else {
-                       open(my $fh, '<', $_) or do {
-                               warn "failed to open $_: $!\n";
+                       my $fn = $_;
+                       open(my $fh, '<', $fn) or do {
+                               warn "failed to open $fn: $!\n";
                                next;
                        };
                        my ($key) = (m!([^/]+?)(?:\.css)?\z!i);
@@ -522,6 +546,13 @@ sub stylesheets_prepare ($$) {
                                $ctime = sprintf('%x',(stat($fh))[10]);
                                $local = $mini->($local);
                        }
+
+                       # do not let BOFHs override userContent.css:
+                       if ($local =~ /!\s*important\b/i) {
+                               warn "ignoring $fn since it uses `!important'\n";
+                               next;
+                       }
+
                        $css_map->{$key} = $local;
                        $attr->{href} = "$upfx$key.css?$ctime";
                        if (defined($attr->{title})) {