Parse allowed* = null properly in structuredAttrs

src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs-defaults-null.drv

@@ -0,0 +1 @@
+../../../../../tests/functional/derivation/ca/advanced-attributes-structured-attrs-defaults-null.drv

src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs-defaults-null.json

@@ -0,0 +1,45 @@
+{
+  "args": [
+    "-c",
+    "echo hello > $out"
+  ],
+  "builder": "/bin/bash",
+  "env": {
+    "dev": "/02qcpld1y6xhs5gz9bchpxaw0xdhmsp5dv88lh25r2ss44kh8dxz",
+    "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"
+  },
+  "inputs": {
+    "drvs": {},
+    "srcs": []
+  },
+  "name": "advanced-attributes-structured-attrs-defaults-null",
+  "outputs": {
+    "dev": {
+      "hashAlgo": "sha256",
+      "method": "nar"
+    },
+    "out": {
+      "hashAlgo": "sha256",
+      "method": "nar"
+    }
+  },
+  "structuredAttrs": {
+    "builder": "/bin/bash",
+    "name": "advanced-attributes-structured-attrs-defaults-null",
+    "outputChecks": {
+      "out": {
+        "allowedReferences": null,
+        "allowedRequisites": null
+      }
+    },
+    "outputHashAlgo": "sha256",
+    "outputHashMode": "recursive",
+    "outputs": [
+      "out",
+      "dev"
+    ],
+    "system": "my-system"
+  },
+  "system": "my-system",
+  "version": 4
+}

src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults-null.drv

@@ -0,0 +1 @@
+../../../../../tests/functional/derivation/ia/advanced-attributes-structured-attrs-defaults-null.drv

src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults-null.json

@@ -0,0 +1,41 @@
+{
+  "args": [
+    "-c",
+    "echo hello > $out"
+  ],
+  "builder": "/bin/bash",
+  "env": {
+    "dev": "/nix/store/390jivcxmgr11md7knrcyzwv9v2v64cc-advanced-attributes-structured-attrs-defaults-null-dev",
+    "out": "/nix/store/s579dvk7r4jvp7rjmzq1gy3bf9sp7b4k-advanced-attributes-structured-attrs-defaults-null"
+  },
+  "inputs": {
+    "drvs": {},
+    "srcs": []
+  },
+  "name": "advanced-attributes-structured-attrs-defaults-null",
+  "outputs": {
+    "dev": {
+      "path": "390jivcxmgr11md7knrcyzwv9v2v64cc-advanced-attributes-structured-attrs-defaults-null-dev"
+    },
+    "out": {
+      "path": "s579dvk7r4jvp7rjmzq1gy3bf9sp7b4k-advanced-attributes-structured-attrs-defaults-null"
+    }
+  },
+  "structuredAttrs": {
+    "builder": "/bin/bash",
+    "name": "advanced-attributes-structured-attrs-defaults-null",
+    "outputChecks": {
+      "out": {
+        "allowedReferences": null,
+        "allowedRequisites": null
+      }
+    },
+    "outputs": [
+      "out",
+      "dev"
+    ],
+    "system": "my-system"
+  },
+  "system": "my-system",
+  "version": 4
+}

src/libstore-tests/derivation-advanced-attrs.cc

@@ -126,6 +126,7 @@ TEST_ATERM_JSON(advancedAttributes, "advanced-attributes-defaults");
 TEST_ATERM_JSON(advancedAttributes_defaults, "advanced-attributes");
 TEST_ATERM_JSON(advancedAttributes_structuredAttrs, "advanced-attributes-structured-attrs-defaults");
 TEST_ATERM_JSON(advancedAttributes_structuredAttrs_defaults, "advanced-attributes-structured-attrs");
+TEST_ATERM_JSON(advancedAttributes_structuredAttrs_defaults_null, "advanced-attributes-structured-attrs-defaults-null");
 
 #undef TEST_ATERM_JSON
 
@@ -351,6 +352,62 @@ TEST_F(CaDerivationAdvancedAttrsTest, advancedAttributes_structuredAttrs_default
     testRequiredSystemFeatures("advanced-attributes-structured-attrs-defaults.drv", {"ca-derivations"});
 };
 
+/**
+ * Test that null values for allowedReferences and allowedRequisites are
+ * treated as "not set" (no restriction), same as if the field was missing.
+ *
+ * The outputChecks map will have an entry for "out" (since outputChecks.out
+ * exists in the nix file), but the OutputChecks for that entry should have
+ * default/empty values for the nullable fields.
+ */
+DerivationOptions<SingleDerivedPath> advancedAttributes_structuredAttrs_defaults_null = {
+    .outputChecks =
+        std::map<std::string, DerivationOptions<SingleDerivedPath>::OutputChecks>{
+            // null values result in nullopt/empty, same as if not specified
+            {"out", DerivationOptions<SingleDerivedPath>::OutputChecks{}},
+        },
+    .unsafeDiscardReferences = {},
+    .passAsFile = {},
+    .exportReferencesGraph = {},
+    .additionalSandboxProfile = "",
+    .noChroot = false,
+    .impureHostDeps = {},
+    .impureEnvVars = {},
+    .allowLocalNetworking = false,
+    .requiredSystemFeatures = {},
+    .preferLocalBuild = false,
+    .allowSubstitutes = true,
+};
+
+TYPED_TEST(DerivationAdvancedAttrsBothTest, advancedAttributes_structuredAttrs_defaults_null)
+{
+    this->readTest("advanced-attributes-structured-attrs-defaults-null.drv", [&](auto encoded) {
+        auto got = parseDerivation(*this->store, std::move(encoded), "foo", this->mockXpSettings);
+
+        auto options = derivationOptionsFromStructuredAttrs(
+            *this->store, got.inputDrvs, got.env, get(got.structuredAttrs), true, this->mockXpSettings);
+
+        EXPECT_TRUE(got.structuredAttrs);
+
+        EXPECT_EQ(options, advancedAttributes_structuredAttrs_defaults_null);
+
+        EXPECT_EQ(options.canBuildLocally(*this->store, got), false);
+        EXPECT_EQ(options.willBuildLocally(*this->store, got), false);
+        EXPECT_EQ(options.substitutesAllowed(), true);
+        EXPECT_EQ(options.useUidRange(got), false);
+    });
+};
+
+TEST_F(DerivationAdvancedAttrsTest, advancedAttributes_structuredAttrs_defaults_null)
+{
+    testRequiredSystemFeatures("advanced-attributes-structured-attrs-defaults-null.drv", {});
+};
+
+TEST_F(CaDerivationAdvancedAttrsTest, advancedAttributes_structuredAttrs_defaults_null)
+{
+    testRequiredSystemFeatures("advanced-attributes-structured-attrs-defaults-null.drv", {"ca-derivations"});
+};
+
 TYPED_TEST(DerivationAdvancedAttrsBothTest, advancedAttributes_structuredAttrs)
 {
     DerivationOptions<SingleDerivedPath> expected = {