user module, avoid chmoding symlink'd home file (#83956) (#84081)

also added tests

---------
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>

(cherry picked from commit 0959472bc6)
pull/84194/head
Brian Coca 4 weeks ago committed by GitHub
parent 45f486586e
commit 3b5a431998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,2 @@
bugfixes:
- user module now avoids changing ownership of files symlinked in provided home dir skeleton

@ -1322,7 +1322,9 @@ class User(object):
for d in dirs:
os.chown(os.path.join(root, d), uid, gid)
for f in files:
os.chown(os.path.join(root, f), uid, gid)
full_path = os.path.join(root, f)
if not os.path.islink(full_path):
os.chown(full_path, uid, gid)
except OSError as e:
self.module.exit_json(failed=True, msg="%s" % to_native(e))

@ -0,0 +1 @@
test file, not real ssh hosts file

@ -137,7 +137,8 @@
- name: Create user home directory with /dev/null as skeleton, https://github.com/ansible/ansible/issues/75063
# create_homedir is mostly used by linux, rest of OSs take care of it themselves via -k option (which fails this task)
when: ansible_system == 'Linux'
# OS X actuall breaks since it does not implement getpwnam()
when: ansible_system == 'Linux'
block:
- name: "Create user home directory with /dev/null as skeleton"
user:
@ -152,3 +153,69 @@
name: withskeleton
state: absent
remove: yes
- name: Create user home directory with skel that contains symlinks
tags: symlink_home
when: ansible_system == 'Linux'
become: True
vars:
flag: '{{tempdir.path}}/root_flag.conf'
block:
- name: make tempdir for skel
tempfile: state=directory
register: tempdir
- name: create flag file
file: path={{flag}} owner=root state=touch
- name: copy skell to target
copy:
dest: '{{tempdir.path}}/skel'
src: files/skel
register: skel
- name: create the bad symlink
file:
src: '{{flag}}'
dest: '{{tempdir.path}}/skel/should_not_change_own'
state: link
- name: "Create user home directory with skeleton"
user:
name: withskeleton
state: present
skeleton: "{{tempdir.path}}/skel"
createhome: yes
home: /home/missing/withskeleton
register: create_user_with_skeleton_symlink
- name: Check flag
stat: path={{flag}}
register: test_flag
- name: ensure we didn't change owner for flag
assert:
that:
- test_flag.stat.uid != create_user_with_skeleton_symlink.uid
always:
- name: "Remove test user"
user:
name: withskeleton
state: absent
remove: yes
- name: get files to delete
find: path="{{tempdir.path}}"
register: remove
when:
- tempdir is defined
- tempdir is success
- name: "Remove temp files"
file:
path: '{{item}}'
state: absent
loop: "{{remove.files|default([])}}"
when:
- remove is success

Loading…
Cancel
Save