From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Mar 2011 16:36:07 +0000 (-0400)
Subject: meta: Security fix; don't allow alternative stylesheets to be added on pages where... 
X-Git-Tag: 2.53.6~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/50ac3aa79c28b517af71ef876b7b60146365a3d6

meta: Security fix; don't allow alternative stylesheets to be added on pages where the htmlscrubber is enabled.
---

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5c1827cc0..0e4fcb1dc 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -136,10 +136,10 @@ sub preprocess (@) { #{{{
 		if (! length $stylesheet) {
 			return "[[meta ".gettext("stylesheet not found")."]]";
 		}
-		push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
+		push @{$metaheaders{$page}}, scrub('<link href="'.urlto($stylesheet, $page).
 			'" rel="'.encode_entities($rel).
 			'" title="'.encode_entities($title).
-			"\" type=\"text/css\" />";
+			"\" type=\"text/css\" />");
 	}
 	elsif ($key eq 'openid') {
 		if (exists $params{server} && safeurl($params{server})) {
diff --git a/debian/changelog b/debian/changelog
index c01b697e3..bd030457f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.53.6) oldstable-security; urgency=low
+
+  * meta: Security fix; don't allow alternative stylesheets to be added on
+    pages where the htmlscrubber is enabled.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 12:35:13 -0400
+
 ikiwiki (2.53.5) stable-security; urgency=high
 
   * htmlscrubber: Security fix: In data:image/* uris, only allow a few