MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #70137 from michaelpj/fix-pam-variable-subst

Browse source 
nixos/system-environment: fix variable substitution
This commit is contained in:
worldofpeace 2019-10-02 01:20:28 +00:00 committed by GitHub
commit 49bc1bf44a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nixos/modules/config/system-environment.nix
View file

@ -8,11 +8,6 @@ let
cfg = config.environment; cfg = config.environment;
pamProfiles =
map
(replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"])
cfg.profiles;
in in
{ {
@ -75,13 +70,20 @@ in
let let
suffixedVariables = suffixedVariables =
flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes:
flip concatMap pamProfiles (profile: flip concatMap cfg.profiles (profile:
map (suffix: "${profile}${suffix}") suffixes map (suffix: "${profile}${suffix}") suffixes
) )
); );
# We're trying to use the same syntax for PAM variables and env variables.
# That means we need to map the env variables that people might use to their
# equivalent PAM variable.
# Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have
# different syntax.
replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
pamVariable = n: v: pamVariable = n: v:
''${n} DEFAULT="${concatStringsSep ":" (toList v)}"''; ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
pamVariables = pamVariables =
concatStringsSep "\n" concatStringsSep "\n"