[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: daemon: Require a signature for imports made by root.
From: |
Ludovic Courtès |
Subject: |
03/03: daemon: Require a signature for imports made by root. |
Date: |
Thu, 27 Aug 2015 09:08:47 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit ef80ca96faeee8d2a07cf87813ddf8fb0c18d700
Author: Ludovic Courtès <address@hidden>
Date: Thu Aug 27 10:58:31 2015 +0200
daemon: Require a signature for imports made by root.
This reinstates commit aa0f8409, which was inadvertently undone in commit
322eeb87.
Running 'guix archive --import' as root would have let corrupt or
unauthentic
store items through.
Reported by Eric Hanchrow <address@hidden>
at <http://bugs.gnu.org/21354>.
* nix/nix-daemon/nix-daemon.cc (performOp) <wopImportPaths>: Pass true as
the
first argument to 'importPaths'.
---
nix/nix-daemon/nix-daemon.cc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index 2b89190..10159db 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -440,7 +440,10 @@ static void performOp(bool trusted, unsigned int
clientVersion,
case wopImportPaths: {
startWork();
TunnelSource source(from);
- Paths paths = store->importPaths(!trusted, source);
+
+ /* Unlike Nix, always require a signature, even for "trusted"
+ users. */
+ Paths paths = store->importPaths(true, source);
stopWork();
writeStrings(paths, to);
break;