From 3cda22a27fafc5cdfdd32ddc0644242f61410ce7 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 10 Feb 2008 14:50:04 -0800 Subject: [PATCH 1/2] Match literal '.' in URI schemas containing '.', rather than matching any character --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 8c37f1be6..53d4635d5 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -22,7 +22,7 @@ sub import { #{{{ "dav", "dict", "dns", "fax", "go", "h323", "im", "imap", "ldap", "mid", "news", "nfs", "nntp", "pop", "pres", "sip", "sips", "snmp", "tel", "urn", "wais", "xmpp", - "z39.50r", "z39.50s", + "z39\.50r", "z39\.50s", # Selected unofficial schemes "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg", "irc", "ircs", "lastfm", "ldaps", "magnet", "mms", diff --git a/debian/changelog b/debian/changelog index 719150ee6..8b6c82568 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,11 @@ ikiwiki (2.31.3) unstable; urgency=high * meta: Check that the urls provided for authorurl, permalink, and openid are safe and can't contain javascript. - -- Josh Triplett Sun, 10 Feb 2008 13:59:00 -0800 + [ Josh Triplett ] + * Match literal '.' in URI schemas containing '.', rather than matching any + character. + + -- Josh Triplett Sun, 10 Feb 2008 14:48:48 -0800 ikiwiki (2.31.2) unstable; urgency=high From ec9d3ab549fc40b23db7fa912338e4e7c24ebb4c Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 10 Feb 2008 14:59:08 -0800 Subject: [PATCH 2/2] Do not allow the steam: URI scheme. --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 53d4635d5..8804daf56 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -27,7 +27,7 @@ sub import { #{{{ "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg", "irc", "ircs", "lastfm", "ldaps", "magnet", "mms", "msnim", "notes", "rsync", "secondlife", "skype", "ssh", - "sftp", "sms", "steam", "webcal", "ymsgr", + "sftp", "sms", "webcal", "ymsgr", ); # data is a special case. Allow data:image/*, but # disallow data:text/javascript and everything else. diff --git a/debian/changelog b/debian/changelog index 8b6c82568..1a43344a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ ikiwiki (2.31.3) unstable; urgency=high [ Josh Triplett ] * Match literal '.' in URI schemas containing '.', rather than matching any character. + * Do not allow the steam: URI scheme. -- Josh Triplett Sun, 10 Feb 2008 14:48:48 -0800