Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- Fix XSS vulnerability in vbscript: and data:text links handling (#1…
…488850)
  • Loading branch information
alecpl committed Dec 4, 2012
1 parent 0fa54df commit 74cd0a9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix XSS vulnerability in vbscript: and data:text links handling (#1488850)
- Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836)
- Fix empty email on identities list after identity update (#1488834)
- Add new identities_level: (4) one identity with possibility to edit only signature
Expand Down
2 changes: 1 addition & 1 deletion program/lib/washtml.php
Expand Up @@ -214,7 +214,7 @@ private function wash_attribs($node)
$key = strtolower($key);
$value = $node->getAttribute($key);
if (isset($this->_html_attribs[$key]) ||
($key == 'href' && !preg_match('!^javascript!i', $value)
($key == 'href' && !preg_match('!^(javascript|vbscript|data:text)!i', $value)
&& preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value))
) {
$t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
Expand Down
14 changes: 14 additions & 0 deletions tests/MailFunc.php
Expand Up @@ -96,6 +96,20 @@ function test_html_xss2()
$this->assertNotRegExp('/font-style:italic/', $washed, "Allow valid styles");
}

/**
* Test the elimination of some XSS vulnerabilities
*/
function test_html_xss3()
{
// #1488850
$html = '<p><a href="data:text/html,&lt;script&gt;alert(document.cookie)&lt;/script&gt;">Firefox</a>'
.'<a href="vbscript:alert(document.cookie)">Internet Explorer</a></p>';
$washed = rcmail_wash_html($html, array('safe' => true), array());

$this->assertNotRegExp('/data:text/', $washed, "Remove data:text/html links");
$this->assertNotRegExp('/vbscript:/', $washed, "Remove vbscript: links");
}

/**
* Test washtml class on non-unicode characters (#1487813)
*/
Expand Down

0 comments on commit 74cd0a9

Please sign in to comment.