daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-21 02:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configurationmanager.php: atomic write for configuration.json to prevent truncation on low disk (#7888)

Browse Source 
* fix: use atomic temp-file write to prevent configuration.json truncation

Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/ea144d2f-2533-4001-8d10-d17168bb8bec

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>

* fix: improve error messages with specific file paths for config write failures

Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/ea144d2f-2533-4001-8d10-d17168bb8bec

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>

---------

Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>
Co-authored-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com>
This commit is contained in:
Copilot
2026-04-20 18:44:33 +02:00
committed by GitHub
parent bce78168e4
commit 953a5fdf1e
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
php/src/Data/ConfigurationManager.php
View File

@@ -302,6 +302,9 @@ class ConfigurationManager
if ($this->config === [] && file_exists(DataConst::GetConfigFile()))
{
$configContent = (string)file_get_contents(DataConst::GetConfigFile());
if ($configContent === '') {
throw new \RuntimeException("The config file " . DataConst::GetConfigFile() . " is empty. It may have been truncated due to low disk space. Please restore it from a backup.");
}
$this->config = json_decode($configContent, true, 512, JSON_THROW_ON_ERROR);
}
@@ -702,7 +705,21 @@ class ConfigurationManager
if ($df !== false && (int)$df < $size) {
throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not have enough space for writing the config file! Not writing it back!");
}
file_put_contents(DataConst::GetConfigFile(), $content);
// Write to a temp file first to avoid truncating the config file if the
// disk fills up mid-write. rename() is atomic on POSIX filesystems, so the
// original config is never touched until the new content is fully on disk.
$tempFile = DataConst::GetConfigFile() . '.tmp';
if (file_put_contents($tempFile, $content) === false) {
// The file probably wasn't created, but better check nonetheless.
if (file_exists($tempFile)) {
unlink($tempFile);
}
throw new InvalidSettingConfigurationException("Failed to write temporary config file: " . $tempFile);
}
if (!rename($tempFile, DataConst::GetConfigFile())) {
unlink($tempFile);
throw new InvalidSettingConfigurationException("Failed to rename " . $tempFile . " to " . DataConst::GetConfigFile());
}
$this->config = [];
}