summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-12-09 21:13:54 +0000
committerthomascube <thomas@roundcube.net>2011-12-09 21:13:54 +0000
commit2b017e7f79be26563ab767bb9e97fee5d88a01f4 (patch)
treec49206a19eb06f4af4b0967a4930dade83730544 /program/include
parent231fae7ad45cf2fb5bdbe62f78e043171af1e18e (diff)
Allow clean background:url(...) styles in safe mode. This will make Roundcube pass the Email Standards Acid Test
Diffstat (limited to 'program/include')
-rw-r--r--program/include/main.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 8aa38c8d1..2d18567e7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -883,19 +883,19 @@ function rcmail_get_edit_field($col, $value, $attrib, $type='text')
* @param string Container ID to use as prefix
* @return string Modified CSS source
*/
-function rcmail_mod_css_styles($source, $container_id)
+function rcmail_mod_css_styles($source, $container_id, $allow_remote=false)
{
$last_pos = 0;
$replacements = new rcube_string_replacer;
// ignore the whole block if evil styles are detected
- $stripped = preg_replace('/[^a-z\(:;]/', '', rcmail_xss_entity_decode($source));
- if (preg_match('/expression|behavior|url\(|import[^a]/', $stripped))
+ $source = rcmail_xss_entity_decode($source);
+ $stripped = preg_replace('/[^a-z\(:;]/i', '', $source);
+ $evilexpr = 'expression|behavior' . (!$allow_remote ? '|url\(|import[^a]' : '');
+ if (preg_match("/$evilexpr/i", $stripped) // don't accept No-Gos
+ || (strpos($stripped, 'url(') && !preg_match('!url\s*\([ "\'](https?:)//[a-z0-9/._+-]+["\' ]\)!Ui', $source))) // only allow clean urls
return '/* evil! */';
- // remove css comments (sometimes used for some ugly hacks)
- $source = preg_replace('!/\*(.+)\*/!Ums', '', $source);
-
// cut out all contents between { and }
while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
{
@@ -937,7 +937,7 @@ function rcmail_xss_entity_decode($content)
{
$out = html_entity_decode(html_entity_decode($content));
$out = preg_replace_callback('/\\\([0-9a-f]{4})/i', 'rcmail_xss_entity_decode_callback', $out);
- $out = preg_replace('#/\*.*\*/#Um', '', $out);
+ $out = preg_replace('#/\*.*\*/#Ums', '', $out);
return $out;
}