From f6db26f683927f46cec192bf0214657ba73035a6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 8 Sep 2020 10:55:05 +0200
Subject: [PATCH] Create /var/lib/icinga2/api/zones/*/.checksum

refs #8210
---
 lib/remote/apilistener-filesync.cpp | 28 ++++++++++++++++++++++++----
 lib/remote/apilistener.hpp          |  4 ++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index 1feb13097..53a7a7873 100644
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -3,6 +3,7 @@
 #include "remote/apilistener.hpp"
 #include "remote/apifunction.hpp"
 #include "config/configcompiler.hpp"
+#include "base/object-packer.hpp"
 #include "base/tlsutility.hpp"
 #include "base/json.hpp"
 #include "base/configtype.hpp"
@@ -59,10 +60,11 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
 	newConfigInfo.Checksums = new Dictionary();
 
 	String zoneName = zone->GetName();
+	Dictionary::Ptr contents = new Dictionary();
 
 	// Load registered zone paths, e.g. '_etc', '_api' and user packages.
 	for (const ZoneFragment& zf : ConfigCompiler::GetZoneDirs(zoneName)) {
-		ConfigDirInformation newConfigPart = LoadConfigDir(zf.Path);
+		ConfigDirInformation newConfigPart = LoadConfigDir(zf.Path, contents);
 
 		// Config files '*.conf'.
 		{
@@ -164,6 +166,19 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
 	fp << std::fixed << JsonEncode(newConfigInfo.Checksums);
 	fp.close();
 
+	// Checksum.
+	String checksumPath = productionZonesDir + "/.checksum";
+
+	if (Utility::PathExists(checksumPath))
+		Utility::Remove(checksumPath);
+
+	{
+		std::ofstream fp(checksumPath.CStr(), std::ofstream::out | std::ostream::trunc);
+
+		fp << GetChecksum(PackObject(contents));
+		fp.close();
+	}
+
 	Log(LogNotice, "ApiListener")
 		<< "Updated meta data for cluster config sync. Checksum: '" << checksumsPath
 		<< "', timestamp: '" << tsPath << "', auth: '" << authPath << "'.";
@@ -781,14 +796,15 @@ bool ApiListener::CheckConfigChange(const ConfigDirInformation& oldConfig, const
  * @param dir Path to the config directory.
  * @returns ConfigDirInformation structure.
  */
-ConfigDirInformation ApiListener::LoadConfigDir(const String& dir)
+ConfigDirInformation ApiListener::LoadConfigDir(const String& dir, const Dictionary::Ptr& contents)
 {
 	ConfigDirInformation config;
 	config.UpdateV1 = new Dictionary();
 	config.UpdateV2 = new Dictionary();
 	config.Checksums = new Dictionary();
 
-	Utility::GlobRecursive(dir, "*", std::bind(&ApiListener::ConfigGlobHandler, std::ref(config), dir, _1), GlobFile);
+	Utility::GlobRecursive(dir, "*", std::bind(&ApiListener::ConfigGlobHandler, std::ref(config), std::ref(contents), dir, _1), GlobFile);
+
 	return config;
 }
 
@@ -800,7 +816,7 @@ ConfigDirInformation ApiListener::LoadConfigDir(const String& dir)
  * @param path File path.
  * @param file Full file name.
  */
-void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const String& path, const String& file)
+void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const Dictionary::Ptr& contents, const String& path, const String& file)
 {
 	// Avoid loading the authoritative marker for syncs at all cost.
 	if (Utility::BaseName(file) == ".authoritative")
@@ -854,6 +870,10 @@ void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const String&
 	 * IMPORTANT: Ignore the .authoritative file above, this must not be synced.
 	 * */
 	config.Checksums->Set(relativePath, GetChecksum(content));
+
+	if (contents) {
+		contents->Set(relativePath, content);
+	}
 }
 
 /**
diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index d1176ed2e..dbdc79b37 100644
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -197,8 +197,8 @@ private:
 
 	static Dictionary::Ptr MergeConfigUpdate(const ConfigDirInformation& config);
 
-	static ConfigDirInformation LoadConfigDir(const String& dir);
-	static void ConfigGlobHandler(ConfigDirInformation& config, const String& path, const String& file);
+	static ConfigDirInformation LoadConfigDir(const String& dir, const Dictionary::Ptr& contents = nullptr);
+	static void ConfigGlobHandler(ConfigDirInformation& config, const Dictionary::Ptr& contents, const String& path, const String& file);
 
 	static void TryActivateZonesStageCallback(const ProcessResult& pr,
 		const std::vector<String>& relativePaths);