geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-03 22:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #486 from staabm/patch-1

Browse Source 
fixed undefined index $GLOBALS  when auto_globals_jit is enabled
This commit is contained in:
Denis Sokolov
2017-03-07 11:04:45 +02:00
committed by GitHub
parent 1a8192deae 4b12547c38
commit f2950be7da
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Whoops/Handler/PrettyPageHandler.php
+15 -12
View File
@@ -234,13 +234,13 @@ class PrettyPageHandler extends Handler
"has_frames_tabs" => $this->getApplicationPaths(),
"tables" => [
"GET Data" => $this->masked('_GET'),
"POST Data" => $this->masked('_POST'),
"Files" => $this->masked('_FILES'),
"Cookies" => $this->masked('_COOKIE'),
"Session" => isset($_SESSION) ? $this->masked('_SESSION') : [],
"Server/Request Data" => $this->masked('_SERVER'),
"Environment Variables" => $this->masked('_ENV'),
"GET Data" => $this->masked($_GET, '_GET'),
"POST Data" => $this->masked($_POST, '_POST'),
"Files" => isset($_FILES) ? $this->masked($_FILES, '_FILES') : [],
"Cookies" => $this->masked($_COOKIE, '_COOKIE'),
"Session" => isset($_SESSION) ? $this->masked($_SESSION, '_SESSION') : [],
"Server/Request Data" => $this->masked($_SERVER, '_SERVER'),
"Environment Variables" => $this->masked($_ENV, '_ENV'),
],
];
@@ -655,19 +655,22 @@ class PrettyPageHandler extends Handler
}
/**
* Checks all values identified by the given superGlobalName within GLOBALS.
* Checks all values within the given superGlobal array.
* Blacklisted values will be replaced by a equal length string cointaining only '*' characters.
*
* We intentionally dont rely on $GLOBALS as it depends on 'auto_globals_jit' php.ini setting.
*
* @param $superGlobal array One of the superglobal arrays
* @param $superGlobalName string the name of the superglobal array, e.g. '_GET'
* @return array $values without sensitive data
*/
private function masked($superGlobalName) {
private function masked(array $superGlobal, $superGlobalName) {
$blacklisted = $this->blacklist[$superGlobalName];
$values = $GLOBALS[$superGlobalName];
$values = $superGlobal;
foreach($blacklisted as $key) {
if (isset($values[$key])) {
$values[$key] = str_repeat('*', strlen($values[$key]));
if (isset($superGlobal[$key])) {
$values[$key] = str_repeat('*', strlen($superGlobal[$key]));
}
}
return $values;