correctly add allowedReferences etc.

create new utility function `nullableValueAt`

Author: haenoe

src/libstore/derivations.cc

@@ -12,6 +12,7 @@
 #include "common-protocol-impl.hh"
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>
+#include <optional>
 
 namespace nix {
 
@@ -1512,10 +1513,10 @@ DerivationOptions adl_serializer<DerivationOptions>::from_json(const json & json
     res.impureEnvVars = getStringList(valueAt(json, "impureEnvVars"));
     res.allowLocalNetworking = getBoolean(valueAt(json, "allowLocalNetworking"));
 
-    res.allowedReferences = optionalValueAt(json, "allowedReferences");
-    res.allowedRequisites = optionalValueAt(json, "allowedRequisites");
-    res.disallowedReferences = optionalValueAt(json, "disallowedReferences");
-    res.disallowedRequisites = optionalValueAt(json, "disallowedRequisites");
+    res.allowedReferences = nullableValueAt(json, "allowedReferences");
+    res.allowedRequisites = nullableValueAt(json, "allowedRequisites");
+    res.disallowedReferences = nullableValueAt(json, "disallowedReferences");
+    res.disallowedRequisites = nullableValueAt(json, "disallowedRequisites");
 
     res.requiredSystemFeatures = getStringList(valueAt(json, "requiredSystemFeatures"));
     res.preferLocalBuild = getBoolean(valueAt(json, "preferLocalBuild"));
@@ -1531,8 +1532,8 @@ void adl_serializer<DerivationOptions>::to_json(json & json, DerivationOptions o
     json["impureEnvVars"] = o.impureEnvVars;
     json["allowLocalNetworking"] = o.allowLocalNetworking;
 
-    json["disallowedReferences"] = o.allowedReferences;
-    json["disallowedRequisites"] = o.allowedRequisites;
+    json["allowedReferences"] = o.allowedReferences;
+    json["allowedRequisites"] = o.allowedRequisites;
     json["disallowedReferences"] = o.disallowedReferences;
     json["disallowedRequisites"] = o.disallowedRequisites;
 

src/libutil/json-utils.cc

@@ -3,6 +3,7 @@
 #include "types.hh"
 #include <nlohmann/json_fwd.hpp>
 #include <iostream>
+#include <optional>
 
 namespace nix {
 
@@ -38,6 +39,15 @@ std::optional<nlohmann::json> optionalValueAt(const nlohmann::json::object_t & m
     return std::optional { map.at(key) };
 }
 
+std::optional<nlohmann::json> nullableValueAt(const nlohmann::json::object_t & map, const std::string & key)
+{
+    auto value = valueAt(map, key);
+
+    if (value.is_null())
+        return std::nullopt;
+
+    return std::optional { std::move(value) };
+}
 
 const nlohmann::json * getNullable(const nlohmann::json & value)
 {

src/libutil/json-utils.hh

@@ -24,6 +24,7 @@ const nlohmann::json & valueAt(
     const std::string & key);
 
 std::optional<nlohmann::json> optionalValueAt(const nlohmann::json::object_t & value, const std::string & key);
+std::optional<nlohmann::json> nullableValueAt(const nlohmann::json::object_t & value, const std::string & key);
 
 /**
  * Downcast the json object, failing with a nice error if the conversion fails.

tests/unit/libstore/data/derivation/advanced-attributes-defaults.json

@@ -17,6 +17,8 @@
     "additionalSandboxProfile": "",
     "allowLocalNetworking": false,
     "allowSubstitutes": true,
+    "allowedReferences": null,
+    "allowedRequisites": null,
     "disallowedReferences": null,
     "disallowedRequisites": null,
     "impureEnvVars": [],

tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.json

@@ -16,6 +16,8 @@
     "additionalSandboxProfile": "",
     "allowLocalNetworking": false,
     "allowSubstitutes": true,
+    "allowedReferences": null,
+    "allowedRequisites": null,
     "disallowedReferences": null,
     "disallowedRequisites": null,
     "impureEnvVars": [],

tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.json

@@ -30,6 +30,8 @@
     "additionalSandboxProfile": "sandcastle",
     "allowLocalNetworking": true,
     "allowSubstitutes": false,
+    "allowedReferences": null,
+    "allowedRequisites": null,
     "disallowedReferences": null,
     "disallowedRequisites": null,
     "impureEnvVars": [

tests/unit/libstore/data/derivation/dynDerivationDeps.json

@@ -37,6 +37,8 @@
     "additionalSandboxProfile": "",
     "allowLocalNetworking": false,
     "allowSubstitutes": true,
+    "allowedReferences": null,
+    "allowedRequisites": null,
     "disallowedReferences": null,
     "disallowedRequisites": null,
     "impureEnvVars": [],

tests/unit/libstore/data/derivation/simple.json

@@ -24,6 +24,8 @@
     "additionalSandboxProfile": "",
     "allowLocalNetworking": false,
     "allowSubstitutes": true,
+    "allowedReferences": null,
+    "allowedRequisites": null,
     "disallowedReferences": null,
     "disallowedRequisites": null,
     "impureEnvVars": [],