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

bug #2729191 [config] CheckConfigurationPermissions = false is worthless

Browse Source
This commit is contained in:
Marc Delisle
2009-04-12 11:42:14 +00:00
parent 94c4d3c23e
commit 0136afb068
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -26,6 +26,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Luke Armstrong thanks to Luke Armstrong
- bug #2740550 [interface] Using textarea CharEditing drops default values - bug #2740550 [interface] Using textarea CharEditing drops default values
- bug #2634827 [import] Using DELIMITER ends with infinite cycle - bug #2634827 [import] Using DELIMITER ends with infinite cycle
- bug #2729191 [config] CheckConfigurationPermissions = false is worthless
3.1.3.1 (2009-03-24) 3.1.3.1 (2009-03-24)
- [security] HTTP Response Splitting and file inclusion vulnerabilities - [security] HTTP Response Splitting and file inclusion vulnerabilities

13
libraries/Config.class.php
View File

@@ -401,6 +401,8 @@ class PMA_Config
//$this->checkPmaAbsoluteUri(); //$this->checkPmaAbsoluteUri();
$this->settings = PMA_array_merge_recursive($this->settings, $cfg); $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
$this->checkPermissions();
// Handling of the collation must be done after merging of $cfg // Handling of the collation must be done after merging of $cfg
// (from config.inc.php) so that $cfg['DefaultConnectionCollation'] // (from config.inc.php) so that $cfg['DefaultConnectionCollation']
// can have an effect. Note that the presence of collation // can have an effect. Note that the presence of collation
@@ -475,6 +477,15 @@ class PMA_Config
die('Existing configuration file (' . $this->getSource() . ') is not readable.'); die('Existing configuration file (' . $this->getSource() . ') is not readable.');
} }
return true;
}
/**
* verifies the permissions on config file (if asked by configuration)
* (must be called after config.inc.php has been merged)
*/
function checkPermissions()
{
// Check for permissions (on platforms that support it): // Check for permissions (on platforms that support it):
if ($this->get('CheckConfigurationPermissions')) { if ($this->get('CheckConfigurationPermissions')) {
$perms = @fileperms($this->getSource()); $perms = @fileperms($this->getSource());
@@ -487,8 +498,6 @@ class PMA_Config
} }
} }
} }
return true;
} }
/** /**