Mailing List Archive

https://github.com/python/cpython/commit/3f5bcc86d0764b691087e8412941e947554c93fd
commit: 3f5bcc86d0764b691087e8412941e947554c93fd
branch: main
author: Tony Mountifield <tony@mountifield.org>
committer: serhiy-storchaka <storchaka@gmail.com>
date: 2024-04-04T13:32:53+03:00
summary:

gh-117467: Add preserving of mailbox owner on flush (GH-117510)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

files:
A Misc/NEWS.d/next/Library/2024-04-03-18-36-53.gh-issue-117467.l6rWlj.rst
M Lib/mailbox.py
M Lib/test/test_mailbox.py

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 746811bd559412..b00d9e8634c785 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -750,9 +750,13 @@ def flush(self):
_sync_close(new_file)
# self._file is about to get replaced, so no need to sync.
self._file.close()
- # Make sure the new file's mode is the same as the old file's
- mode = os.stat(self._path).st_mode
- os.chmod(new_file.name, mode)
+ # Make sure the new file's mode and owner are the same as the old file's
+ info = os.stat(self._path)
+ os.chmod(new_file.name, info.st_mode)
+ try:
+ os.chown(new_file.name, info.st_uid, info.st_gid)
+ except (AttributeError, OSError):
+ pass
try:
os.rename(new_file.name, self._path)
except FileExistsError:
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index bb24d5db1f9ed4..a1d72aed9d8939 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -9,6 +9,7 @@
import io
import tempfile
from test import support
+from test.support import import_helper
from test.support import os_helper
from test.support import refleak_helper
from test.support import socket_helper
@@ -1081,6 +1082,47 @@ def test_permissions_after_flush(self):

self.assertEqual(os.stat(self._path).st_mode, mode)

+ @unittest.skipUnless(hasattr(os, 'chown'), 'requires os.chown')
+ def test_ownership_after_flush(self):
+ # See issue gh-117467
+
+ pwd = import_helper.import_module('pwd')
+ grp = import_helper.import_module('grp')
+ st = os.stat(self._path)
+
+ for e in pwd.getpwall():
+ if e.pw_uid != st.st_uid:
+ other_uid = e.pw_uid
+ break
+ else:
+ self.skipTest("test needs more than one user")
+
+ for e in grp.getgrall():
+ if e.gr_gid != st.st_gid:
+ other_gid = e.gr_gid
+ break
+ else:
+ self.skipTest("test needs more than one group")
+
+ try:
+ os.chown(self._path, other_uid, other_gid)
+ except OSError:
+ self.skipTest('test needs root privilege')
+ # Change permissions as in test_permissions_after_flush.
+ mode = st.st_mode | 0o666
+ os.chmod(self._path, mode)
+
+ self._box.add(self._template % 0)
+ i = self._box.add(self._template % 1)
+ # Need to remove one message to make flush() create a new file
+ self._box.remove(i)
+ self._box.flush()
+
+ st = os.stat(self._path)
+ self.assertEqual(st.st_uid, other_uid)
+ self.assertEqual(st.st_gid, other_gid)
+ self.assertEqual(st.st_mode, mode)
+

class _TestMboxMMDF(_TestSingleFile):

diff --git a/Misc/NEWS.d/next/Library/2024-04-03-18-36-53.gh-issue-117467.l6rWlj.rst b/Misc/NEWS.d/next/Library/2024-04-03-18-36-53.gh-issue-117467.l6rWlj.rst
new file mode 100644
index 00000000000000..64ae9ff7b2f0b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-04-03-18-36-53.gh-issue-117467.l6rWlj.rst
@@ -0,0 +1,2 @@
+Preserve mailbox ownership when rewriting in :func:`mailbox.mbox.flush`.
+Patch by Tony Mountifield.

_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-leave@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: list-python-checkins@lists.gossamer-threads.com