nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-13 20:41:04 +01:00
Code Activity

daemon.cc: Clean up PeerInfo by using std::optional

Browse source
This commit is contained in:
Eelco Dolstra 2025-12-05 23:29:42 +01:00
parent 0db70b8184
commit 5d7f6efc82
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/nix/unix/daemon.cc
View file

@ -198,12 +198,9 @@ static bool matchUser(const std::string & user, const std::string & group, const
struct PeerInfo struct PeerInfo
{ {
bool pidKnown; std::optional<pid_t> pid;
pid_t pid; std::optional<uid_t> uid;
bool uidKnown; std::optional<gid_t> gid;
uid_t uid;
bool gidKnown;
gid_t gid;
}; };
/** /**
@ -211,7 +208,7 @@ struct PeerInfo
*/ */
static PeerInfo getPeerInfo(int remote) static PeerInfo getPeerInfo(int remote)
{ {
PeerInfo peer = {false, 0, false, 0, false, 0}; PeerInfo peer;
#if defined(SO_PEERCRED) #if defined(SO_PEERCRED)
@ -221,9 +218,11 @@ static PeerInfo getPeerInfo(int remote)
ucred cred; ucred cred;
# endif # endif
socklen_t credLen = sizeof(cred); socklen_t credLen = sizeof(cred);
if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == -1) if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == 0) {
throw SysError("getting peer credentials"); peer.pid = cred.pid;
peer = {true, cred.pid, true, cred.uid, true, cred.gid}; peer.uid = cred.uid;
peer.gid = cred.gid;
}
#elif defined(LOCAL_PEERCRED) #elif defined(LOCAL_PEERCRED)
@ -233,9 +232,8 @@ static PeerInfo getPeerInfo(int remote)
xucred cred; xucred cred;
socklen_t credLen = sizeof(cred); socklen_t credLen = sizeof(cred);
if (getsockopt(remote, SOL_LOCAL, LOCAL_PEERCRED, &cred, &credLen) == -1) if (getsockopt(remote, SOL_LOCAL, LOCAL_PEERCRED, &cred, &credLen) == 0)
throw SysError("getting peer credentials"); peer.uid = cred.cr_uid;
peer = {false, 0, true, cred.cr_uid, false, 0};
#endif #endif
@ -270,11 +268,11 @@ static std::pair<TrustedFlag, std::string> authPeer(const PeerInfo & peer)
{ {
TrustedFlag trusted = NotTrusted; TrustedFlag trusted = NotTrusted;
struct passwd * pw = peer.uidKnown ? getpwuid(peer.uid) : 0; auto pw = peer.uid ? getpwuid(*peer.uid) : nullptr;
std::string user = pw ? pw->pw_name : std::to_string(peer.uid); std::string user = pw ? pw->pw_name : peer.uid ? std::to_string(*peer.uid) : "";
struct group * gr = peer.gidKnown ? getgrgid(peer.gid) : 0; auto gr = peer.gid ? getgrgid(*peer.gid) : 0;
std::string group = gr ? gr->gr_name : std::to_string(peer.gid); std::string group = gr ? gr->gr_name : peer.gid ? std::to_string(*peer.gid) : "";
const Strings & trustedUsers = authorizationSettings.trustedUsers; const Strings & trustedUsers = authorizationSettings.trustedUsers;
const Strings & allowedUsers = authorizationSettings.allowedUsers; const Strings & allowedUsers = authorizationSettings.allowedUsers;
@ -360,9 +358,9 @@ static void daemonLoop(std::optional<TrustedFlag> forceTrustClientOpt)
unix::closeOnExec(remote.get()); unix::closeOnExec(remote.get());
PeerInfo peer{.pidKnown = false}; PeerInfo peer;
TrustedFlag trusted; TrustedFlag trusted;
std::string user; std::string user = "<unknown>";
if (forceTrustClientOpt) if (forceTrustClientOpt)
trusted = *forceTrustClientOpt; trusted = *forceTrustClientOpt;
@ -375,8 +373,8 @@ static void daemonLoop(std::optional<TrustedFlag> forceTrustClientOpt)
printInfo( printInfo(
(std::string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : ""), (std::string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : ""),
peer.pidKnown ? std::to_string(peer.pid) : "<unknown>", peer.pid ? std::to_string(*peer.pid) : "<unknown>",
peer.uidKnown ? user : "<unknown>"); user);
// Fork a child to handle the connection. // Fork a child to handle the connection.
ProcessOptions options; ProcessOptions options;
@ -396,8 +394,8 @@ static void daemonLoop(std::optional<TrustedFlag> forceTrustClientOpt)
setSigChldAction(false); setSigChldAction(false);
// For debugging, stuff the pid into argv[1]. // For debugging, stuff the pid into argv[1].
if (peer.pidKnown && savedArgv[1]) { if (peer.pid && savedArgv[1]) {
auto processName = std::to_string(peer.pid); auto processName = std::to_string(*peer.pid);
strncpy(savedArgv[1], processName.c_str(), strlen(savedArgv[1])); strncpy(savedArgv[1], processName.c_str(), strlen(savedArgv[1]));
} }