daemon: Remove ‘requireSignature’ argument to ‘importPath’.

In ‘guix-daemon’ the value of ‘requireSignature’ has always been true.

* nix/libstore/local-store.hh (LocalStore)[importPath]: Remove
‘requireSignature’ argument.
* nix/libstore/local-store.cc (LocalStore::importPath): Adjust accordingly.

Change-Id: I4e2d781c85107770cb64ab71d2e7fb711859e0c7
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

2 files changed, 13 insertions, 18 deletions

diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 3bb96e32601..46ce649fb0b 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -1323,7 +1323,7 @@ Path LocalStore::createTempDirInStore()
 }
 
 
-Path LocalStore::importPath(bool requireSignature, Source & source)
+Path LocalStore::importPath(Source & source)
 {
     HashAndReadSource hashAndReadSource(source);
 
@@ -1356,25 +1356,20 @@ Path LocalStore::importPath(bool requireSignature, Source & source)
 
     bool haveSignature = readInt(hashAndReadSource) == 1;
 
-    if (requireSignature && !haveSignature)
+    if (!haveSignature)
         throw Error(std::format("imported archive of `{}' lacks a signature", dstPath));
 
-    if (haveSignature) {
-        string signature = readString(hashAndReadSource);
+    string signature = readString(hashAndReadSource);
+    string hash2 = verifySignature(signature);
 
-        if (requireSignature) {
-            string hash2 = verifySignature(signature);
+    /* Note: runProgram() throws an exception if the signature
+       is invalid. */
 
-            /* Note: runProgram() throws an exception if the signature
-               is invalid. */
-
-            if (printHash(hash) != hash2)
-                throw Error(
-                    "signed hash doesn't match actual contents of imported "
-                    "archive; archive could be corrupt, or someone is trying "
-                    "to import a Trojan horse");
-        }
-    }
+    if (printHash(hash) != hash2)
+        throw Error(
+            "signed hash doesn't match actual contents of imported "
+            "archive; archive could be corrupt, or someone is trying "
+            "to import a Trojan horse");
 
     /* Do the actual import. */
 
@@ -1431,7 +1426,7 @@ Paths LocalStore::importPaths(Source & source)
         unsigned long long n = readLongLong(source);
         if (n == 0) break;
         if (n != 1) throw Error("input doesn't look like something created by `nix-store --export'");
-        res.push_back(importPath(true, source));
+        res.push_back(importPath(source));
     }
     return res;
 }
diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh
index 754cdf5ad31..6a0def7412e 100644
--- a/nix/libstore/local-store.hh
+++ b/nix/libstore/local-store.hh
@@ -257,7 +257,7 @@ private:
 
     Path createTempDirInStore();
 
-    Path importPath(bool requireSignature, Source & source);
+    Path importPath(Source & source);
 
     void checkDerivationOutputs(const Path & drvPath, const Derivation & drv);