diff options
author | nicoo <nicoo@mur.at> | 2023-09-07 12:46:04 +0000 |
---|---|---|
committer | nicoo <nicoo@mur.at> | 2023-11-08 19:41:39 +0000 |
commit | 93011e31bddcd11765eff62defb796cc2d373acb (patch) | |
tree | 3303e90570244ac4bcba34dcfc649039ad70979f | |
parent | 097115485a06318e17d1298bd2c231e4fe0f267c (diff) | |
download | nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar.gz nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar.bz2 nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar.lz nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar.xz nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.tar.zst nixpkgs-93011e31bddcd11765eff62defb796cc2d373acb.zip |
nixos/sudo: Handle `root`'s default rule through `extraRules`
This makes things more uniform; moreover, users can now inject rules before this.
-rw-r--r-- | nixos/modules/security/sudo.nix | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 9ba0f284970..aab5213d6dc 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -182,36 +182,43 @@ in message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } ]; - # We `mkOrder 600` so that the default rule shows up first, but there is - # still enough room for a user to `mkBefore` it. - security.sudo.extraRules = mkOrder 600 [ - { groups = [ "wheel" ]; - commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; - } - ]; + security.sudo.extraRules = + let + defaultRule = { users ? [], groups ? [], opts ? [] }: [ { + inherit users groups; + commands = [ { + command = "ALL"; + options = opts ++ [ "SETENV" ]; + } ]; + } ]; + in mkMerge [ + # This is ordered before users' `mkBefore` rules, + # so as not to introduce unexpected changes. + (mkOrder 400 (defaultRule { users = [ "root" ]; })) + + # This is ordered to show before (most) other rules, but + # late-enough for a user to `mkBefore` it. + (mkOrder 600 (defaultRule { + groups = [ "wheel" ]; + opts = (optional (!cfg.wheelNeedsPassword) "NOPASSWD"); + })) + ]; security.sudo.configFile = concatStringsSep "\n" (filter (s: s != "") [ '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ # or ‘security.sudo.extraRules’ instead. '' - '' - # "root" is allowed to do anything. - root ALL=(ALL:ALL) SETENV: ALL - '' - (optionalString (cfg.extraRules != []) '' - # extraRules - ${concatStringsSep "\n" ( - lists.flatten ( - map ( - rule: optionals (length rule.commands != 0) [ - (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) - (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) - ] - ) cfg.extraRules - ) - )} - '') + (concatStringsSep "\n" ( + lists.flatten ( + map ( + rule: optionals (length rule.commands != 0) [ + (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) + (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) + ] + ) cfg.extraRules + ) + ) + "\n") (optionalString (cfg.extraConfig != "") '' # extraConfig ${cfg.extraConfig} |