clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6546 from fabrixxm/fix/issue6545 

Filesystem storage: handle basepath with trailing slash and set file/folders permission
This commit is contained in:
Michael Vogel 2019-01-29 13:20:08 +01:00 committed by GitHub
parent 8a5418ebee a7d45682e7
commit 383325f84b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Model/Storage/Filesystem.php
View File

@ -28,7 +28,8 @@ class Filesystem implements IStorage
private static function getBasePath() private static function getBasePath()
{ {
return Config::get('storage', 'filesystem_path', self::DEFAULT_BASE_FOLDER); $path = Config::get('storage', 'filesystem_path', self::DEFAULT_BASE_FOLDER);
return rtrim($path, '/');
} }
/** /**
@ -69,10 +70,13 @@ class Filesystem implements IStorage
if (!is_file($path . '/index.html')) { if (!is_file($path . '/index.html')) {
file_put_contents($path . '/index.html', ''); file_put_contents($path . '/index.html', '');
} }
chmod($path . '/index.html', 0660);
chmod($path, 0770);
$path = dirname($path); $path = dirname($path);
} }
if (!is_file($path . '/index.html')) { if (!is_file($path . '/index.html')) {
file_put_contents($path . '/index.html', ''); file_put_contents($path . '/index.html', '');
chmod($path . '/index.html', 0660);
} }
} }
@ -100,6 +104,7 @@ class Filesystem implements IStorage
Logger::log('Failed to write data to ' . $file); Logger::log('Failed to write data to ' . $file);
throw new StorageException(L10n::t('Filesystem storage failed to save data to "%s". Check your write permissions', $file)); throw new StorageException(L10n::t('Filesystem storage failed to save data to "%s". Check your write permissions', $file));
} }
chmod($file, 0660);
return $ref; return $ref;
} }