From 3e0e9148efdcee5ab39d9712169f4c01cfb4f48f Mon Sep 17 00:00:00 2001 From: thomascube Date: Thu, 3 Feb 2011 21:12:35 +0000 Subject: Prevent from relaying arbitrary requests through modcss.inc (security issue) --- program/steps/utils/modcss.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'program/steps/utils/modcss.inc') diff --git a/program/steps/utils/modcss.inc b/program/steps/utils/modcss.inc index 640f06e3c..7e627b28c 100644 --- a/program/steps/utils/modcss.inc +++ b/program/steps/utils/modcss.inc @@ -5,7 +5,7 @@ | program/steps/utils/modcss.inc | | | | 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 | | | | PURPOSE: | @@ -21,14 +21,14 @@ $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']; $path = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : ''); @@ -85,7 +85,7 @@ fclose($fp); $mimetype = strtolower($headers['content-type']); 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; } else -- cgit v1.2.3