Prep filter for NtQueryDirectoryFile #123695
Open
+24
−28
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NtQueryDirectoryFile should always be able to take filters as long as they are properly escaped for how we'll do our matching. The special directories `.` and `..` get blocked, but anything outside of that should be fair game. cc: @stephentoub
Contributor
|
Tagging subscribers to this area: @dotnet/area-system-io |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors how filter expressions are prepared for NtQueryDirectoryFile on Windows. Instead of conservatively rejecting patterns that might be unsafe for OS-level filtering, it now escapes special DOS wildcard characters to ensure any expression (except . and ..) can be safely passed to the OS.
Changes:
- Adds expression preprocessing logic to escape special characters (
\,",<,>) forMatchType.Simplepatterns - Replaces the conservative
IsSafePatternForOSFiltercheck with a simple null check, allowing more patterns to use OS-level filtering - Removes the
IsSafePatternForOSFiltermethod and its associatedSearchValueshelper
src/libraries/System.Private.CoreLib/src/System/IO/Enumeration/FileSystemEnumerator.Windows.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Private.CoreLib/src/System/IO/Enumeration/FileSystemEnumerator.Windows.cs
Show resolved
Hide resolved
jeffhandley
approved these changes
Jan 28, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NtQueryDirectoryFileshould always be able to take filters as long as they are properly escaped for how we'll do our matching. The special directories.and..get blocked, but anything outside of that should be fair game.cc: @stephentoub