mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

users: use lib.escapeShellArg for dscl paths

Browse source
This commit is contained in:
Michael Hoang 2024-10-22 10:08:41 +11:00
parent 7a3ec6459c
commit 8451125cf8
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/users/default.nix
View file

@ -95,45 +95,49 @@ in
system.activationScripts.groups.text = mkIf (cfg.knownGroups != []) '' system.activationScripts.groups.text = mkIf (cfg.knownGroups != []) ''
echo "setting up groups..." >&2 echo "setting up groups..." >&2
${concatMapStringsSep "\n" (v: '' ${concatMapStringsSep "\n" (v: let
dsclGroup = lib.escapeShellArg "/Groups/${v.name}";
in ''
${optionalString cfg.forceRecreate '' ${optionalString cfg.forceRecreate ''
g=$(dscl . -read '/Groups/${v.name}' PrimaryGroupID 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true
g=''${g#PrimaryGroupID: } g=''${g#PrimaryGroupID: }
if [[ "$g" -eq ${toString v.gid} ]]; then if [[ "$g" -eq ${toString v.gid} ]]; then
echo "deleting group ${v.name}..." >&2 echo "deleting group ${v.name}..." >&2
dscl . -delete '/Groups/${v.name}' 2> /dev/null dscl . -delete ${dsclGroup} 2> /dev/null
else else
echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2 echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2
fi fi
''} ''}
g=$(dscl . -read '/Groups/${v.name}' PrimaryGroupID 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true
g=''${g#PrimaryGroupID: } g=''${g#PrimaryGroupID: }
if [ -z "$g" ]; then if [ -z "$g" ]; then
echo "creating group ${v.name}..." >&2 echo "creating group ${v.name}..." >&2
dscl . -create '/Groups/${v.name}' PrimaryGroupID ${toString v.gid} dscl . -create ${dsclGroup} PrimaryGroupID ${toString v.gid}
dscl . -create '/Groups/${v.name}' RealName '${v.description}' dscl . -create ${dsclGroup} RealName '${v.description}'
g=${toString v.gid} g=${toString v.gid}
fi fi
if [ "$g" -eq ${toString v.gid} ]; then if [ "$g" -eq ${toString v.gid} ]; then
g=$(dscl . -read '/Groups/${v.name}' GroupMembership 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} GroupMembership 2> /dev/null) || true
if [ "$g" != 'GroupMembership: ${concatStringsSep " " v.members}' ]; then if [ "$g" != 'GroupMembership: ${concatStringsSep " " v.members}' ]; then
echo "updating group members ${v.name}..." >&2 echo "updating group members ${v.name}..." >&2
dscl . -create '/Groups/${v.name}' GroupMembership ${lib.escapeShellArgs v.members} dscl . -create ${dsclGroup} GroupMembership ${lib.escapeShellArgs v.members}
fi fi
else else
echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2 echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2
fi fi
'') createdGroups} '') createdGroups}
${concatMapStringsSep "\n" (name: '' ${concatMapStringsSep "\n" (name: let
g=$(dscl . -read '/Groups/${name}' PrimaryGroupID 2> /dev/null) || true dsclGroup = lib.escapeShellArg "/Groups/${name}";
in ''
g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true
g=''${g#PrimaryGroupID: } g=''${g#PrimaryGroupID: }
if [ -n "$g" ]; then if [ -n "$g" ]; then
if [ "$g" -gt 501 ]; then if [ "$g" -gt 501 ]; then
echo "deleting group ${name}..." >&2 echo "deleting group ${name}..." >&2
dscl . -delete '/Groups/${name}' 2> /dev/null dscl . -delete ${dsclGroup} 2> /dev/null
else else
echo "warning: existing group '${name}' has unexpected gid $g, skipping..." >&2 echo "warning: existing group '${name}' has unexpected gid $g, skipping..." >&2
fi fi
@ -144,7 +148,9 @@ in
system.activationScripts.users.text = mkIf (cfg.knownUsers != []) '' system.activationScripts.users.text = mkIf (cfg.knownUsers != []) ''
echo "setting up users..." >&2 echo "setting up users..." >&2
${concatMapStringsSep "\n" (v: '' ${concatMapStringsSep "\n" (v: let
dsclUser = lib.escapeShellArg "/Users/${v.name}";
in ''
${optionalString cfg.forceRecreate '' ${optionalString cfg.forceRecreate ''
u=$(id -u ${lib.escapeShellArg v.name} 2> /dev/null) || true u=$(id -u ${lib.escapeShellArg v.name} 2> /dev/null) || true
if [[ "$u" -eq ${toString v.uid} ]]; then if [[ "$u" -eq ${toString v.uid} ]]; then
@ -162,11 +168,11 @@ in
if [ -z "$u" ]; then if [ -z "$u" ]; then
echo "creating user ${v.name}..." >&2 echo "creating user ${v.name}..." >&2
sysadminctl -addUser ${lib.escapeShellArgs [ v.name "-UID" v.uid "-GID" v.gid "-fullName" v.description "-home" v.home "-shell" (shellPath v.shell) ]} sysadminctl -addUser ${lib.escapeShellArgs [ v.name "-UID" v.uid "-GID" v.gid "-fullName" v.description "-home" v.home "-shell" (shellPath v.shell) ]}
dscl . -create '/Users/${v.name}' IsHidden ${if v.isHidden then "1" else "0"} dscl . -create ${dsclUser} IsHidden ${if v.isHidden then "1" else "0"}
${optionalString v.createHome "createhomedir -cu '${v.name}'"} ${optionalString v.createHome "createhomedir -cu '${v.name}'"}
fi fi
# Always set the shell path, in case it was updated # Always set the shell path, in case it was updated
dscl . -create '/Users/${v.name}' UserShell ${lib.escapeShellArg (shellPath v.shell)} dscl . -create ${dsclUser} UserShell ${lib.escapeShellArg (shellPath v.shell)}
fi fi
'') createdUsers} '') createdUsers}

22
tests/users-groups.nix
View file

@ -25,22 +25,22 @@
set -v set -v
# checking group creation in /activate # checking group creation in /activate
grep "dscl . -create '/Groups/foo' PrimaryGroupID 42000" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Groups/foo"} PrimaryGroupID 42000" ${config.out}/activate
grep "dscl . -create '/Groups/foo' RealName 'Foo group'" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Groups/foo"} RealName 'Foo group'" ${config.out}/activate
grep "dscl . -create '/Groups/created.group' PrimaryGroupID 42001" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Groups/created.group"} PrimaryGroupID 42001" ${config.out}/activate
grep -qv "dscl . -delete '/Groups/created.group'" ${config.out}/activate grep -qv "dscl . -delete ${lib.escapeShellArg "/Groups/created.group"}" ${config.out}/activate
# checking group deletion in /activate # checking group deletion in /activate
grep "dscl . -delete '/Groups/deleted.group'" ${config.out}/activate grep "dscl . -delete ${lib.escapeShellArg "/Groups/deleted.group"}" ${config.out}/activate
grep -qv "dscl . -create '/Groups/deleted.group'" ${config.out}/activate grep -qv "dscl . -create ${lib.escapeShellArg "/Groups/deleted.group"}" ${config.out}/activate
echo "checking group membership in /activate" >&2 echo "checking group membership in /activate" >&2
grep "dscl . -create '/Groups/foo' GroupMembership ${lib.escapeShellArgs [ "admin" "foo" ]}" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Groups/foo"} GroupMembership ${lib.escapeShellArgs [ "admin" "foo" ]}" ${config.out}/activate
grep "dscl . -create '/Groups/created.group' GroupMembership" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Groups/created.group"} GroupMembership" ${config.out}/activate
# checking unknown group in /activate # checking unknown group in /activate
grep -qv "dscl . -create '/Groups/unknown.group'" ${config.out}/activate grep -qv "dscl . -create ${lib.escapeShellArg "/Groups/unknown.group"}" ${config.out}/activate
grep -qv "dscl . -delete '/Groups/unknown.group'" ${config.out}/activate grep -qv "dscl . -delete ${lib.escapeShellArg "/Groups/unknown.group"}" ${config.out}/activate
# checking user creation in /activate # checking user creation in /activate
grep "sysadminctl -addUser ${lib.escapeShellArgs [ "foo" "-UID" 42000 "-GID" 42000 "-fullName" "Foo user" "-home" "/Users/foo" "-shell" "/run/current-system/sw/bin/bash" ]}" ${config.out}/activate grep "sysadminctl -addUser ${lib.escapeShellArgs [ "foo" "-UID" 42000 "-GID" 42000 "-fullName" "Foo user" "-home" "/Users/foo" "-shell" "/run/current-system/sw/bin/bash" ]}" ${config.out}/activate
@ -50,7 +50,7 @@
grep -qv "sysadminctl -deleteUser ${lib.escapeShellArg "created.user"}" ${config.out}/activate grep -qv "sysadminctl -deleteUser ${lib.escapeShellArg "created.user"}" ${config.out}/activate
# checking user properties always get updated in /activate # checking user properties always get updated in /activate
grep "dscl . -create '/Users/foo' UserShell ${lib.escapeShellArg "/run/current-system/sw/bin/bash"}" ${config.out}/activate grep "dscl . -create ${lib.escapeShellArg "/Users/foo"} UserShell ${lib.escapeShellArg "/run/current-system/sw/bin/bash"}" ${config.out}/activate
# checking user deletion in /activate # checking user deletion in /activate
grep "sysadminctl -deleteUser ${lib.escapeShellArg "deleted.user"}" ${config.out}/activate grep "sysadminctl -deleteUser ${lib.escapeShellArg "deleted.user"}" ${config.out}/activate