Changeset 4488 in subversion for trunk/roundcubemail/program/steps/mail/func.inc

Timestamp:

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

Author:

thomasb

Message:

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

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (2 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 = ' />';
   }