From f9b3defe7f1a25f9def3e0744443e01dd2dc90a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 16:41:15 +0200
Subject: [PATCH] Add test case for NARs with duplicate directory entries

This test was made by @puckipedia.

(cherry picked from commit 83d5b32803e5b828967a27b1ea93c5728d3a4d0a)
---
 tests/functional/case-hack.sh  |  21 ---------------------
 tests/functional/duplicate.nar | Bin 0 -> 1400 bytes
 tests/functional/local.mk      |   2 +-
 tests/functional/nars.sh       |  23 +++++++++++++++++++++++
 4 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100755 tests/functional/case-hack.sh
 create mode 100644 tests/functional/duplicate.nar
 create mode 100755 tests/functional/nars.sh

diff --git a/tests/functional/case-hack.sh b/tests/functional/case-hack.sh
deleted file mode 100755
index fbc8242ff..000000000
--- a/tests/functional/case-hack.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-source common.sh
-
-clearStore
-
-rm -rf $TEST_ROOT/case
-
-opts="--option use-case-hack true"
-
-# Check whether restoring and dumping a NAR that contains case
-# collisions is round-tripping, even on a case-insensitive system.
-nix-store $opts  --restore $TEST_ROOT/case < case.nar
-nix-store $opts --dump $TEST_ROOT/case > $TEST_ROOT/case.nar
-cmp case.nar $TEST_ROOT/case.nar
-[ "$(nix-hash $opts --type sha256 $TEST_ROOT/case)" = "$(nix-hash --flat --type sha256 case.nar)" ]
-
-# Check whether we detect true collisions (e.g. those remaining after
-# removal of the suffix).
-touch "$TEST_ROOT/case/xt_CONNMARK.h~nix~case~hack~3"
-(! nix-store $opts --dump $TEST_ROOT/case > /dev/null)
diff --git a/tests/functional/duplicate.nar b/tests/functional/duplicate.nar
new file mode 100644
index 0000000000000000000000000000000000000000..1d0993ed4cab41a6d45907ac0c17026afd5471a2
GIT binary patch
literal 1400
zcmd;OfPlQr3f;t_<c!R+R9!;`1_nlmFoOn^W`WWrl?ACFCMSqsU|>keEJ{r-$uFve
z@>!vDYF-Ig43{~1iMe2NVDgDjeK33S@>5Xcak+yXs;{^*HzzYMn}H3=FG(y)Pc1?C
zLmw&*vriKTpWg1LRyZ<4{Zmw$2WF8Pj?{7oAJ}#VhUC(sqSU++-QvpPlGI!VhJkVq
z6VyG$<q*a|xdRqINtpv1KQRC2rsjh~1jZ*dzZIpXm*ylEF>pbGl_9kvHMz7TF)0U}
zYoUS+3=AAlW^#UBNorn6u{M;itf-%qnWtZz!Ihevk*}bxm6u<VnVedzP+Ft_Ni$js
Tq2-|pR>taJ9fb1jP?HA$OaFh_

literal 0
HcmV?d00001

diff --git a/tests/functional/local.mk b/tests/functional/local.mk
index b379eeefe..bdb47c2db 100644
--- a/tests/functional/local.mk
+++ b/tests/functional/local.mk
@@ -108,7 +108,7 @@ nix_tests = \
   derivation-json.sh \
   import-derivation.sh \
   nix_path.sh \
-  case-hack.sh \
+  nars.sh \
   placeholders.sh \
   ssh-relay.sh \
   build.sh \
diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
new file mode 100755
index 000000000..ba5a69bd2
--- /dev/null
+++ b/tests/functional/nars.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+source common.sh
+
+clearStore
+
+# Check that NARs with duplicate directory entries are rejected.
+rm -rf "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted"
+
+# Check whether restoring and dumping a NAR that contains case
+# collisions is round-tripping, even on a case-insensitive system.
+rm -rf "$TEST_ROOT/case"
+opts=("--option" "use-case-hack" "true")
+nix-store "${opts[@]}" --restore "$TEST_ROOT/case" < case.nar
+nix-store "${opts[@]}" --dump "$TEST_ROOT/case" > "$TEST_ROOT/case.nar"
+cmp case.nar "$TEST_ROOT/case.nar"
+[ "$(nix-hash "${opts[@]}" --type sha256 "$TEST_ROOT/case")" = "$(nix-hash --flat --type sha256 case.nar)" ]
+
+# Check whether we detect true collisions (e.g. those remaining after
+# removal of the suffix).
+touch "$TEST_ROOT/case/xt_CONNMARK.h~nix~case~hack~3"
+(! nix-store $opts --dump $TEST_ROOT/case > /dev/null)