From: Simon McVittie <smcv@debian.org>
Date: Wed, 28 Feb 2018 09:40:45 +0000 (+0000)
Subject: preprocess: Escape most ASCII punctuation in error messages
X-Git-Tag: 3.20180228~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0e5c8ae806283d31bcfaf63f5af361f97dbe91f0?ds=inline

preprocess: Escape most ASCII punctuation in error messages

This is a minimal version of what we should in principle do here,
which is to escape the error message in whatever way is correct for
embedding plain text in the surrounding wiki markup language.
This implementation approximates that by assuming that HTML entities,
alphanumerics and common punctuation characters are passed through the
markup language unaltered, but punctuation characters might be
misinterpreted.

Signed-off-by: Simon McVittie <smcv@debian.org>
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0d87242eb..7a38c8f89 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1668,6 +1668,10 @@ sub preprocess ($$$;$$) {
 					chomp $error;
 					eval q{use HTML::Entities};
 					$error = encode_entities($error);
+					# Also encode most ASCII punctuation
+					# as entities so that error messages
+					# are not interpreted as Markdown etc.
+					$error = encode_entities($error, '[](){}!#$%*?@^`|~'."\\");
 				 	$ret="[[!$command <span class=\"error\">".
 						gettext("Error").": $error"."</span>]]";
 				}