Changeset 4488 in subversion

Timestamp:

Feb 3, 2011 4:12:35 PM (2 years ago)

Author:

thomasb

Message:

Prevent from relaying arbitrary requests through modcss.inc (security issue)

Location:

trunk/roundcubemail/program/steps

Files:

• mail/func.inc (modified) (2 diffs)
• utils/modcss.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1195 +1195 @@
 function rcmail_alter_html_link($matches)
 {
-  global $EMAIL_ADDRESS_PATTERN;
+  global $RCMAIL, $EMAIL_ADDRESS_PATTERN;
 
   $tag = $matches[1];
@@ -1202 +1202 @@
 
   if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
-    $attrib['href'] = "?_task=utils&_action=modcss&u=" . urlencode($attrib['href'])
-        . "&c=" . urlencode($GLOBALS['rcmail_html_container_id']);
+    $tempurl = 'tmp-' . md5($attrib['href']) . '.css';
+    $_SESSION['modcssurls'][$tempurl] = $attrib['href'];
+    $attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
     $end = ' />';
   }

trunk/roundcubemail/program/steps/utils/modcss.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2007-2010, The Roundcube Dev Team                       |
+ | Copyright (C) 2007-2011, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -22 +22 @@
 $source = '';
 
-$url = preg_replace('![^a-z0-9:./\-_?$&=%]!i', '', $_GET['u']);
-if ($url === null) {
+$url = preg_replace('![^a-z0-9.-]!i', '', $_GET['_u']);
+if ($url === null || !($realurl = $_SESSION['modcssurls'][$url])) {
     header('HTTP/1.1 403 Forbidden');
-    echo $error;
+    echo "Unauthorized request";
     exit;
 }
 
-$a_uri = parse_url($url);
+$a_uri = parse_url($realurl);
 $port  = $a_uri['port'] ? $a_uri['port'] : 80;
 $host  = $a_uri['host'];
@@ -86 +86 @@
 if (!empty($source) && in_array($mimetype, array('text/css','text/plain'))) {
     header('Content-Type: text/css');
-    echo rcmail_mod_css_styles($source, preg_replace('/[^a-z0-9]/i', '', $_GET['c']));
+    echo rcmail_mod_css_styles($source, preg_replace('/[^a-z0-9]/i', '', $_GET['_c']));
     exit;
 }