Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support to other privilege elevation programs. #92

Conversation

henriquekirchheck
Copy link

This pr adds support for both doas and pkexec, while keeping support for sudo.

For this to work, I decided that the cleanest way to implement this was by adding a extra parameter to the Command struct that specifies if the command should be ran as root or not. When the root parameter is set, it checks for the existence of doas, sudo, and pkexec, in that order, and uses it to run the command by prefixing the command invocation arguments with the respective program when it is constructed.

The specified order was chosen because I believe that if someone has doas installed in their system, it's more likely that they use it as their main privilege escalation program. ´pkexec´ was added more as a fallback in case someone doesn't have doas or sudo.

This was tested in my NixOS Unstable system with both sudo and doas, but I haven't tested pkexec personally.

@henriquekirchheck
Copy link
Author

Forgot to mention that it will Fix #59, but it still uses sudo argv[..]

@Makesesama
Copy link

Makesesama commented Apr 26, 2024

I also tested on NixOs Unstable with doas installed. Works fine for me.

edit: Ok i also tried to clean, which still doesnt work with doas and this pr. Cleaning calls self_elevate which still uses sudo.

@henriquekirchheck
Copy link
Author

I'll look into the clean command and fix it

@henriquekirchheck
Copy link
Author

Seems like the self elevate function is only using sudo but I should be able to just replace it with my get_elevation_program function.

@Makesesama If you could test it I would be very grateful.

@henriquekirchheck henriquekirchheck changed the title Add support to other privilege elevation programs. fix: support to other privilege elevation programs. Apr 27, 2024
@Makesesama
Copy link

Seems to work now

@henriquekirchheck
Copy link
Author

Thank you!

@arthsmn
Copy link

arthsmn commented May 4, 2024

You might also be interested in adding run0 support.

Related post: https://mastodon.social/@pid_eins/112353324518585654

@henriquekirchheck
Copy link
Author

systemd is currently at version 255.4 in NixOS unstable so I'll refrain to add it until it is actually released, but I'll look into it when it is available

src/util.rs Show resolved Hide resolved
@boomshroom
Copy link

boomshroom commented Jun 10, 2024

An alternative is to allow for some way for the user to specify what privilege escalator to use. This would be easier if nh had a config file though.

