From: Philipp <admin@philipp.info>
Date: Sun, 8 Jan 2023 01:04:25 +0000 (+0100)
Subject: Fix loading empty node.config.php
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0429a4e4296ef0a21804c546b7a3cf483e9c0a46;p=friendica.git

Fix loading empty node.config.php
---

diff --git a/src/Core/Config/Util/ConfigFileManager.php b/src/Core/Config/Util/ConfigFileManager.php
index f3627cf477..fff240bb30 100644
--- a/src/Core/Config/Util/ConfigFileManager.php
+++ b/src/Core/Config/Util/ConfigFileManager.php
@@ -177,7 +177,7 @@ class ConfigFileManager
 	{
 		$filename = $this->configDir . '/' . self::CONFIG_DATA_FILE;
 
-		if (file_exists($filename)) {
+		if (file_exists($filename) && (filesize($filename) > 0)) {
 
 			// The fallback empty return content
 			$content = '<?php return [];';
@@ -188,9 +188,16 @@ class ConfigFileManager
 			 *
 			 * Any exclusive locking (LOCK_EX) would need to wait until all LOCK_SHs are unlocked
 			 */
-			$configStream = fopen($filename, 'r');
+			if (($configStream = @fopen($filename, 'r')) === false) {
+				throw new ConfigFileException(sprintf('Cannot open file "%s" in mode r', $filename));
+			}
+
 			try {
 				if (flock($configStream, LOCK_SH)) {
+					if (($filesize = filesize($filename)) === 0) {
+						return;
+					}
+
 					$content = fread($configStream, filesize($filename));
 					if (!$content) {
 						throw new ConfigFileException(sprintf('Couldn\'t read file %s', $filename));
diff --git a/tests/src/Core/Config/Cache/ConfigFileManagerTest.php b/tests/src/Core/Config/Cache/ConfigFileManagerTest.php
index 2adfc27ef7..6c2c41ef65 100644
--- a/tests/src/Core/Config/Cache/ConfigFileManagerTest.php
+++ b/tests/src/Core/Config/Cache/ConfigFileManagerTest.php
@@ -511,4 +511,23 @@ class ConfigFileManagerTest extends MockedTest
 
 		self::assertNull($configCache->get('system', 'default_timezone'));
 	}
+
+	/**
+	 * Test for empty node.config.php
+	 */
+	public function testEmptyFile()
+	{
+		$this->delConfigFile('node.config.php');
+
+		vfsStream::newFile('node.config.php')
+				 ->at($this->root->getChild('config'))
+				 ->setContent('');
+
+		$configFileManager = (new Config())->createConfigFileManager($this->root->url());
+		$configCache       = new Cache();
+
+		$configFileManager->setupCache($configCache);
+
+		self::assertEquals(1,1);
+	}
 }