Merge pull request #10921 from Icinga/backport-10914-to-support/2.16

[Backport support/2.16] Restore single-argument Json.decode() in the DSL

AUTHORS

@@ -82,6 +82,7 @@ Dirk Goetz <dirk.goetz@icinga.com>
 Dirk Wening <dirk.wening@netways.de>
 Dirk Melchers <dirk@dirk-melchers.de>
 Dolf Schimmel <dolf@transip.nl>
+Dominik Bay <dominik@bay.sh>
 Dominik Riva <driva@protonmail.com>
 dominik-r-s <43005480+dominik-r-s@users.noreply.github.com>
 Edgar Fuß <ef@math.uni-bonn.de>

lib/base/json-script.cpp

@@ -15,12 +15,22 @@ static String JsonEncodeShim(const Value& value)
 	return JsonEncode(value);
 }
 
+static Value JsonDecodeShim(const String& data)
+{
+	/* Wrap JsonDecode() so that the DSL function keeps its single-argument
+	 * signature. JsonDecode()'s depthLimit parameter has a default value, but
+	 * function pointers don't carry defaults, so binding it directly would make
+	 * depthLimit a required argument and break Json.decode("..."). See #10913.
+	 */
+	return JsonDecode(data);
+}
+
 INITIALIZE_ONCE([]() {
 	Namespace::Ptr jsonNS = new Namespace(true);
 
 	/* Methods */
 	jsonNS->Set("encode", new Function("Json#encode", JsonEncodeShim, { "value" }, true));
-	jsonNS->Set("decode", new Function("Json#decode", JsonDecode, { "value" }, true));
+	jsonNS->Set("decode", new Function("Json#decode", JsonDecodeShim, { "value" }, true));
 
 	jsonNS->Freeze();
 

test/base-json.cpp

@@ -10,6 +10,7 @@
 #include "base/io-engine.hpp"
 #include "base/objectlock.hpp"
 #include "base/json.hpp"
+#include "base/scriptglobal.hpp"
 #include "test/utils.hpp"
 #include <boost/algorithm/string/replace.hpp>
 #include <BoostTestTargetConfig.h>
@@ -147,6 +148,20 @@ BOOST_AUTO_TEST_CASE(decode)
 	BOOST_CHECK(uint.IsNumber() && uint.Get<double>() == 23.0);
 }
 
+BOOST_AUTO_TEST_CASE(decode_dsl_single_argument)
+{
+	/* Regression test for #10913: the Json.decode() DSL function must accept a
+	 * single argument. JsonDecode()'s optional depthLimit parameter must not
+	 * leak into the function binding as a required argument.
+	 */
+	Namespace::Ptr systemNS = ScriptGlobal::Get("System");
+	Namespace::Ptr jsonNS = systemNS->Get("Json");
+	Function::Ptr decode = jsonNS->Get("decode");
+
+	BOOST_REQUIRE(decode);
+	BOOST_CHECK_EQUAL(decode->Invoke({ "2" }), Value(2));
+}
+
 BOOST_AUTO_TEST_CASE(invalid1)
 {
 	BOOST_CHECK_THROW(JsonDecode("\"1.7"), std::exception);