This would allow for forcing pkexec even if sudo is present, or using run0 (or its predecessor systemd-run) without needing to update nh to support it. And of course it would be ideal in such a scenario to be able to include extra arguments in case the user had particular needs (would be necessary for systemd-run since it doesn't pass through stdio without either -t or -P).

@deviantsemicolon
Copy link

Now that systemd v256 is out and currently being reviewed for eventual merging into nixpkgs, will this be updated to add support for run0

@henriquekirchheck
Copy link
Author

I'll update everything with the suggestions, thank you!

@henriquekirchheck
Copy link
Author

I guess I could add run0 to the list of automatically checked programs, because even if it isn't released yet in nixpkgs unstable it should be fine for people that don't have it because it will just be ignored by the checks.

Now I'm not sure where in that list it should be included, considering that it will be installed in every systemd based system, I think it should be low in the list, maybe above pkexec. I'm open for second opinions.

Also, it should probably check for a environment variable to determine what to do for convenience, just like nh already does with the FLAKE environment variable, but I don't know of any standard environment variable names that specify that.

@henriquekirchheck
Copy link
Author

henriquekirchheck commented Jun 30, 2024

@boomshroom

And of course it would be ideal in such a scenario to be able to include extra arguments in case the user had particular needs (would be necessary for systemd-run since it doesn't pass through stdio without either -t or -P).

Any ideas on how that would look like in the command line? I added a way to specify a custom privilege elevation binary to use, but I cannot think of a way to add the extra command line arguments. Maybe another flag would work, but that seems messy to me.

A config file would be optimal, both for the FLAKE environment variable and the custom privilege elevation program, but I'd probably wait for @viperML to comment on what he wants to do.

@deviantsemicolon
Copy link

deviantsemicolon commented Jul 26, 2024

Systemd 256 was merged into staging-next and should be in master and unstable very soon. I would appreciate run0 support

@henriquekirchheck
Copy link
Author

@deviantsemicolon run0 support was already added! Testing would be appreciated.

@deviantsemicolon
Copy link

deviantsemicolon commented Jul 27, 2024

@deviantsemicolon run0 support was already added! Testing would be appreciated.

If the nixpkgs maintainers ever get around to merging the next staging-next thing, where the systemd 256 PR is, into master, then I might be able to see what I can do

Copy link

@deviantsemicolon deviantsemicolon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@henriquekirchheck i disabled sudo and ran nix run to test your code. I got an error regarding setting a locale and it asked me to reauthenticate a few times, but that could be a nix run issue. not sure though. Other than that, it did use run0 as expected, so LGTM

the error basically said it couldn't set a locale and fell back to a standard one called "C"

@henriquekirchheck
Copy link
Author

@deviantsemicolon this issue is normally related to localization, and considering my code is basically just calling a different program it doesn't feel related. I'm not currently able to test it myself, but I'll try to do it asap.

@calebstewart
Copy link

calebstewart commented Aug 4, 2024

I'm also getting the localization warnings mentioned above. My best guess is it's related to the environment differences w/ run0 which exposes little to nothing of the calling environment to the subprocess. To be a bit more clear, I'll add the exact warnings I'm getting below. They are warnings from Perl, but they don't appear to be causing any actual problems. The build and install appears to have worked properly.

The only real issue I see is that w/ run0, there is no cached authentication, so you are prompted 3 times during a run of nh os switch with run0. :/

❯ nh os switch -e run0
> Building NixOS configuration
warning: Git tree '/home/caleb/git/nix' is dirty
warning: input 'nixos-hardware' has an override for a non-existent input 'nixpkgs'
Finished at 12:37:43 after 0s
> Comparing changes
<<< /run/current-system
>>> /tmp/nh-os-nuyqlh/result
No version or selection state changes.
Closure size: 2610 -> 2610 (0 paths added, 0 paths removed, delta +0, disk usage +0B).
> Activating configuration
perl: warning: Setting locale failed.
perl: warning: Please check that your locale settings:
	LANGUAGE = (unset),
	LC_ALL = (unset),
	LANG = "en_US.UTF-8"
    are supported and installed on your system.
perl: warning: Falling back to the standard locale ("C").
activating the configuration...
setting up /etc...
reloading user units for caleb...
restarting sysinit-reactivation.target
> Adding configuration to bootloader
perl: warning: Setting locale failed.
perl: warning: Please check that your locale settings:
	LANGUAGE = (unset),
	LC_ALL = (unset),
	LANG = "en_US.UTF-8"
    are supported and installed on your system.
perl: warning: Falling back to the standard locale ("C").

On the positive side, the automatic coloring of output from the elevated subprocesses from run0 is pretty nifty. It's really easy to see what logs are from elevated sections.

image

Update

Yeah, run0 does not pass LOCALE_ARCHIVE through to the elevated process by default, but does pass LANG. Not strictly an nh problem necessarily, but could be solved by adding a way to pass arguments to the run0 command (e.g. adding --setenv=LOCALE_ARCHIVE).

image

I've verified this by writing a quick script:

#!/bin/sh

exec run0 --setenv=LOCALE_ARCHIVE $@

And then using that as the elevation provider:

❯ nh os switch -e "$(pwd)/test.sh"
> Building NixOS configuration
warning: Git tree '/home/caleb/git/nix' is dirty
warning: input 'nixos-hardware' has an override for a non-existent input 'nixpkgs'
Finished at 13:05:07 after 0s
> Comparing changes
<<< /run/current-system
>>> /tmp/nh-os-zOvtIc/result
No version or selection state changes.
Closure size: 2610 -> 2610 (0 paths added, 0 paths removed, delta +0, disk usage +0B).
> Activating configuration
activating the configuration...
setting up /etc...
reloading user units for caleb...
restarting sysinit-reactivation.target
the following new units were started: libvirtd.service
> Adding configuration to bootloader

Update 2

Installing the following in Home Manager home.packages will take precedence over the system-wide run0 binary in the path, and allow you to globally add arguments to run0. So, this works for me since LOCALE_ARCHIVE seems like a sane thing to add to the environment.

run0Wrapper = pkgs.writeShellScriptBin "run0" ''
  exec ${pkgs.systemd}/bin/run0 --setenv=LOCALE_ARCHIVE $@
'';

@viperML
Copy link
Owner

viperML commented Sep 5, 2024

You can use any elevation program with run0 nh os switch -R, and a cleaner abstraction of --use-remote-sudo will be implemented in #107

@viperML viperML closed this Sep 5, 2024
@deviantsemicolon
Copy link

You can use any elevation program with run0 nh os switch -R, and a cleaner abstraction of --use-remote-sudo will be implemented in #107

I would like the ability to set a default in settings so I don't need to type run0 and -R everytime.

It also does not work on my system, and outputs an error saying it can't find the NixOS configuration, even when specifying the directory my flake is in.

@viperML
Copy link
Owner

viperML commented Sep 11, 2024

Please send the actual log with --verbose

@deviantsemicolon
Copy link

Please send the actual log with --verbose

TRACE nh::logging:86: Logging OK
DEBUG nh:22: args=NHParser { verbose: true, command: Os(OsArgs { action: Switch(OsRebuildArgs { common: CommonRebuildArgs { dry: false, ask: false, flakeref: FlakeRef("./flake.nix"), update: false, no_nom: false, diff_provider: "nvd diff", out_link: None }, hostname: None, specialisation: None, no_specialisation: false, extra_args: [], bypass_root_check: true }) }) }
DEBUG nh:23: NH_VERSION=3.5.26
! Bypassing root check, now running nix as root @ src/nixos.rs:32
DEBUG nh::nixos:58: out_path=("/tmp/nh-osBMrumc/result", TempDir { path: "/tmp/nh-osBMrumc" })
> Building NixOS configuration
DEBUG nh::commands:136: cmd=Pipeline { nix build './flake.nix#nixosConfigurations.""nsa-laptop"".config.system.build.toplevel' --log-format internal-json --verbose --out-link /tmp/nh-osBMrumc/result | nom --json }
Error:
   0: Building NixOS configuration
   1: No such file or directory (os error 2)
   2: No such file or directory (os error 2)

Location:
   src/commands.rs:149

@deviantsemicolon
Copy link

this worked with the PR perfectly fine.

@henriquekirchheck
Copy link
Author

You can use any elevation program with run0 nh os switch -R, and a cleaner abstraction of --use-remote-sudo will be implemented in #107

I think that --use-remote-sudo is a better way to do this, so I don`t have any problems

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants