wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't do additional path expand in file module

Browse source 
Since the module's path parameter is of the AnsibleModule type path
it's already being expanded. Hence no need to have the
set_fs_attributes_if_different method do its own expand.

This additional expand is an actual problem when the file module runs
recursively, as real existing file names can be mistakenly expanded to
something completely wrong and non-existing.

Fixes #25005
Fixes #25639
This commit is contained in:
Andreas Olsson 2017-07-20 21:09:07 +02:00 committed by Toshio Kuratomi
parent 47ccb66ae3
commit ccc68f7157
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/files/file.py
View file

@ -159,18 +159,18 @@ def recursive_set_attributes(module, b_path, follow, file_args):
if not os.path.islink(b_fsname): if not os.path.islink(b_fsname):
tmp_file_args = file_args.copy() tmp_file_args = file_args.copy()
tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict') tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict')
changed |= module.set_fs_attributes_if_different(tmp_file_args, changed) changed |= module.set_fs_attributes_if_different(tmp_file_args, changed, expand=False)
else: else:
tmp_file_args = file_args.copy() tmp_file_args = file_args.copy()
tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict') tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict')
changed |= module.set_fs_attributes_if_different(tmp_file_args, changed) changed |= module.set_fs_attributes_if_different(tmp_file_args, changed, expand=False)
if follow: if follow:
b_fsname = os.path.join(b_root, os.readlink(b_fsname)) b_fsname = os.path.join(b_root, os.readlink(b_fsname))
if os.path.isdir(b_fsname): if os.path.isdir(b_fsname):
changed |= recursive_set_attributes(module, b_fsname, follow, file_args) changed |= recursive_set_attributes(module, b_fsname, follow, file_args)
tmp_file_args = file_args.copy() tmp_file_args = file_args.copy()
tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict') tmp_file_args['path'] = to_native(b_fsname, errors='surrogate_or_strict')
changed |= module.set_fs_attributes_if_different(tmp_file_args, changed) changed |= module.set_fs_attributes_if_different(tmp_file_args, changed, expand=False)
return changed return changed
@ -299,7 +299,7 @@ def main():
# file is not absent and any other state is a conflict # file is not absent and any other state is a conflict
module.fail_json(path=path, msg='file (%s) is %s, cannot continue' % (path, prev_state)) module.fail_json(path=path, msg='file (%s) is %s, cannot continue' % (path, prev_state))
changed = module.set_fs_attributes_if_different(file_args, changed, diff) changed = module.set_fs_attributes_if_different(file_args, changed, diff, expand=False)
module.exit_json(path=path, changed=changed, diff=diff) module.exit_json(path=path, changed=changed, diff=diff)
elif state == 'directory': elif state == 'directory':
@ -335,7 +335,7 @@ def main():
raise raise
tmp_file_args = file_args.copy() tmp_file_args = file_args.copy()
tmp_file_args['path'] = curpath tmp_file_args['path'] = curpath
changed = module.set_fs_attributes_if_different(tmp_file_args, changed, diff) changed = module.set_fs_attributes_if_different(tmp_file_args, changed, diff, expand=False)
except Exception as e: except Exception as e:
module.fail_json(path=path, msg='There was an issue creating %s as requested: %s' % (curpath, to_native(e))) module.fail_json(path=path, msg='There was an issue creating %s as requested: %s' % (curpath, to_native(e)))
@ -343,7 +343,7 @@ def main():
elif prev_state != 'directory': elif prev_state != 'directory':
module.fail_json(path=path, msg='%s already exists as a %s' % (path, prev_state)) module.fail_json(path=path, msg='%s already exists as a %s' % (path, prev_state))
changed = module.set_fs_attributes_if_different(file_args, changed, diff) changed = module.set_fs_attributes_if_different(file_args, changed, diff, expand=False)
if recurse: if recurse:
changed |= recursive_set_attributes(module, to_bytes(file_args['path'], errors='surrogate_or_strict'), follow, file_args) changed |= recursive_set_attributes(module, to_bytes(file_args['path'], errors='surrogate_or_strict'), follow, file_args)
@ -435,7 +435,7 @@ def main():
if module.check_mode and not os.path.exists(b_path): if module.check_mode and not os.path.exists(b_path):
module.exit_json(dest=path, src=src, changed=changed, diff=diff) module.exit_json(dest=path, src=src, changed=changed, diff=diff)
changed = module.set_fs_attributes_if_different(file_args, changed, diff) changed = module.set_fs_attributes_if_different(file_args, changed, diff, expand=False)
module.exit_json(dest=path, src=src, changed=changed, diff=diff) module.exit_json(dest=path, src=src, changed=changed, diff=diff)
elif state == 'touch': elif state == 'touch':
@ -454,7 +454,7 @@ def main():
else: else:
module.fail_json(msg='Cannot touch other than files, directories, and hardlinks (%s is %s)' % (path, prev_state)) module.fail_json(msg='Cannot touch other than files, directories, and hardlinks (%s is %s)' % (path, prev_state))
try: try:
module.set_fs_attributes_if_different(file_args, True, diff) module.set_fs_attributes_if_different(file_args, True, diff, expand=False)
except SystemExit as e: except SystemExit as e:
if e.code: if e.code:
# We take this to mean that fail_json() was called from # We take this to mean that fail_json() was called from