From 5fbb1286d07516de9ba1b44a2d53e73c147e34b0 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Fri, 16 Oct 2026 09:43:46 +0200
Subject: [PATCH] fix: refuse a manifest hash the scan contradicts

---
 scripts/generate_pack.py         | 40 +++++++++++++++++++++++++++++++-
 tests/test_install_experience.py | 21 +++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/scripts/generate_pack.py b/scripts/generate_pack.py
index 345306a9..4cbe9ab0 100644
--- a/scripts/generate_pack.py
+++ b/scripts/generate_pack.py
@@ -3089,6 +3089,44 @@ def _get_repo_path(sha1: str, db: dict) -> str:
     return entry.get("path", "")
 
 
+# The database the index was built from, held so its identity stays its own.
+_DB_SHA1_BY_PATH: list[tuple[dict, dict[str, str]]] = []
+
+
+def _db_sha1_by_path(db: dict) -> dict[str, str]:
+    """Path -> sha1 of the database, built once per database."""
+    if _DB_SHA1_BY_PATH and _DB_SHA1_BY_PATH[0][0] is db:
+        return _DB_SHA1_BY_PATH[0][1]
+    index = {
+        os.path.normpath(entry["path"]): sha1
+        for sha1, entry in db.get("files", {}).items()
+        if entry.get("path")
+    }
+    _DB_SHA1_BY_PATH[:] = [(db, index)]
+    return index
+
+
+def _stable_hashes(local_path: str, db: dict) -> dict:
+    """The file's hashes, held against the scan that built the database.
+
+    A manifest entry is what every installer downloads and checks against.
+    Under load this host has hashed a 252 MB DSi NAND to a sha1 no file
+    holds, twice and the same way, so recomputing alone proves nothing: the
+    database scanned the same path, and a manifest that disagrees with it is
+    refused rather than published.
+    """
+    expected = _db_sha1_by_path(db).get(os.path.normpath(local_path))
+    hashes = compute_hashes(local_path)
+    for _attempt in range(2):
+        if expected is None or hashes["sha1"] == expected:
+            return hashes
+        hashes = compute_hashes(local_path)
+    raise RuntimeError(
+        f"{local_path}: sha1 {hashes['sha1']} contradicts the database scan "
+        f"({expected}); rehash the file or regenerate database.json"
+    )
+
+
 def _manifest_entry(
     local_path: str | None,
     dest: str,
@@ -3113,7 +3151,7 @@ def _manifest_entry(
     file_size = 0
     if local_path and os.path.exists(local_path):
         file_size = os.path.getsize(local_path)
-        hashes = compute_hashes(local_path)
+        hashes = _stable_hashes(local_path, db)
         sha1 = hashes["sha1"]
         sha256 = hashes["sha256"]
     repo_path = _get_repo_path(sha1, db) if sha1 else ""
diff --git a/tests/test_install_experience.py b/tests/test_install_experience.py
index 6e665388..5e48d14e 100644
--- a/tests/test_install_experience.py
+++ b/tests/test_install_experience.py
@@ -120,6 +120,27 @@ class LargeFilesResume(unittest.TestCase):
             self.assertEqual(_RangeHandler.ranges, [""])
 
 
+class ManifestHashesMatchTheScan(unittest.TestCase):
+    """A manifest entry's sha1 is checked against the database scan of the
+    same path: under load this host hashed a 252 MB DSi NAND to a sha1 no
+    file holds, the same wrong value in two runs."""
+
+    def test_a_contradicted_hash_is_refused(self):
+        sys.path.insert(0, str(REPO_ROOT / "scripts"))
+        import generate_pack
+
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "nand.bin"
+            path.write_bytes(b"real")
+            real = hashlib.sha1(b"real").hexdigest()
+            good = {"files": {real: {"path": str(path)}}}
+            self.assertEqual(generate_pack._stable_hashes(str(path), good)["sha1"], real)
+            bad = {"files": {"0" * 40: {"path": str(path)}}}
+            with self.assertRaises(RuntimeError):
+                generate_pack._stable_hashes(str(path), bad)
+            self.assertEqual(generate_pack._stable_hashes(str(path), {"files": {}})["sha1"], real)
+
+
 class RetriesWait(unittest.TestCase):
     def test_a_server_error_is_retried_after_the_delay_it_asks(self):
         with _Server(), tempfile.TemporaryDirectory() as tmp: