diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-05-15 11:21:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 11:21:57 (GMT) |
| commit | 6d0850c4c8188035643586ab4d8ec2468abd699e (patch) | |
| tree | 45dd8d88c26e4206a37eb6d0811a0a8ee6d1bf50 | |
| parent | bac277f1dd1f1895ee54a0ae4bf11cf1f2dc5ac2 (diff) | |
| download | cpython-6d0850c4c8188035643586ab4d8ec2468abd699e.zip cpython-6d0850c4c8188035643586ab4d8ec2468abd699e.tar.gz cpython-6d0850c4c8188035643586ab4d8ec2468abd699e.tar.bz2 | |
gh-118486: Simplify test_win32_mkdir_700 to check the exact ACL (GH-119056)
(cherry picked from commit 94591dca510c796c7d40e9b4167ea56f2fdf28ca)
Co-authored-by: Steve Dower <steve.dower@python.org>
| -rw-r--r-- | Lib/test/test_os.py | 23 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 2 |
2 files changed, 9 insertions, 16 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index a64761c..6e895a5 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1800,21 +1800,14 @@ class MakedirTests(unittest.TestCase): @unittest.skipUnless(os.name == 'nt', "requires Windows") def test_win32_mkdir_700(self): base = os_helper.TESTFN - path1 = os.path.join(os_helper.TESTFN, 'dir1') - path2 = os.path.join(os_helper.TESTFN, 'dir2') - # mode=0o700 is special-cased to override ACLs on Windows - # There's no way to know exactly how the ACLs will look, so we'll - # check that they are different from a regularly created directory. - os.mkdir(path1, mode=0o700) - os.mkdir(path2, mode=0o777) - - out1 = subprocess.check_output(["icacls.exe", path1], encoding="oem") - out2 = subprocess.check_output(["icacls.exe", path2], encoding="oem") - os.rmdir(path1) - os.rmdir(path2) - out1 = out1.replace(path1, "<PATH>") - out2 = out2.replace(path2, "<PATH>") - self.assertNotEqual(out1, out2) + path = os.path.abspath(os.path.join(os_helper.TESTFN, 'dir')) + os.mkdir(path, mode=0o700) + out = subprocess.check_output(["cacls.exe", path, "/s"], encoding="oem") + os.rmdir(path) + self.assertEqual( + out.strip(), + f'{path} "D:P(A;OICI;FA;;;SY)(A;OICI;FA;;;BA)(A;OICI;FA;;;OW)"', + ) def tearDown(self): path = os.path.join(os_helper.TESTFN, 'dir1', 'dir2', 'dir3', diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index ebd076b..23cfcde 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5364,7 +5364,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd) if (mode == 0700 /* 0o700 */) { ULONG sdSize; pSecAttr = &secAttr; - // Set a discreationary ACL (D) that is protected (P) and includes + // Set a discretionary ACL (D) that is protected (P) and includes // inheritable (OICI) entries that allow (A) full control (FA) to // SYSTEM (SY), Administrators (BA), and the owner (OW). if (!ConvertStringSecurityDescriptorToSecurityDescriptorW( |