Skip to content
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.

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

gh-118802: Fix ACL use in test for non-English Windows #118831

Merged
merged 1 commit into from
May 9, 2024

Conversation

zooba
Copy link
Member

@zooba zooba commented May 9, 2024

@zooba zooba added tests Tests in the Lib/test dir skip news needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels May 9, 2024
@zooba zooba merged commit 82acc5f into python:main May 9, 2024
36 checks passed
@miss-islington-app
Copy link

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@zooba zooba deleted the gh-118802 branch May 9, 2024 12:59
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@bedevere-app
Copy link

bedevere-app bot commented May 9, 2024

GH-118837 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label May 9, 2024
@bedevere-app
Copy link

bedevere-app bot commented May 9, 2024

GH-118838 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label May 9, 2024
zooba added a commit that referenced this pull request May 9, 2024
SonicField pushed a commit to SonicField/cpython that referenced this pull request May 9, 2024
zooba added a commit that referenced this pull request May 9, 2024
# Give delete permission. We are the file owner, so we can do this
# even though we removed all permissions earlier.
subprocess.check_output([ICACLS, filename, "/grant", "Everyone:(D)"],
# Give delete permission to the owner (us)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're doing a lot more than you have to. Just /deny the right to synchronize on the file for users (*BU). CreateFileW() always requests SYNCHRONIZE access because it's in the API contract that File handles are waitable. OTOH, DeleteFileW() only needs DELETE access, so you can still delete the file without having to reset the security on it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only slightly more work, and this is a better emulation of the user report. It should be more robust if something else changes in the future (either failing hard, so we notice, or not failing at all). Being too targeted here could leave us open to the test passing being a false positive based on the environment, so I'd rather just go hard at it and be sure we're testing the right thing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants