Added a comment

[git.ikiwiki.info.git] / IkiWiki / Plugin / htmlscrubber.pm

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 479e10e7445a34cff1249f663e1a56eaf8e6af8c..a58a27d5221acc50e932057b9fabaffcf38c7b97 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -32,7 +32,7 @@ sub import {
        );
        # data is a special case. Allow a few data:image/ types,
        # but disallow data:text/javascript and everything else.
        );
        # 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 () {
 }
 
 sub getsetup () {


@@ -57,8 +57,8 @@ sub sanitize (@) {
 
        if (exists $config{htmlscrubber_skip} &&
            length $config{htmlscrubber_skip} &&
 
        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};
        }
 
                return $params{content};
        }
 


@@ -84,7 +84,8 @@ sub scrubber {
                        tfoot th thead tr tt u ul var
 
                        video audio source section nav article aside hgroup
                        tfoot th thead tr tt u ul var
 
                        video audio source section nav article aside hgroup

-                       header footer time mark canvas
+                       header footer figure figcaption time mark canvas
+                       datalist progress meter ruby rt rp details summary

                }],
                default => [undef, { (
                        map { $_ => 1 } qw{
                }],
                default => [undef, { (
                        map { $_ => 1 } qw{


@@ -103,12 +104,16 @@ sub scrubber {
 
                                autofocus autoplay preload loopstart
                                loopend end playcount controls pubdate
 
                                autofocus autoplay preload loopstart
                                loopend end playcount controls pubdate

-                               placeholder min max step
+                               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,
                        src => $safe_url_regexp,
                        action => $safe_url_regexp,
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        href => $safe_url_regexp,
                        src => $safe_url_regexp,
                        action => $safe_url_regexp,

+                       formaction => $safe_url_regexp,

                        cite => $safe_url_regexp,
                        longdesc => $safe_url_regexp,
                        poster => $safe_url_regexp,
                        cite => $safe_url_regexp,
                        longdesc => $safe_url_regexp,
                        poster => $safe_url_regexp,