mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SaveFile: respect umask for final file mode, fixes #6400

This commit is contained in:
Thomas Waldmann 2022-03-04 20:53:10 +01:00
parent a82673e708
commit 0f9d88bf2e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/borg/platform/base.py
View File

@ -4,6 +4,7 @@ import socket
import tempfile import tempfile
import uuid import uuid
from borg.constants import UMASK_DEFAULT
from borg.helpers import safe_unlink from borg.helpers import safe_unlink
from borg.platformflags import is_win32 from borg.platformflags import is_win32
@ -237,6 +238,15 @@ class SaveFile:
if exc_type is not None: if exc_type is not None:
safe_unlink(self.tmp_fname) # with-body has failed, clean up tmp file safe_unlink(self.tmp_fname) # with-body has failed, clean up tmp file
return # continue processing the exception normally return # continue processing the exception normally
# tempfile.mkstemp always uses owner-only file permissions for the temp file,
# but as we'll rename it to the non-temp permanent file now, we need to respect
# the umask and change the file mode to what a normally created file would have.
# thanks to the crappy os.umask api, we can't query the umask without setting it. :-(
umask = os.umask(UMASK_DEFAULT)
os.umask(umask)
os.chmod(self.tmp_fname, mode=0o666 & ~ umask)
try: try:
os.replace(self.tmp_fname, self.path) # POSIX: atomic rename os.replace(self.tmp_fname, self.path) # POSIX: atomic rename
except OSError: except OSError: