nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove error.php

Browse Source 
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.

Conflicts:

	error.php
	libraries/core.lib.php
This commit is contained in:
Michal Čihař
2011-01-06 09:39:23 +01:00
parent 68213538d7
commit b01a58118f
3 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/common.inc.php
View File

@@ -305,7 +305,6 @@ $goto_whitelist = array(
'db_printview.php',
'db_search.php',
//'Documentation.html',
//'error.php',
'export.php',
'import.php',
//'index.php',

12
libraries/core.lib.php
View File

@@ -241,18 +241,18 @@ function PMA_fatalError($error_message, $message_args = null)
$error_message = strtr($error_message, array('<br />' => '[br]'));
// Displays the error message
// (do not use &amp; for parameters sent by header)
header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php'
. '?lang=' . urlencode($GLOBALS['available_languages'][$GLOBALS['lang']][2])
. '&dir=' . urlencode($GLOBALS['text_dir'])
. '&type=' . urlencode($GLOBALS['strError'])
. '&error=' . urlencode($error_message));
$lang = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
$dir = $GLOBALS['text_dir'];
$type = $GLOBALS['strError'];
$error = $error_message;
// on fatal errors it cannot hurt to always delete the current session
if (isset($GLOBALS['session_name']) && isset($_COOKIE[$GLOBALS['session_name']])) {
PMA_removeCookie($GLOBALS['session_name']);
}
require('./libraries/error.inc.php');
exit;
}

46
error.php → libraries/error.inc.php
View File

@@ -3,35 +3,14 @@
/**
* phpMyAdmin fatal error display page
*
* @version $Id$
* @package phpMyAdmin
*/
/* Input sanitizing */
require_once './libraries/sanitizing.lib.php';
/* Get variables */
if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) {
$lang = htmlspecialchars($_REQUEST['lang']);
} else {
$lang = 'en';
if (! defined('PHPMYADMIN')) {
exit;
}
if (! empty($_REQUEST['dir']) && is_string($_REQUEST['dir'])) {
$dir = htmlspecialchars($_REQUEST['dir']);
} else {
$dir = 'ltr';
}
if (! empty($_REQUEST['type']) && is_string($_REQUEST['type'])) {
$type = htmlspecialchars($_REQUEST['type']);
} else {
$type = 'error';
}
// force utf-8 to avoid XSS with crafted URL and utf-7 in charset parameter
$charset = 'utf-8';
header('Content-Type: text/html; charset=' . $charset);
header('Content-Type: text/html; charset=utf-8');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
@@ -39,7 +18,7 @@ header('Content-Type: text/html; charset=' . $charset);
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
<!--
html {
@@ -71,17 +50,8 @@ header('Content-Type: text/html; charset=' . $charset);
</style>
</head>
<body>
<h1>phpMyAdmin - <?php echo $type; ?></h1>
<p><?php
if (!empty($_REQUEST['error'])) {
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
echo PMA_sanitize(stripslashes($_REQUEST['error']));
} else {
echo PMA_sanitize($_REQUEST['error']);
}
} else {
echo 'No error message!';
}
?></p>
<h1>phpMyAdmin - <?php echo $error_header; ?></h1>
<p><?php echo PMA_sanitize($error_message); ?></p>
</body>
</html>