diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-09-18 12:34:40 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-09-18 12:34:40 (GMT) |
| commit | 41a22f1a778b87dee7b848c110a82e0a5b85208f (patch) | |
| tree | 533a43f1c3d15161ae1f9e6719c9216f91908424 | |
| parent | 825b50a40f394e7f2e33b1ceccc23e5877346172 (diff) | |
| download | cpython-41a22f1a778b87dee7b848c110a82e0a5b85208f.zip cpython-41a22f1a778b87dee7b848c110a82e0a5b85208f.tar.gz cpython-41a22f1a778b87dee7b848c110a82e0a5b85208f.tar.bz2 | |
#19037: adjust file times *before* moving maildir files into place.
This avoids race conditions when other programs are monitoring
the maildir directory. Patch by janzert.
| -rw-r--r-- | Lib/mailbox.py | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index d3bf3fd..d59dae8 100644 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -311,6 +311,12 @@ class Maildir(Mailbox): suffix = '' uniq = os.path.basename(tmp_file.name).split(self.colon)[0] dest = os.path.join(self._path, subdir, uniq + suffix) + if isinstance(message, MaildirMessage): + os.utime(tmp_file.name, + (os.path.getatime(tmp_file.name), message.get_date())) + # No file modification should be done after the file is moved to its + # final position in order to prevent race conditions with changes + # from other programs try: if hasattr(os, 'link'): os.link(tmp_file.name, dest) @@ -324,8 +330,6 @@ class Maildir(Mailbox): % dest) else: raise - if isinstance(message, MaildirMessage): - os.utime(dest, (os.path.getatime(dest), message.get_date())) return uniq def remove(self, key): @@ -360,11 +364,15 @@ class Maildir(Mailbox): else: suffix = '' self.discard(key) + tmp_path = os.path.join(self._path, temp_subpath) new_path = os.path.join(self._path, subdir, key + suffix) - os.rename(os.path.join(self._path, temp_subpath), new_path) if isinstance(message, MaildirMessage): - os.utime(new_path, (os.path.getatime(new_path), - message.get_date())) + os.utime(tmp_path, + (os.path.getatime(tmp_path), message.get_date())) + # No file modification should be done after the file is moved to its + # final position in order to prevent race conditions with changes + # from other programs + os.rename(tmp_path, new_path) def get_message(self, key): """Return a Message representation or raise a KeyError.""" @@ -68,6 +68,10 @@ Core and Builtins Library ------- +- Issue #19037: The mailbox module now makes all changes to maildir files + before moving them into place, to avoid race conditions with other programs + that may be accessing the maildir directory. + - Issue #14984: On POSIX systems, when netrc is called without a filename argument (and therefore is reading the user's $HOME/.netrc file), it now enforces the same security rules as typical ftp clients: the .netrc file must |