Also filter the attributes cite, longdesc, and usemap, which can contain URIs

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index a8a37eafa6f16570a8bcf2f5dfa7b9be2c3fd333..067d766f7be82699624f7ecd9ba95e04cfa72d22 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -59,21 +59,24 @@ sub scrubber { #{{{
                default => [undef, { ( map { $_ => 1 } qw{
                        abbr accept accept-charset accesskey
                        align alt axis border cellpadding cellspacing
                default => [undef, { ( map { $_ => 1 } qw{
                        abbr accept accept-charset accesskey
                        align alt axis border cellpadding cellspacing

-                       char charoff charset checked cite class
+                       char charoff charset checked class

                        clear cols colspan color compact coords
                        datetime dir disabled enctype for frame
                        headers height hreflang hspace id ismap
                        clear cols colspan color compact coords
                        datetime dir disabled enctype for frame
                        headers height hreflang hspace id ismap

-                       label lang longdesc maxlength media method
+                       label lang maxlength media method

                        multiple name nohref noshade nowrap prompt
                        readonly rel rev rows rowspan rules scope
                        selected shape size span start summary
                        multiple name nohref noshade nowrap prompt
                        readonly rel rev rows rowspan rules scope
                        selected shape size span start summary

-                       tabindex target title type usemap valign
+                       tabindex target title type valign

                        value vspace width
                } ),
                "/" => 1, # emit proper <hr /> XHTML
                href => $safe_url_regexp,
                src => $safe_url_regexp,
                action => $safe_url_regexp,
                        value vspace width
                } ),
                "/" => 1, # emit proper <hr /> XHTML
                href => $safe_url_regexp,
                src => $safe_url_regexp,
                action => $safe_url_regexp,

+               cite => $safe_url_regexp,
+               longdesc => $safe_url_regexp,
+               usemap => $safe_url_regexp,

                }],
        );
        return $_scrubber;
                }],
        );
        return $_scrubber;