Skip to content

[stable21] Normalize file name before existence check in scanner #29794

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
MichaIng merged 3 commits into from
Nov 21, 2021
Merged

[stable21] Normalize file name before existence check in scanner #29794

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e79444
Normalize file name before existence check in scanner
PVince81 Nov 9, 2021
88b5860
Move storage encoding compatibility warning logic
PVince81 Nov 10, 2021
ca37664
Normalize directory entries in Encoding wrapper
PVince81 Nov 17, 2021
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
Next Next commit
Normalize file name before existence check in scanner 
The scanner would not find a NFD-encoded file name in an
existing file list that is normalized.

This normalizes the file name before scanning.

Fixes issues where scanning repeatedly would make NFD files flicker in
and out of existence in the file cache.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81 @backportbot
PVince81 authored and backportbot[bot] committed Nov 19, 2021
commit 2e7944482841355ebd3b600e4f160da2ce4e60cf
1 change: 1 addition & 0 deletions lib/private/Files/Cache/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$s
continue;
}
$file = $fileMeta['name'];
$file = trim(\OC\Files\Filesystem::normalizePath($file), '/');
$newChildNames[] = $file;
$child = $path ? $path . '/' . $file : $file;
try {
Expand Down