Skip to content

gh-118486: Support mkdir(mode=0o700) on Windows #118488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 3 commits into from
May 2, 2024
Merged

gh-118486: Support mkdir(mode=0o700) on Windows #118488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bd91f2
gh-118486: Support mkdir(mode=0o700) on Windows
zooba May 1, 2024
b13d7e7
Add test_os test
zooba May 1, 2024
e7deba5
Update Lib/test/test_os.py
zooba May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test_os test
  • Loading branch information
@zooba
zooba committed May 1, 2024
commit b13d7e7aceb709d5aef3f369fa9be5d63eb5dfd5
19 changes: 19 additions & 0 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1811,6 +1811,25 @@ def test_exist_ok_existing_regular_file(self):
self.assertRaises(OSError, os.makedirs, path, exist_ok=True)
os.remove(path)

@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 to way to know exactly how the ACLs will look, so we'll
Comment thread
zooba marked this conversation as resolved.
Outdated
# 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)

def tearDown(self):
path = os.path.join(os_helper.TESTFN, 'dir1', 'dir2', 'dir3',
'dir4', 'dir5', 'dir6')
Expand Down
6 changes: 3 additions & 3 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5577,8 +5577,8 @@ Typical use will look like:
Py_END_ALLOW_THREADS

if (error) {
PyErr_SetFromWindowsErr(error);
return NULL;
PyErr_SetFromWindowsErr(error);
return NULL;
}
*/

Expand Down Expand Up @@ -5726,7 +5726,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd)
result = CreateDirectoryW(path->wide, pSecAttr);
error = clearSecurityAttributes(&pSecAttr, &secAttrData);
} else {
// Ignore errors - we have a more interesting one already
// Ignore error from "clear" - we have a more interesting one already
clearSecurityAttributes(&pSecAttr, &secAttrData);
Comment thread
zooba marked this conversation as resolved.
}
Py_END_ALLOW_THREADS
Expand Down