maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

use unpredictable tmpfile-name in installation if lib/userdata.inc.php cannot be written due to permission

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-03-04 19:34:18 +01:00
parent 8807ae7dad
commit 6b09720ef8
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
install/lib/class.FroxlorInstall.php
View File

@@ -338,15 +338,20 @@ class FroxlorInstall
@fclose($fp);
$content .= $this->_status_message('green', 'OK');
chmod($userdata_file, 0440);
} elseif ($fp = @fopen('/tmp/userdata.inc.php', 'w')) {
$result = @fputs($fp, $userdata, strlen($userdata));
@fclose($fp);
$content .= $this->_status_message('orange', $this->_lng['install']['creating_configfile_temp']);
chmod('/tmp/userdata.inc.php', 0440);
} else {
$content .= $this->_status_message('red', $this->_lng['install']['creating_configfile_failed']);
$escpduserdata = nl2br(htmlspecialchars($userdata));
eval("\$content .= \"" . $this->_getTemplate("textarea") . "\";");
// try creating it in a temporary file
$temp_file = tempnam(sys_get_temp_dir(), 'fx');
if (touch($temp_file)) {
chmod($temp_file, 0400);
$fp = @fopen($temp_file, 'w');
$result = @fputs($fp, $userdata, strlen($userdata));
@fclose($fp);
$content .= $this->_status_message('orange', sprintf($this->_lng['install']['creating_configfile_temp'], $temp_file));
} else {
$content .= $this->_status_message('red', $this->_lng['install']['creating_configfile_failed']);
$escpduserdata = nl2br(htmlspecialchars($userdata));
eval("\$content .= \"" . $this->_getTemplate("textarea") . "\";");
}
}
return $content;