max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 05:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

executePrivileged: support multiple privesc commands, support sudo

Browse source
This commit is contained in:
Max Headroom 2023-01-07 15:25:52 +01:00
parent d7e702b121
commit 8a11cfdda8
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nix/system.cc
View file

@ -34,13 +34,22 @@ using namespace nix;
void executePrivileged(std::string program, Strings args) { void executePrivileged(std::string program, Strings args) {
args.push_front(program); args.push_front(program);
auto exe = program; auto exe = program;
if(getuid() != 0) { auto privCmds = Strings {
args.push_front("doas"); "doas",
exe = "doas"; "sudo"
};
bool isRoot = getuid() == 0;
for (auto privCmd : privCmds) {
if(!isRoot) {
args.push_front(privCmd);
exe = privCmd;
}
execvp(exe.c_str(), stringsToCharPtrs(args).data());
if(!isRoot)
args.pop_front();
} }
execvp(exe.c_str(), stringsToCharPtrs(args).data());
throw SysError("unable to execute '%s'", exe); throw SysError("unable to execute privilege elevation helper (tried %s)", concatStringsSep(", ", privCmds));
} }
struct SystemCommand : InstallableCommand struct SystemCommand : InstallableCommand