about summary refs log tree commit homepage
path: root/lib/PublicInbox/WWW.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-08-18 11:41:02 +0000
committerEric Wong <e@80x24.org>2021-08-26 12:26:53 +0000
commit26c635060dcae35feae836b02a18a6a11e408312 (patch)
tree8677abea13ea58af2d811f8c4e43e39f4bc950f4 /lib/PublicInbox/WWW.pm
parent21af30073e105a118d058add76e42e2819213858 (diff)
downloadpublic-inbox-26c635060dcae35feae836b02a18a6a11e408312.tar.gz
Since CSS can be overridden by a static webserver on a per-inbox
basis, we need a similar pattern to deal with the instance-wide
WwwListing HTML.  "/+/" probably won't conflict with any current
nor future public inbox names.

I don't think it'll cause problems with common linkifiers or URL
extractors, either (and it's unlikely anybody would want to
share URLs of just the CSS in a plain text(-like) format).
Diffstat (limited to 'lib/PublicInbox/WWW.pm')
-rw-r--r--lib/PublicInbox/WWW.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 841a7e85..1afdece0 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -133,7 +133,8 @@ sub call {
         # convenience redirects order matters
         } elsif ($path_info =~ m!$INBOX_RE/([^/]{2,})\z!o) {
                 r301($ctx, $1, $2);
-
+        } elsif ($path_info =~ m!\A/\+/([a-zA-Z0-9_\-\.]+)\.css\z!) {
+                get_css($ctx, undef, $1); # for WwwListing
         } else {
                 legacy_redirects($ctx, $path_info);
         }
@@ -627,18 +628,20 @@ sub style {
         };
 }
 
-# /$INBOX/$KEY.css endpoint
+# /$INBOX/$KEY.css and /+/$KEY.css endpoints
 # CSS is configured globally for all inboxes, but we access them on
 # a per-inbox basis.  This allows administrators to setup per-inbox
 # static routes to intercept the request before it hits PSGI
+# inbox == undef => top-level WwwListing
 sub get_css ($$$) {
         my ($ctx, $inbox, $key) = @_;
-        my $r404 = invalid_inbox($ctx, $inbox);
+        my $r404 = defined($inbox) ? invalid_inbox($ctx, $inbox) : undef;
         return $r404 if $r404;
         my $self = $ctx->{www};
-        my $css_map = $self->{-css_map} || stylesheets_prepare($self, '');
+        my $css_map = $self->{-css_map} ||
+                stylesheets_prepare($self, defined($inbox) ? '' : '+/');
         my $css = $css_map->{$key};
-        if (!defined($css) && $key eq 'userContent') {
+        if (!defined($css) && defined($inbox) && $key eq 'userContent') {
                 my $env = $ctx->{env};
                 $css = PublicInbox::UserContent::sample($ctx->{ibx}, $env);
         }