Skip to content

[stable31] fix(Filesystem): use FilenameValidator for Filesystem::isFileBlacklisted #54844

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
merged 1 commit into from
Sep 3, 2025
Merged

[stable31] fix(Filesystem): use FilenameValidator for Filesystem::isFileBlacklisted #54844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions lib/private/Files/Filesystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ class Filesystem {

private static ?CappedMemoryCache $normalizedPathCache = null;

/** @var string[]|null */
private static ?array $blacklist = null;
private static ?FilenameValidator $validator = null;

/**
* classname which used for hooks handling
Expand Down Expand Up @@ -431,16 +430,16 @@ public static function isValidPath($path) {
/**
* @param string $filename
* @return bool
*
* @deprecated 30.0.0 - use \OC\Files\FilenameValidator::isForbidden
*/
public static function isFileBlacklisted($filename) {
$filename = self::normalizePath($filename);

if (self::$blacklist === null) {
self::$blacklist = \OC::$server->getConfig()->getSystemValue('blacklisted_files', ['.htaccess']);
if (self::$validator === null) {
self::$validator = \OCP\Server::get(FilenameValidator::class);
}

$filename = strtolower(basename($filename));
return in_array($filename, self::$blacklist);
$filename = self::normalizePath($filename);
return self::$validator->isForbidden($filename);
}

/**
Expand Down
Loading