Forget modified attribute on config change

lib/base/CMakeLists.txt

@@ -59,7 +59,7 @@ set(base_SOURCES
   scriptframe.cpp scriptframe.hpp
   scriptglobal.cpp scriptglobal.hpp
   scriptutils.cpp scriptutils.hpp
-  serializer.cpp serializer.hpp
+  serializer.cpp serializer.hpp serializer-script.cpp
   shared.hpp
   shared-object.hpp
   singleton.hpp

lib/base/configobject-script.cpp

@@ -4,10 +4,28 @@
 #include "base/dictionary.hpp"
 #include "base/function.hpp"
 #include "base/functionwrapper.hpp"
+#include "base/reference.hpp"
 #include "base/scriptframe.hpp"
 
 using namespace icinga;
 
+static bool ConfigObjectGetAttribute(const String& attr, const Reference::Ptr& result)
+{
+	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
+	ConfigObject::Ptr self = vframe->Self;
+
+	REQUIRE_NOT_NULL(self);
+
+	Value temp;
+	bool ok = self->GetAttribute(attr, &temp);
+
+	if (ok && result) {
+		result->Set(temp);
+	}
+
+	return ok;
+}
+
 static void ConfigObjectModifyAttribute(const String& attr, const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
@@ -27,6 +45,7 @@ static void ConfigObjectRestoreAttribute(const String& attr)
 Object::Ptr ConfigObject::GetPrototype()
 {
 	static Dictionary::Ptr prototype = new Dictionary({
+		{ "get_attribute", new Function("ConfigObject#get_attribute", ConfigObjectGetAttribute, { "attr", "result" }, false) },
 		{ "modify_attribute", new Function("ConfigObject#modify_attribute", ConfigObjectModifyAttribute, { "attr", "value" }, false) },
 		{ "restore_attribute", new Function("ConfigObject#restore_attribute", ConfigObjectRestoreAttribute, { "attr", "value" }, false) }
 	});

lib/base/configobject.cpp

@@ -87,6 +87,34 @@ class ModAttrValidationUtils final : public ValidationUtils
 	}
 };
 
+bool ConfigObject::GetAttribute(const String& attr, Value *result)
+{
+	std::vector<String> tokens = attr.Split(".");
+	auto current (tokens.begin());
+	auto end (tokens.end());
+	Object::Ptr subTree (this);
+	Value branch;
+
+	for (;;) {
+		if (!subTree->GetOwnField(*current, &branch)) {
+			return false;
+		}
+
+		if (++current == end) {
+			break;
+		}
+
+		if (!branch.IsObject()) {
+			return false;
+		}
+
+		subTree = branch.Get<Object::Ptr>();
+	}
+
+	*result = std::move(branch);
+	return true;
+}
+
 void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool updateVersion)
 {
 	Dictionary::Ptr original_attributes = GetOriginalAttributes();
@@ -621,7 +649,7 @@ void ConfigObject::StopObjects()
 	}
 }
 
-void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&)>& callback)
+void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&, const Value&)>& callback)
 {
 	for (const Type::Ptr& type : Type::GetAllTypes()) {
 		auto *dtype = dynamic_cast<ConfigType *>(type.get());
@@ -675,7 +703,7 @@ void ConfigObject::DumpModifiedAttributes(const std::function<void(const ConfigO
 				} else
 					modifiedValue = currentValue;
 
-				callback(object, key, modifiedValue);
+				callback(object, key, kv.second, modifiedValue);
 			}
 		}
 	}

lib/base/configobject.hpp

@@ -36,6 +36,7 @@ class ConfigObject : public ObjectImpl<ConfigObject>
 
 	ConfigObject::Ptr GetZone() const;
 
+	bool GetAttribute(const String& attr, Value *result);
 	void ModifyAttribute(const String& attr, const Value& value, bool updateVersion = true);
 	void RestoreAttribute(const String& attr, bool updateVersion = true);
 	bool IsAttributeModified(const String& attr) const;
@@ -75,7 +76,7 @@ class ConfigObject : public ObjectImpl<ConfigObject>
 	static void RestoreObjects(const String& filename, int attributeTypes = FAState);
 	static void StopObjects();
 
