From 0207272b28f1dad119b418dfafcfb18d22b6d3f6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Apr 2016 12:15:06 +0200 Subject: [PATCH] BinaryCacheStore: When adding a path, ensure the references are valid This prevents copying a partial closure to a binary cache. --- src/libstore/binary-cache-store.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 4445bfd27..93863b95f 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -50,6 +50,17 @@ Path BinaryCacheStore::narInfoFileFor(const Path & storePath) void BinaryCacheStore::addToCache(const ValidPathInfo & info, const string & nar) { + /* Verify that all references are valid. This may do some .narinfo + reads, but typically they'll already be cached. */ + for (auto & ref : info.references) + try { + if (ref != info.path) + queryPathInfo(ref); + } catch (InvalidPath &) { + throw Error(format("cannot add ā€˜%sā€™ to the binary cache because the reference ā€˜%sā€™ is not valid") + % info.path % ref); + } + auto narInfoFile = narInfoFileFor(info.path); if (fileExists(narInfoFile)) return;