nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix-daemon: Disable garbage collection for remote connections. 

* nix/nix-daemon/nix-daemon.cc (isRemoteConnection): New variable.
  (performOp): For wopCollectGarbage, throw an error when isRemoteConnection
  is set.
  (acceptConnection): Set isRemoteConnection when connection is not AF_UNIX.
* tests/guix-daemon.sh: Add a test for the new behavior.
This commit is contained in:
Roel Janssen 2018-04-19 17:11:30 +02:00
parent 7c16af4646
commit 5cefb13ddd
No known key found for this signature in database
GPG Key ID: C3EC1DCA843072E1
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nix/nix-daemon/nix-daemon.cc
View File

@ -54,7 +54,9 @@ static FdSink to(STDOUT_FILENO);
bool canSendStderr; bool canSendStderr;
/* This variable is used to keep track of whether a connection
comes from a host other than the host running guix-daemon. */
static bool isRemoteConnection;
/* This function is called anytime we want to write something to /* This function is called anytime we want to write something to
stderr. If we're in a state where the protocol allows it (i.e., stderr. If we're in a state where the protocol allows it (i.e.,
@ -529,6 +531,11 @@ static void performOp(bool trusted, unsigned int clientVersion,
} }
case wopCollectGarbage: { case wopCollectGarbage: {
if (isRemoteConnection) {
throw Error("Garbage collection is disabled for remote hosts.");
break;
}
GCOptions options; GCOptions options;
options.action = (GCOptions::GCAction) readInt(from); options.action = (GCOptions::GCAction) readInt(from);
options.pathsToDelete = readStorePaths<PathSet>(from); options.pathsToDelete = readStorePaths<PathSet>(from);
@ -934,6 +941,7 @@ static void acceptConnection(int fdSocket)
connection. Setting these to -1 means: do not change. */ connection. Setting these to -1 means: do not change. */
settings.clientUid = clientUid; settings.clientUid = clientUid;
settings.clientGid = clientGid; settings.clientGid = clientGid;
isRemoteConnection = (remoteAddr.ss_family != AF_UNIX);
/* Handle the connection. */ /* Handle the connection. */
from.fd = remote; from.fd = remote;

14
tests/guix-daemon.sh
View File

@ -194,6 +194,20 @@ do
kill "$daemon_pid" kill "$daemon_pid"
done done
# Make sure garbage collection from a TCP connection does not work.
tcp_socket="127.0.0.1:9999"
guix-daemon --listen="$tcp_socket" &
daemon_pid=$!
GUIX_DAEMON_SOCKET="guix://$tcp_socket"
export GUIX_DAEMON_SOCKET
if guix gc; then false; else true; fi
unset GUIX_DAEMON_SOCKET
kill "$daemon_pid"
# Log compression. # Log compression.
guix-daemon --listen="$socket" --disable-chroot --debug --log-compression=gzip & guix-daemon --listen="$socket" --disable-chroot --debug --log-compression=gzip &