urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix data:image handling

master
Joey Hess 2008-02-10 15:24:03 -05:00
parent 852994d950
commit dfd6bb3854
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Plugin/htmlscrubber.pm
View File

@ -29,16 +29,15 @@ sub scrubber { #{{{
"ldap", "mid", "news", "nfs", "nntp", "pop", "pres",
"sip", "sips", "snmp", "tel", "urn", "wais", "xmpp",
"z39.50r", "z39.50s",
# data is a special case. Allow data:text/<image>, but
# disallow data:text/javascript and everything else.
qr/data:text\/(?:png|gif|jpeg)/,
# Selected unofficial schemes
"about", "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
"irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
"sftp", "sms", "steam", "webcal", "ymsgr",
);
my $link=qr/^(?:$uri_schemes:|[^:]+$)/i;
# data is a special case. Allow data:image/*, but
# disallow data:text/javascript and everything else.
my $link=qr/^(?:$uri_schemes:|data:image\/|[^:]+$)/i;
eval q{use HTML::Scrubber};
error($@) if $@;

8
t/htmlize.t
View File

@ -46,11 +46,11 @@ ok(!gotcha(q{<video poster="javascript:alert('GOTCHA')" href="foo.avi">foo</vide
"video poster with javascript");
ok(!gotcha(q{<span style="background: url(javascript:window.location=GOTCHA)">a</span>}),
"CSS script test");
ok(! gotcha(q{<img src="data:text/javascript:GOTCHA">}),
ok(! gotcha(q{<img src="data:text/javascript;GOTCHA">}),
"data:text/javascript (jeez!)");
ok(gotcha(q{<img src="data:text/png:GOTCHA">}), "data:text/png");
ok(gotcha(q{<img src="data:text/gif:GOTCHA">}), "data:text/gif");
ok(gotcha(q{<img src="data:text/jpeg:GOTCHA">}), "data:text/jpeg");
ok(gotcha(q{<img src="data:image/png;base64,GOTCHA">}), "data:image/png");
ok(gotcha(q{<img src="data:image/gif;base64,GOTCHA">}), "data:image/gif");
ok(gotcha(q{<img src="data:image/jpeg;base64,GOTCHA">}), "data:image/jpeg");
ok(gotcha(q{<p>javascript:alert('GOTCHA')</p>}),
"not javascript AFAIK (but perhaps some web browser would like to
be perverse and assume it is?)");