-	static void DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&)>& callback);
+	static void DumpModifiedAttributes(const std::function<void(const ConfigObject::Ptr&, const String&, const Value&, const Value&)>& callback);
 
 	static Object::Ptr GetPrototype();
 

lib/base/serializer-script.cpp

@@ -0,0 +1,8 @@
+/* Icinga 2 | (c) 2021 Icinga GmbH | GPLv2+ */
+
+#include "base/function.hpp"
+#include "base/serializer.hpp"
+
+using namespace icinga;
+
+REGISTER_FUNCTION(Internal, serialize, &Serialize, "value:attribute_types");

lib/icinga/icingaapplication.cpp

@@ -18,6 +18,8 @@
 #include "base/initialize.hpp"
 #include "base/statsfunction.hpp"
 #include "base/loader.hpp"
+#include "base/json.hpp"
+#include "base/serializer.hpp"
 #include <fstream>
 
 using namespace icinga;
@@ -121,7 +123,7 @@ void IcingaApplication::OnShutdown()
 	DumpProgramState();
 }
 
-static void PersistModAttrHelper(std::fstream& fp, ConfigObject::Ptr& previousObject, const ConfigObject::Ptr& object, const String& attr, const Value& value)
+static void PersistModAttrHelper(std::fstream& fp, ConfigObject::Ptr& previousObject, const ConfigObject::Ptr& object, const String& attr, const Value& original, const Value& modified)
 {
 	if (object != previousObject) {
 		if (previousObject) {
@@ -138,18 +140,37 @@ static void PersistModAttrHelper(std::fstream& fp, ConfigObject::Ptr& previousOb
 		});
 		ConfigWriter::EmitFunctionCall(fp, "get_object", args1);
 
-		ConfigWriter::EmitRaw(fp, "\nif (obj) {\n");
+		ConfigWriter::EmitRaw(fp, "\nif (obj) {\n\tvar result\n");
 	}
 
-	ConfigWriter::EmitRaw(fp, "\tobj.");
+	ConfigWriter::EmitRaw(fp, "\tif (");
+
+	if (original.GetType() == ValueEmpty) {
+		ConfigWriter::EmitRaw(fp, "!obj.get_attribute(");
+		ConfigWriter::EmitString(fp, attr);
+		ConfigWriter::EmitRaw(fp, ", &result) || Json.encode(Internal.serialize(result, ");
+		ConfigWriter::EmitNumber(fp, FAConfig);
+		ConfigWriter::EmitRaw(fp, ")) == ");
+		ConfigWriter::EmitString(fp, "null");
+	} else {
+		ConfigWriter::EmitRaw(fp, "obj.get_attribute(");
+		ConfigWriter::EmitString(fp, attr);
+		ConfigWriter::EmitRaw(fp, ", &result) && Json.encode(Internal.serialize(result, ");
+		ConfigWriter::EmitNumber(fp, FAConfig);
+		ConfigWriter::EmitRaw(fp, ")) == Json.encode(");
+		ConfigWriter::EmitValue(fp, 1, Serialize(original, FAConfig));
+		ConfigWriter::EmitRaw(fp, ")");
+	}
+
+	ConfigWriter::EmitRaw(fp, ") {\n\t\tobj.");
 
 	Array::Ptr args2 = new Array({
 		attr,
-		value
+		modified
 	});
 	ConfigWriter::EmitFunctionCall(fp, "modify_attribute", args2);
 
-	ConfigWriter::EmitRaw(fp, "\n");
+	ConfigWriter::EmitRaw(fp, "\n\t}\n");
 
 	previousObject = object;
 }
@@ -175,8 +196,8 @@ void IcingaApplication::DumpModifiedAttributes()
 	fp.exceptions(std::ofstream::failbit | std::ofstream::badbit);
 
 	ConfigObject::Ptr previousObject;
-	ConfigObject::DumpModifiedAttributes([&fp, &previousObject](const ConfigObject::Ptr& object, const String& attr, const Value& value) {
-		PersistModAttrHelper(fp, previousObject, object, attr, value);
+	ConfigObject::DumpModifiedAttributes([&fp, &previousObject](const ConfigObject::Ptr& object, const String& attr, const Value& original, const Value& modified) {
+		PersistModAttrHelper(fp, previousObject, object, attr, original, modified);
 	});
 
 	if (previousObject) {