tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard the FileCache if the systemd private tmp directory for the web server has been removed 

refs #10123
This commit is contained in:
Eric Lippmann 2015-11-26 12:13:02 +01:00
parent 045e4a99b5
commit 6e618300ec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Web/FileCache.php
View File

@ -44,13 +44,15 @@ class FileCache
$tmpDir = sys_get_temp_dir(); $tmpDir = sys_get_temp_dir();
$runtimePath = $tmpDir . '/FileCache_' . $name; $runtimePath = $tmpDir . '/FileCache_' . $name;
if (is_dir($runtimePath)) { if (is_dir($runtimePath)) {
// Don't combine the following if with the above because else mkdir may fail w/ file exists if the runtime // Don't combine the following if with the above because else the elseif path will be evaluated if the
// path exists and is not writeable // runtime path exists and is not writeable
if (is_writeable($runtimePath)) { if (is_writeable($runtimePath)) {
$this->basedir = $runtimePath; $this->basedir = $runtimePath;
$this->enabled = true; $this->enabled = true;
} }
} elseif (is_dir($tmpDir) && is_writeable($tmpDir) && mkdir($runtimePath, '0750', true)) { } elseif (is_dir($tmpDir) && is_writeable($tmpDir) && @mkdir($runtimePath, '0750', true)) {
// Suppress mkdir errors because it may error w/ no such file directory if the systemd private tmp directory
// for the web server has been removed
$this->basedir = $runtimePath; $this->basedir = $runtimePath;
$this->enabled = true; $this->enabled = true;
} }