diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-10 18:02:18 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-10 18:02:18 -0500 |
| commit | 598d604fa8aaa65f75bec61250f97df683a9cf3b (patch) | |
| tree | d2e25aa9dffec9fc521d5e22f86a1a87263a4991 | |
| parent | 11a781d1c5d614b12b2f358faf5be9951b62ae37 (diff) | |
| parent | ec9d3ab549fc40b23db7fa912338e4e7c24ebb4c (diff) | |
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
| -rw-r--r-- | IkiWiki/Plugin/htmlscrubber.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 8c37f1be6..8804daf56 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -22,12 +22,12 @@ 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", "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 719150ee6..1a43344a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,12 @@ 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 <josh@freedesktop.org> Sun, 10 Feb 2008 13:59:00 -0800 + [ Josh Triplett ] + * Match literal '.' in URI schemas containing '.', rather than matching any + character. + * Do not allow the steam: URI scheme. + + -- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 14:48:48 -0800 ikiwiki (2.31.2) unstable; urgency=high |