www: wire up cgit as a 404 handler if cgitrc is configured

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 406802a95767f409f49fb2247ee8e52e7328e512..6e14e8c1d87ab9886c3d404e3ac310ab1f3317de 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 ('', '../', '../../');
        }
 }
@@ -187,7 +190,9 @@ 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});
+       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
@@ -466,6 +471,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 +530,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 +542,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})) {