saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix incorrect file permissions in file.line

Browse source 
Looks like atomic_open() doesn't take care of preserving file permissions.  It will create
a new file, edit it and then move this temp file to the original file ignoring file permissions.
Also updated the check to be sure file exist and is a file. Otherwise code will try to update
directory content and will fail badly and throw a python error.

Fixes #30150.
This commit is contained in:
abednarik 2016-01-07 16:53:16 -03:00
parent 2000800915
commit dec15d1357
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/file.py
View file

@ -1468,9 +1468,9 @@ def line(path, content, match=None, mode=None, location=None,
salt '*' file.line /etc/nsswitch.conf "networks:\tfiles dns", after="hosts:.*?", mode='ensure'
'''
path = os.path.realpath(os.path.expanduser(path))
if not os.path.exists(path):
if not os.path.isfile(path):
if not quiet:
raise CommandExecutionError('File "{0}" does not exists.'.format(path))
raise CommandExecutionError('File "{0}" does not exists or is not a file.'.format(path))
return False # No changes had happened
mode = mode and mode.lower() or mode

3
salt/utils/atomicfile.py
View file

@ -12,6 +12,7 @@ import sys
import errno
import time
import random
import shutil
import salt.ext.six as six
@ -117,6 +118,8 @@ class _AtomicWFile(object):
if self._fh.closed:
return
self._fh.close()
if os.path.isfile(self._filename):
shutil.copymode(self._filename, self._tmp_filename)
atomic_rename(self._tmp_filename, self._filename)
def __exit__(self, exc_type, exc_value, traceback):