upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #51611 from nextcloud/fix/file-name-validator-case-sensitivity

Browse source 
fix(IFilenameValidator): correctly handle case insensitivity
This commit is contained in:
Ferdinand Thiessen 2025-03-24 12:46:33 +01:00 committed by GitHub
commit 214ac4c4a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 94 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Files/FilenameValidator.php
View file

@ -127,9 +127,6 @@ class FilenameValidator implements IFilenameValidator {
if (empty($this->forbiddenCharacters)) {
// Get always forbidden characters
$forbiddenCharacters = str_split(\OCP\Constants::FILENAME_INVALID_CHARS);
if ($forbiddenCharacters === false) {
$forbiddenCharacters = [];
}
// Get admin defined invalid characters
$additionalChars = $this->config->getSystemValue('forbidden_filename_characters', []);
@ -231,7 +228,8 @@ class FilenameValidator implements IFilenameValidator {
return false;
}
protected function checkForbiddenName($filename): void {
protected function checkForbiddenName(string $filename): void {
$filename = mb_strtolower($filename);
if ($this->isForbidden($filename)) {
throw new ReservedWordException($this->l10n->t('"%1$s" is a forbidden file or folder name.', [$filename]));
}
@ -295,6 +293,6 @@ class FilenameValidator implements IFilenameValidator {
$values = $fallback;
}
return array_map('mb_strtolower', $values);
return array_map(mb_strtolower(...), $values);
}
};

92
tests/lib/Files/FilenameValidatorTest.php
View file

@ -146,6 +146,10 @@ class FilenameValidatorTest extends TestCase {
// needed for Windows namespaces
'com1.suffix', ['.htaccess'], ['com1'], [], [], ReservedWordException::class
],
'forbidden basename case insensitive' => [
// needed for Windows namespaces
'COM1.suffix', ['.htaccess'], ['com1'], [], [], ReservedWordException::class
],
'forbidden basename for hidden files' => [
// needed for Windows namespaces
'.thumbs.db', ['.htaccess'], ['.thumbs'], [], [], ReservedWordException::class
@ -159,6 +163,9 @@ class FilenameValidatorTest extends TestCase {
'invalid extension' => [
'a: b.txt', ['.htaccess'], [], ['.txt'], [], InvalidPathException::class
],
'invalid extension case insensitive' => [
'a: b.TXT', ['.htaccess'], [], ['.txt'], [], InvalidPathException::class
],
'empty filename' => [
'', [], [], [], [], EmptyFileNameException::class
],
@ -199,7 +206,6 @@ class FilenameValidatorTest extends TestCase {
return [
['plane 1 𐪅'],
['emoji 😶‍🌫️'],
];
}
@ -284,4 +290,88 @@ class FilenameValidatorTest extends TestCase {
],
];
}
/**
* @dataProvider dataGetForbiddenExtensions
*/
public function testGetForbiddenExtensions(array $configValue, array $expectedValue): void {
$validator = new FilenameValidator($this->l10n, $this->database, $this->config, $this->logger);
$this->config
// only once - then cached
->expects(self::once())
->method('getSystemValue')
->with('forbidden_filename_extensions', ['.filepart'])
->willReturn($configValue);
self::assertEqualsCanonicalizing($expectedValue, $validator->getForbiddenExtensions());
}
public static function dataGetForbiddenExtensions(): array {
return [
// default
[['.filepart'], ['.filepart', '.part']],
// always include .part
[[], ['.part']],
// handle case insensitivity
[['.TXT'], ['.txt', '.part']],
];
}
/**
* @dataProvider dataGetForbiddenFilenames
*/
public function testGetForbiddenFilenames(array $configValue, array $legacyValue, array $expectedValue): void {
$validator = new FilenameValidator($this->l10n, $this->database, $this->config, $this->logger);
$this->config
// only once - then cached
->expects(self::exactly(2))
->method('getSystemValue')
->willReturnMap([
['forbidden_filenames', ['.htaccess'], $configValue],
['blacklisted_files', [], $legacyValue],
]);
$this->logger
->expects(empty($legacyValue) ? self::never() : self::once())
->method('warning');
self::assertEqualsCanonicalizing($expectedValue, $validator->getForbiddenFilenames());
}
public static function dataGetForbiddenFilenames(): array {
return [
// default
[['.htaccess'], [], ['.htaccess']],
// with legacy values
[['.htaccess'], ['legacy'], ['.htaccess', 'legacy']],
// handle case insensitivity
[['FileName', '.htaccess'], ['LegAcy'], ['.htaccess', 'filename', 'legacy']],
];
}
/**
* @dataProvider dataGetForbiddenBasenames
*/
public function testGetForbiddenBasenames(array $configValue, array $expectedValue): void {
$validator = new FilenameValidator($this->l10n, $this->database, $this->config, $this->logger);
$this->config
// only once - then cached
->expects(self::once())
->method('getSystemValue')
->with('forbidden_filename_basenames', [])
->willReturn($configValue);
self::assertEqualsCanonicalizing($expectedValue, $validator->getForbiddenBasenames());
}
public static function dataGetForbiddenBasenames(): array {
return [
// default
[[], []],
// with values
[['aux', 'com0'], ['aux', 'com0']],
// handle case insensitivity
[['AuX', 'COM1'], ['aux', 'com1']],
];
}
}