Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #975 from virtualtam/robustness

Browse source 
Improve robustness for zlib and file operations
This commit is contained in:
VirtualTam 2017-09-30 10:56:56 +02:00 committed by GitHub
parent a59bbf50d7 8c322aaba1
commit 7c670b39a2
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
application/ApplicationUtils.php
View file

@ -168,14 +168,15 @@ class ApplicationUtils
public static function checkResourcePermissions($conf) public static function checkResourcePermissions($conf)
{ {
$errors = array(); $errors = array();
$rainTplDir = rtrim($conf->get('resource.raintpl_tpl'), '/');
// Check script and template directories are readable // Check script and template directories are readable
foreach (array( foreach (array(
'application', 'application',
'inc', 'inc',
'plugins', 'plugins',
$conf->get('resource.raintpl_tpl'), $rainTplDir,
$conf->get('resource.raintpl_tpl').'/'.$conf->get('resource.theme'), $rainTplDir.'/'.$conf->get('resource.theme'),
) as $path) { ) as $path) {
if (! is_readable(realpath($path))) { if (! is_readable(realpath($path))) {
$errors[] = '"'.$path.'" directory is not readable'; $errors[] = '"'.$path.'" directory is not readable';

26
application/FileUtils.php
View file

@ -50,7 +50,8 @@ class FileUtils
/** /**
* Read data from a file containing Shaarli database format content. * Read data from a file containing Shaarli database format content.
* If the file isn't readable or doesn't exists, default data will be returned. *
* If the file isn't readable or doesn't exist, default data will be returned.
* *
* @param string $file File path. * @param string $file File path.
* @param mixed $default The default value to return if the file isn't readable. * @param mixed $default The default value to return if the file isn't readable.
@ -61,16 +62,21 @@ class FileUtils
{ {
// Note that gzinflate is faster than gzuncompress. // Note that gzinflate is faster than gzuncompress.
// See: http://www.php.net/manual/en/function.gzdeflate.php#96439 // See: http://www.php.net/manual/en/function.gzdeflate.php#96439
if (is_readable($file)) { if (! is_readable($file)) {
return unserialize( return $default;
gzinflate(
base64_decode(
substr(file_get_contents($file), strlen(self::$phpPrefix), -strlen(self::$phpSuffix))
)
)
);
} }
return $default; $data = file_get_contents($file);
if ($data == '') {
return $default;
}
return unserialize(
gzinflate(
base64_decode(
substr($data, strlen(self::$phpPrefix), -strlen(self::$phpSuffix))
)
)
);
} }
} }

1
application/ThemeUtils.php
View file

@ -22,6 +22,7 @@ class ThemeUtils
*/ */
public static function getThemes($tplDir) public static function getThemes($tplDir)
{ {
$tplDir = rtrim($tplDir, '/');
$allTheme = glob($tplDir.'/*', GLOB_ONLYDIR); $allTheme = glob($tplDir.'/*', GLOB_ONLYDIR);
$themes = []; $themes = [];
foreach ($allTheme as $value) { foreach ($allTheme as $value) {