wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use file_exists to verify that config file exists

Browse source 
There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file.

This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems.

Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720
This commit is contained in:
Lukas Reschke 2015-01-27 00:45:37 +01:00
parent 5da4071c45
commit 17f2cfbb9c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/config.php
View file

@ -166,7 +166,9 @@ class Config {
// Include file and merge config
foreach ($configFiles as $file) {
$filePointer = @fopen($file, 'r');
if($file === $this->configFilePath && $filePointer === false) {
if($file === $this->configFilePath &&
$filePointer === false &&
@!file_exists($this->configFilePath)) {
// Opening the main config might not be possible, e.g. if the wrong
// permissions are set (likely on a new installation)
continue;