Skip to content

[stable24] add a disk_free_space check before writing config #36730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 3 commits into from
Feb 24, 2023
Merged

[stable24] add a disk_free_space check before writing config #36730

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a87f45a
add a disk_free_space check before writing config
szaimen Feb 13, 2023
b3fb30b
address review by Joas
szaimen Feb 15, 2023
b3a64a9
fix it for 32-bit
szaimen Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/private/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,13 @@ private function writeData() {
'This can usually be fixed by giving the webserver write access to the config directory.');
}

// Never write file back if disk space should be too low
$df = disk_free_space($this->configDir);
$size = strlen($content) + 10240;
if ($df !== false && (int)$df < $size) {
throw new \Exception($this->configDir . " does not have enough space for writing the config file! Not writing it back!");
}

// Try to acquire a file lock
if (!flock($filePointer, LOCK_EX)) {
throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
Expand Down