]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f371f2f)
* Allow raw html in the rst plugin.
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 29 Jul 2007 22:39:40 +0000 (22:39 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 29 Jul 2007 22:39:40 +0000 (22:39 +0000)
IkiWiki/Plugin/rst.pm patch | blob | history
debian/NEWS patch | blob | history
debian/changelog patch | blob | history
doc/bugs/rst_tweak.mdwn patch | blob | history

diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm
index 1f4c8bf9e9c0adf6081d9a67fd04c23a32b3975d..30f5d16d819023dec64598844e382b93301337ee 100644 (file)
--- 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('<body>')+6:html.find('</body>')].strip();
 ";
diff --git a/debian/NEWS b/debian/NEWS
index 80862b801df3ba9ed270e6bd6d366bdb290da0f3..81e7645ebb3ca6298192ac2f9879fd5b1160852e 100644 (file)
--- 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 <joeyh@debian.org>  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 ae575b916424dcc2c7d49cb6709a71e3f19cd6cf..3522d4a9b6984d08c0119343bf36dbf54a9b78ed 100644 (file)
--- 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 <joeyh@debian.org>  Sun, 29 Jul 2007 18:34:13 -0400
+ -- Joey Hess <joeyh@debian.org>  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 f6f7bbaf05a60afd96468a3320c90983e1fbe42f..8348ed470c5df2be00d163564ef08271a5ece665 100644 (file)
--- 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]]
+
 <pre>
 Index: IkiWiki/Plugin/rst.pm
 ===================================================================
@@ -16,4 +19,4 @@ Index: IkiWiki/Plugin/rst.pm
  );
  print html[html.find('<body>')+6:html.find('</body>')].strip();
  ";
-</pre>
\ No newline at end of file
+</pre>
wiki compiler