From 54e25f034cf953ed803c2a807bd4c259b32630cb Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 29 Jul 2007 22:39:40 +0000 Subject: [PATCH] * Allow raw html in the rst plugin. --- IkiWiki/Plugin/rst.pm | 2 +- debian/NEWS | 9 +++++++++ debian/changelog | 3 ++- doc/bugs/rst_tweak.mdwn | 5 ++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm index 1f4c8bf9e..30f5d16d8 100644 --- a/IkiWiki/Plugin/rst.pm +++ b/IkiWiki/Plugin/rst.pm @@ -30,7 +30,7 @@ from sys import stdin; html = publish_string(stdin.read(), writer_name='html', settings_overrides = { 'halt_level': 6, 'file_insertion_enabled': 0, - 'raw_enabled': 0 } + 'raw_enabled': 1 } ); print html[html.find('')+6:html.find('')].strip(); "; diff --git a/debian/NEWS b/debian/NEWS index 80862b801..81e7645eb 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,12 @@ +ikiwiki (2.5) unstable; urgency=low + + In this version the rst plugin allows raw html to be embedded in rst files. + As long as the htmlscrubber is enabled, this should be safe. If you are + using the rst plugin without the htmlscrubber in a publically writable wiki, + you should turn on the htmlscrubber. + + -- Joey Hess Sun, 29 Jul 2007 18:37:22 -0400 + ikiwiki (2.5) unstable; urgency=low Due to some config changes in this version, wrappers need to be rebuilt on diff --git a/debian/changelog b/debian/changelog index ae575b916..3522d4a9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ ikiwiki (2.6) UNRELEASED; urgency=low various reviewers. * Fix problems with previewing in the graphviz plugin. Thanks, HenrikBrixAndersen. + * Allow raw html in the rst plugin. - -- Joey Hess Sun, 29 Jul 2007 18:34:13 -0400 + -- Joey Hess Sun, 29 Jul 2007 18:38:36 -0400 ikiwiki (2.5) unstable; urgency=low diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn index f6f7bbaf0..8348ed470 100644 --- a/doc/bugs/rst_tweak.mdwn +++ b/doc/bugs/rst_tweak.mdwn @@ -2,6 +2,9 @@ rst.pm disallows raw HTML input. (It's meant as a security feature.) IkiWiki generates HTML in rst files pretty much all the time. As such, we should enable raw HTML support. --Ethan +> [[done]], although I did add a news item about it, since it could break +> the security of certian setups that don't use the htmlscrubber. --[[Joey]] + 
 Index: IkiWiki/Plugin/rst.pm
 ===================================================================
@@ -16,4 +19,4 @@ Index: IkiWiki/Plugin/rst.pm
  );
  print html[html.find('')+6:html.find('')].strip();
  ";
-
\ No newline at end of file + -- 2.32.0.93.g670b81a890