From 254634479c9bb8b15c9f3a98e3bf44347c7e38e5 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 19 Jun 2021 19:54:30 +0900
Subject: [PATCH] Fix #1721 add some safeguards when saving system config file

---
 common/framework/config.php              | 22 ++++++++++++++++++++--
 common/framework/storage.php             |  2 +-
 modules/admin/admin.admin.controller.php |  5 ++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/common/framework/config.php b/common/framework/config.php
index 3b6196883..d5c7313a9 100644
--- a/common/framework/config.php
+++ b/common/framework/config.php
@@ -135,16 +135,34 @@ class Config
 			self::setAll($config);
 		}
 		
+		// Backup the main config file.
+		$config_filename = \RX_BASEDIR . self::$config_filename;
+		$backup_filename = \RX_BASEDIR . self::$config_filename . '.backup.' . time() . '.php';
+		$result = Storage::copy($config_filename, $backup_filename);
+		clearstatcache(true, $backup_filename);
+		if (!$result || filesize($config_filename) !== filesize($backup_filename))
+		{
+			return false;
+		}
+		
 		// Save the main config file.
 		$buff = '<?php' . "\n" . '// Rhymix System Configuration' . "\n" . 'return ' . self::serialize(self::$_config) . ';' . "\n";
-		$result = Storage::write(\RX_BASEDIR . self::$config_filename, $buff) ? true : false;
+		$result = Storage::write($config_filename, $buff) ? true : false;
+		clearstatcache(true, $config_filename);
+		if (!$result || filesize($config_filename) !== strlen($buff))
+		{
+			return false;
+		}
+		
+		// Remove the backup file.
+		Storage::delete($backup_filename);
 		
 		// Save XE-compatible config files.
 		$warning = '// THIS FILE IS NOT USED IN RHYMIX.' . "\n" . '// TO MODIFY SYSTEM CONFIGURATION, EDIT config.php INSTEAD.';
 		$buff = '<?php' . "\n" . $warning . "\n";
 		Storage::write(\RX_BASEDIR . self::$old_db_config_filename, $buff);
 		Storage::write(\RX_BASEDIR . self::$old_ftp_config_filename, $buff);
-		return $result;
+		return true;
 	}
 	
 	/**
diff --git a/common/framework/storage.php b/common/framework/storage.php
index cd01594d1..5a88429c1 100644
--- a/common/framework/storage.php
+++ b/common/framework/storage.php
@@ -303,7 +303,7 @@ class Storage
 			flock($fp, \LOCK_UN);
 			fclose($fp);
 			
-			if ($result === false)
+			if ($result === false || (is_string($content) && strlen($content) !== $result))
 			{
 				trigger_error('Cannot write file: ' . (isset($original_filename) ? $original_filename : $filename), \E_USER_WARNING);
 				return false;
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 044198866..a90e4df53 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -1257,7 +1257,10 @@ class adminAdminController extends admin
 			Rhymix\Framework\Config::set('url.http_port', $vars->http_port ?: null);
 			Rhymix\Framework\Config::set('url.https_port', $vars->https_port ?: null);
 			Rhymix\Framework\Config::set('url.ssl', $vars->domain_security);
-			Rhymix\Framework\Config::save();
+			if (!Rhymix\Framework\Config::save())
+			{
+				throw new Rhymix\Framework\Exception('msg_failed_to_save_config');
+			}
 		}
 		
 		// Commit.