X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f1e2d0af123352b692e8e4efdb208e370a00d3c1..13039f5d6f6849669bde8d0fdc14bf057cbe5e65:/IkiWiki/Plugin/htmlscrubber.pm

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index d52614a4d..120954d83 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -29,10 +29,11 @@ sub import {
 		"irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
 		"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
 		"sftp", "smb", "sms", "snews", "webcal", "ymsgr",
+		"bitcoin", "git", "svn", "bzr", "darcs", "hg"
 	);
 	# data is a special case. Allow a few data:image/ types,
 	# but disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i;
 }
 
 sub getsetup () {
@@ -57,8 +58,8 @@ sub sanitize (@) {
 
 	if (exists $config{htmlscrubber_skip} &&
 	    length $config{htmlscrubber_skip} &&
-	    exists $params{destpage} &&
-	    pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+	    exists $params{page} &&
+	    pagespec_match($params{page}, $config{htmlscrubber_skip})) {
 		return $params{content};
 	}
 
@@ -85,7 +86,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
-			datalist
+			datalist progress meter ruby rt rp details summary
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -101,13 +102,13 @@ sub scrubber {
 				selected shape size span start summary
 				tabindex target title type valign
 				value vspace width
-
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
-				placeholder min max step form required
-				autocomplete novalidate pattern list
-				formenctype formmethod formnovalidate
-				formtarget reversed
+				loop muted
+				placeholder min max step low high optimum
+				form required autocomplete novalidate pattern
+				list formenctype formmethod formnovalidate
+				formtarget reversed spellcheck open hidden
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,