From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Cc: Dmitry Alexandrov <321942@gmail.com>,
Mateusz Loskot <mateusz@loskot.net>
Subject: [PATCH 2/2] www: prevent '!important' in BOFH-specified CSS
Date: Sat, 23 Feb 2019 10:56:38 +0000 [thread overview]
Message-ID: <20190223105638.15465-3-e@80x24.org> (raw)
In-Reply-To: <20190223105638.15465-1-e@80x24.org>
CSS specified by the BOFH must never take precedence over
what a user sets in userContent.css.
---
lib/PublicInbox/WWW.pm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index cbaf884..7ed4f65 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -512,8 +512,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);
@@ -523,6 +524,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})) {
--
EW
next prev parent reply other threads:[~2019-02-23 10:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 13:36 Default theme Mateusz Loskot
2019-02-22 8:50 ` Eric Wong
2019-02-22 20:39 ` Dmitry Alexandrov
2019-02-23 2:47 ` Eric Wong
2019-02-23 10:56 ` [PATCH 0/2] ensure user CSS always overrides BOFH CSS Eric Wong
2019-02-23 10:56 ` [PATCH 1/2] usercontent.pm: set "!important" to override BOFH prefs Eric Wong
2019-02-23 10:56 ` Eric Wong [this message]
2019-02-23 19:55 ` Default theme Mateusz Loskot
2019-02-22 20:53 ` Mateusz Loskot
2019-02-23 1:19 ` Dmitry Alexandrov
2019-02-23 2:50 ` Eric Wong
2019-02-23 10:49 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190223105638.15465-3-e@80x24.org \
--to=e@80x24.org \
--cc=321942@gmail.com \
--cc=mateusz@loskot.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).