Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple

src/nix/daemon.cc

@@ -1,3 +1,5 @@
+///@file
+
 #include "command.hh"
 #include "shared.hh"
 #include "local-store.hh"
@@ -34,6 +36,19 @@
 using namespace nix;
 using namespace nix::daemon;
 
+/**
+ * Settings related to authenticating clients for the Nix daemon.
+ *
+ * For pipes we have little good information about the client side, but
+ * for Unix domain sockets we do. So currently these options implemented
+ * mandatory access control based on user names and group names (looked
+ * up and translated to UID/GIDs in the CLI process that runs the code
+ * in this file).
+ *
+ * No code outside of this file knows about these settings (this is not
+ * exposed in a header); all authentication and authorization happens in
+ * `daemon.cc`.
+ */
 struct AuthorizationSettings : Config {
 
     Setting<Strings> trustedUsers{
@@ -54,7 +69,9 @@ struct AuthorizationSettings : Config {
           > directories that are otherwise inacessible to them.
         )"};
 
-    /* ?Who we trust to use the daemon in safe ways */
+    /**
+     * Who we trust to use the daemon in safe ways
+     */
     Setting<Strings> allowedUsers{
         this, {"*"}, "allowed-users",
         R"(
@@ -112,8 +129,36 @@ static void setSigChldAction(bool autoReap)
         throw SysError("setting SIGCHLD handler");
 }
 
+/**
+ * @return Is the given user a member of this group?
+ *
+ * @param user User specified by username.
+ *
+ * @param group Group the user might be a member of.
+ */
+static bool matchUser(std::string_view user, const struct group & gr)
+{
+    for (char * * mem = gr.gr_mem; *mem; mem++)
+        if (user == std::string_view(*mem)) return true;
+    return false;
+}
 
-bool matchUser(const std::string & user, const std::string & group, const Strings & users)
+
+/**
+ * Does the given user (specified by user name and primary group name)
+ * match the given user/group whitelist?
+ *
+ * If the list allows all users: Yes.
+ *
+ * If the username is in the set: Yes.
+ *
+ * If the groupname is in the set: Yes.
+ *
+ * If the user is in another group which is in the set: yes.
+ *
+ * Otherwise: No.
+ */
+static bool matchUser(const std::string & user, const std::string & group, const Strings & users)
 {
     if (find(users.begin(), users.end(), "*") != users.end())
         return true;
@@ -126,8 +171,7 @@ bool matchUser(const std::string & user, const std::string & group, const String
             if (group == i.substr(1)) return true;
             struct group * gr = getgrnam(i.c_str() + 1);
             if (!gr) continue;
-            for (char * * mem = gr->gr_mem; *mem; mem++)
+            if (matchUser(user, *gr)) return true;
-                if (user == std::string(*mem)) return true;
         }
 
     return false;
@@ -145,7 +189,9 @@ struct PeerInfo
 };
 
 
-//  Get the identity of the caller, if possible.
+/**
+ * Get the identity of the caller, if possible.
+ */
 static PeerInfo getPeerInfo(int remote)
 {
     PeerInfo peer = { false, 0, false, 0, false, 0 };
@@ -179,6 +225,9 @@ static PeerInfo getPeerInfo(int remote)
 #define SD_LISTEN_FDS_START 3
 
 
+/**
+ * Open a store without a path info cache.
+ */
 static ref<Store> openUncachedStore()
 {
     Store::Params params; // FIXME: get params from somewhere
@@ -187,8 +236,49 @@ static ref<Store> openUncachedStore()
     return openStore(settings.storeUri, params);
 }
 
+/**
+ * Authenticate a potential client
+ *
+ * @param peer Information about other end of the connection, the client which
+ * wants to communicate with us.
+ *
+ * @return A pair of a `TrustedFlag`, whether the potential client is trusted,
+ * and the name of the user (useful for printing messages).
+ *
+ * If the potential client is not allowed to talk to us, we throw an `Error`.
+ */
+static std::pair<TrustedFlag, std::string> authPeer(const PeerInfo & peer)
+{
+    TrustedFlag trusted = NotTrusted;
 
-static void daemonLoop()
+    struct passwd * pw = peer.uidKnown ? getpwuid(peer.uid) : 0;
+    std::string user = pw ? pw->pw_name : std::to_string(peer.uid);
+
+    struct group * gr = peer.gidKnown ? getgrgid(peer.gid) : 0;
+    std::string group = gr ? gr->gr_name : std::to_string(peer.gid);
+
+    const Strings & trustedUsers = authorizationSettings.trustedUsers;
+    const Strings & allowedUsers = authorizationSettings.allowedUsers;
+
+    if (matchUser(user, group, trustedUsers))
+        trusted = Trusted;
+
+    if ((!trusted && !matchUser(user, group, allowedUsers)) || group == settings.buildUsersGroup)
+        throw Error("user '%1%' is not allowed to connect to the Nix daemon", user);
+
+    return { trusted, std::move(user) };
+}
+
+
+/**
+ * Run a server. The loop opens a socket and accepts new connections from that
+ * socket.
+ *
+ * @param trustClientOpt If present, force trusting or not trusted the client.
+ * Otherwise, decide based on the authentication settings and user credentials
+ * (from the unix domain socket).
+ */
+static void daemonLoop(std::optional<TrustedFlag> trustClientOpt)
 {
     if (chdir("/") == -1)
         throw SysError("cannot change current directory");
@@ -231,23 +321,18 @@ static void daemonLoop()
 
             closeOnExec(remote.get());
 
-            TrustedFlag trusted = NotTrusted;
+            PeerInfo peer { .pidKnown = false };
-            PeerInfo peer = getPeerInfo(remote.get());
+            TrustedFlag trusted;
+            std::string user;
 
-            struct passwd * pw = peer.uidKnown ? getpwuid(peer.uid) : 0;
+            if (trustClientOpt)
-            std::string user = pw ? pw->pw_name : std::to_string(peer.uid);
+                trusted = *trustClientOpt;
-
+            else {
-            struct group * gr = peer.gidKnown ? getgrgid(peer.gid) : 0;
+                peer = getPeerInfo(remote.get());
-            std::string group = gr ? gr->gr_name : std::to_string(peer.gid);
+                auto [_trusted, _user] = authPeer(peer);
-
+                trusted = _trusted;
-            Strings trustedUsers = authorizationSettings.trustedUsers;
+                user = _user;
-            Strings allowedUsers = authorizationSettings.allowedUsers;
+            };
-
-            if (matchUser(user, group, trustedUsers))
-                trusted = Trusted;
-
-            if ((!trusted && !matchUser(user, group, allowedUsers)) || group == settings.buildUsersGroup)
-                throw Error("user '%1%' is not allowed to connect to the Nix daemon", user);
 
             printInfo((std::string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : ""),
                 peer.pidKnown ? std::to_string(peer.pid) : "<unknown>",
@@ -294,17 +379,16 @@ static void daemonLoop()
     }
 }
 
-static void runDaemon(bool stdio, std::optional<TrustedFlag> isTrustedOpt = {})
+/**
-{
+ * Forward a standard IO connection to the given remote store.
-    auto ensureNoTrustedFlag = [&]() {
+ *
-        if (isTrustedOpt)
+ * We just act as a middleman blindly ferry output between the standard
-            throw Error("--trust and --no-trust flags are only for use with --stdio when this nix-daemon process is not proxying another");
+ * input/output and the remote store connection, not processing anything.
-    };
+ *
-
+ * Loops until standard input disconnects, or an error is encountered.
-    if (stdio) {
+ */
-        if (auto store = openUncachedStore().dynamic_pointer_cast<RemoteStore>()) {
+static void forwardStdioConnection(RemoteStore & store) {
-            ensureNoTrustedFlag();
+    auto conn = store.openConnectionWrapper();
-            auto conn = store->openConnectionWrapper();
     int from = conn->from.fd;
     int to = conn->to.fd;
 
@@ -331,26 +415,52 @@ static void runDaemon(bool stdio, std::optional<TrustedFlag> isTrustedOpt = {})
                 return;
         }
     }
-        } else {
+}
+
+/**
+ * Process a client connecting to us via standard input/output
+ *
+ * Unlike `forwardStdioConnection()` we do process commands ourselves in
+ * this case, not delegating to another daemon.
+ *
+ * @param trustClient Whether to trust the client. Forwarded directly to
+ * `processConnection()`.
+ */
+static void processStdioConnection(ref<Store> store, TrustedFlag trustClient)
+{
     FdSource from(STDIN_FILENO);
     FdSink to(STDOUT_FILENO);
-            /* Auth hook is empty because in this mode we blindly trust the
+    processConnection(store, from, to, trustClient, NotRecursive);
-               standard streams. Limiting access to those is explicitly
+}
-               not `nix-daemon`'s responsibility. */
+
-            auto isTrusted = isTrustedOpt.value_or(Trusted);
+/**
-            processConnection(openUncachedStore(), from, to, isTrusted, NotRecursive);
+ * Entry point shared between the new CLI `nix daemon` and old CLI
-        }
+ * `nix-daemon`.
-    } else {
+ */
-        ensureNoTrustedFlag();
+static void runDaemon(bool stdio, std::optional<TrustedFlag> trustClientOpt)
-        daemonLoop();
+{
-    }
+    if (stdio) {
+        auto store = openUncachedStore();
+
+        // If --force-untrusted is passed, we cannot forward the connection and
+        // must process it ourselves (before delegating to the next store) to
+        // force untrusting the client.
+        if (auto remoteStore = store.dynamic_pointer_cast<RemoteStore>(); remoteStore && (!trustClientOpt || *trustClientOpt != NotTrusted))
+            forwardStdioConnection(*remoteStore);
+        else
+            // `Trusted` is passed in the auto (no override case) because we
+            // cannot see who is on the other side of a plain pipe. Limiting
+            // access to those is explicitly not `nix-daemon`'s responsibility.
+            processStdioConnection(store, trustClientOpt.value_or(Trusted));
+    } else
+        daemonLoop(trustClientOpt);
 }
 
 static int main_nix_daemon(int argc, char * * argv)
 {
     {
         auto stdio = false;
-        std::optional<TrustedFlag> isTrustedOpt;
+        std::optional<TrustedFlag> isTrustedOpt = std::nullopt;
 
         parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
             if (*arg == "--daemon")
@@ -361,12 +471,15 @@ static int main_nix_daemon(int argc, char * * argv)
                 printVersion("nix-daemon");
             else if (*arg == "--stdio")
                 stdio = true;
-            else if (*arg == "--trust") {
+            else if (*arg == "--force-trusted") {
                 experimentalFeatureSettings.require(Xp::NixTesting);
                 isTrustedOpt = Trusted;
-            } else if (*arg == "--no-trust") {
+            } else if (*arg == "--force-untrusted") {
                 experimentalFeatureSettings.require(Xp::NixTesting);
                 isTrustedOpt = NotTrusted;
+            } else if (*arg == "--default-trust") {
+                experimentalFeatureSettings.require(Xp::NixTesting);
+                isTrustedOpt = std::nullopt;
             } else return false;
             return true;
         });
@@ -397,7 +510,7 @@ struct CmdDaemon : StoreCommand
 
     void run(ref<Store> store) override
     {
-        runDaemon(false);
+        runDaemon(false, std::nullopt);
     }
 };
 

tests/nix-daemon-untrusting.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec nix-daemon --no-trust "$@"
+exec nix-daemon --force-untrusted "$@"