From 860984be27d1f4a5fc8e27e28aabbb4c3331c0dd Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Thu, 14 Aug 2025 19:29:57 +0100
Subject: [PATCH] tests/functional2/lang: add tests for NUL bytes in JSON and
 TOML

Based on the tests in the upstream PR.

Co-authored-by: Philipp Otterbein <potterbein@blockstream.com>
Upstream-PR: https://github.com/NixOS/nix/pull/12024
Change-Id: I6a6a69643ae9bd2445e551013d09e64ac1fe9916
---
 .../eval-allow-depr-fromJSON-key.out.exp           | Bin 0 -> 15 bytes
 .../eval-allow-depr-fromJSON-value.out.exp         |   1 +
 .../eval-allow-depr-fromTOML-key.out.exp           | Bin 0 -> 15 bytes
 .../eval-allow-depr-fromTOML-value.out.exp         |   1 +
 .../eval-depr-fromJSON-key.out.exp                 | Bin 0 -> 15 bytes
 .../eval-depr-fromJSON-value.out.exp               |   1 +
 .../eval-depr-fromTOML-key.out.exp                 | Bin 0 -> 15 bytes
 .../eval-depr-fromTOML-value.out.exp               |   1 +
 .../lang/nul_bytes_parsers/in-fromJSON-key.nix     |   1 +
 .../lang/nul_bytes_parsers/in-fromJSON-value.nix   |   1 +
 .../lang/nul_bytes_parsers/in-fromTOML-key.nix     |   1 +
 .../lang/nul_bytes_parsers/in-fromTOML-value.nix   |   1 +
 tests/functional2/lang/nul_bytes_parsers/test.toml |  11 +++++++++++
 13 files changed, 19 insertions(+)
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-key.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-value.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-key.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-value.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-key.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-value.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-key.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-value.out.exp
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/in-fromJSON-key.nix
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/in-fromJSON-value.nix
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/in-fromTOML-key.nix
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/in-fromTOML-value.nix
 create mode 100644 tests/functional2/lang/nul_bytes_parsers/test.toml

diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-key.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-key.out.exp
new file mode 100644
index 0000000000000000000000000000000000000000..88878fa0aa872f5b5cc84e246529fc364e8b1701
GIT binary patch
literal 15
Wcmb<cP)cM-Qc|#0Ftk>v<pKa300T1s

literal 0
HcmV?d00001

diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-value.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-value.out.exp
new file mode 100644
index 000000000..231f150c5
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromJSON-value.out.exp
@@ -0,0 +1 @@
+"a"
diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-key.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-key.out.exp
new file mode 100644
index 0000000000000000000000000000000000000000..88878fa0aa872f5b5cc84e246529fc364e8b1701
GIT binary patch
literal 15
Wcmb<cP)cM-Qc|#0Ftk>v<pKa300T1s

literal 0
HcmV?d00001

diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-value.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-value.out.exp
new file mode 100644
index 000000000..01cdaa278
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/eval-allow-depr-fromTOML-value.out.exp
@@ -0,0 +1 @@
+{ k = "a"; }
diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-key.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-key.out.exp
new file mode 100644
index 0000000000000000000000000000000000000000..88878fa0aa872f5b5cc84e246529fc364e8b1701
GIT binary patch
literal 15
Wcmb<cP)cM-Qc|#0Ftk>v<pKa300T1s

literal 0
HcmV?d00001

diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-value.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-value.out.exp
new file mode 100644
index 000000000..231f150c5
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromJSON-value.out.exp
@@ -0,0 +1 @@
+"a"
diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-key.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-key.out.exp
new file mode 100644
index 0000000000000000000000000000000000000000..88878fa0aa872f5b5cc84e246529fc364e8b1701
GIT binary patch
literal 15
Wcmb<cP)cM-Qc|#0Ftk>v<pKa300T1s

literal 0
HcmV?d00001

diff --git a/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-value.out.exp b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-value.out.exp
new file mode 100644
index 000000000..01cdaa278
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/eval-depr-fromTOML-value.out.exp
@@ -0,0 +1 @@
+{ k = "a"; }
diff --git a/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-key.nix b/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-key.nix
new file mode 100644
index 000000000..ffaa6a97d
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-key.nix
@@ -0,0 +1 @@
+builtins.fromJSON ''{"a\u0000b": 1}''
diff --git a/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-value.nix b/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-value.nix
new file mode 100644
index 000000000..c71ab990d
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/in-fromJSON-value.nix
@@ -0,0 +1 @@
+builtins.fromJSON ''"a\u0000b"''
diff --git a/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-key.nix b/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-key.nix
new file mode 100644
index 000000000..b622dc4dc
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-key.nix
@@ -0,0 +1 @@
+builtins.fromTOML ''"a\u0000b" = 1''
diff --git a/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-value.nix b/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-value.nix
new file mode 100644
index 000000000..183cab6b3
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/in-fromTOML-value.nix
@@ -0,0 +1 @@
+builtins.fromTOML ''k = "a\u0000b"''
diff --git a/tests/functional2/lang/nul_bytes_parsers/test.toml b/tests/functional2/lang/nul_bytes_parsers/test.toml
new file mode 100644
index 000000000..14dabfd4e
--- /dev/null
+++ b/tests/functional2/lang/nul_bytes_parsers/test.toml
@@ -0,0 +1,11 @@
+[[test]]
+name = "eval-depr"
+matrix = true
+# FIXME: These should fail.
+runner = "eval-okay"
+
+[[test]]
+name = "eval-allow-depr"
+matrix = true
+runner = "eval-okay"
+flags = ["--extra-deprecated-features", "nul-bytes"]