From 6baafd82b65eb8021d9611319886d19c28586e1f Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Wed, 5 Feb 2025 11:51:10 +0100 Subject: [PATCH] fix: make sure we process mime extensions as string Signed-off-by: skjnldsv --- build/psalm-baseline.xml | 6 ---- .../Mimetype/GenerateMimetypeFileBuilder.php | 4 +++ .../Command/Maintenance/Mimetype/UpdateDB.php | 4 +++ lib/private/Files/Type/Detection.php | 15 +++++--- lib/public/Files/IMimeTypeDetector.php | 6 ++++ lib/public/Files/IMimeTypeLoader.php | 10 ++++++ tests/lib/Files/Type/DetectionTest.php | 35 +++++++++++++++++++ 7 files changed, 70 insertions(+), 10 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 5cf823f9864d9..7e996f97427fd 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1235,12 +1235,6 @@ timeFactory->getTime()]]> - - - - - - diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php index 283809a903184..5b598d20672c8 100644 --- a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php +++ b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php @@ -18,6 +18,10 @@ class GenerateMimetypeFileBuilder { public function generateFile(array $aliases): string { // Remove comments $aliases = array_filter($aliases, static function ($key) { + // Single digit extensions will be treated as integers + // Let's make sure they are strings + // https://github.com/nextcloud/server/issues/42902 + $key = (string)$key; return !($key === '' || $key[0] === '_'); }, ARRAY_FILTER_USE_KEY); diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 9ba535ef658c3..4467e89eb32ec 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -45,6 +45,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int $totalNewMimetypes = 0; foreach ($mappings as $ext => $mimetypes) { + // Single digit extensions will be treated as integers + // Let's make sure they are strings + // https://github.com/nextcloud/server/issues/42902 + $ext = (string)$ext; if ($ext[0] === '_') { // comment continue; diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index b1e4c098e540f..e8fbab0330e60 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -23,6 +23,7 @@ class Detection implements IMimeTypeDetector { private const CUSTOM_MIMETYPEMAPPING = 'mimetypemapping.json'; private const CUSTOM_MIMETYPEALIASES = 'mimetypealiases.json'; + /** @var array */ protected array $mimetypes = []; protected array $secureMimeTypes = []; @@ -52,6 +53,8 @@ public function __construct( public function registerType(string $extension, string $mimetype, ?string $secureMimeType = null): void { + // Make sure the extension is a string + // https://github.com/nextcloud/server/issues/42902 $this->mimetypes[$extension] = [$mimetype, $secureMimeType]; $this->secureMimeTypes[$mimetype] = $secureMimeType ?: $mimetype; } @@ -66,13 +69,17 @@ public function registerType(string $extension, * @param array $types */ public function registerTypeArray(array $types): void { - $this->mimetypes = array_merge($this->mimetypes, $types); + // Register the types, + foreach ($types as $extension => $mimeType) { + $this->registerType((string)$extension, $mimeType[0], $mimeType[1] ?? null); + } // Update the alternative mimetypes to avoid having to look them up each time. foreach ($this->mimetypes as $extension => $mimeType) { - if (str_starts_with($extension, '_comment')) { + if (str_starts_with((string)$extension, '_comment')) { continue; } + $this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?? $mimeType[0]; if (isset($mimeType[1])) { $this->secureMimeTypes[$mimeType[1]] = $mimeType[1]; @@ -133,7 +140,7 @@ private function loadMappings(): void { } /** - * @return array + * @return array */ public function getAllMappings(): array { $this->loadMappings(); @@ -163,7 +170,7 @@ public function detectPath($path): string { $extension = strrchr($fileName, '.'); if ($extension !== false) { $extension = strtolower($extension); - $extension = substr($extension, 1); //remove leading . + $extension = substr($extension, 1); // remove leading . return $this->mimetypes[$extension][0] ?? 'application/octet-stream'; } } diff --git a/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php index 1c683cdd4b959..4a5f4635cc17c 100644 --- a/lib/public/Files/IMimeTypeDetector.php +++ b/lib/public/Files/IMimeTypeDetector.php @@ -73,4 +73,10 @@ public function mimeTypeIcon($mimeType); * @since 28.0.0 */ public function getAllAliases(): array; + + /** + * @return array + * @since 8.2.0 + */ + public function getAllMappings(): array; } diff --git a/lib/public/Files/IMimeTypeLoader.php b/lib/public/Files/IMimeTypeLoader.php index 44261527d5377..d98c3ab435670 100644 --- a/lib/public/Files/IMimeTypeLoader.php +++ b/lib/public/Files/IMimeTypeLoader.php @@ -47,4 +47,14 @@ public function exists(string $mimetype): bool; * @since 8.2.0 */ public function reset(): void; + + /** + * Update filecache mimetype based on file extension + * + * @param string $ext + * @param int $mimeTypeId + * @return int + * @since 8.2.0 + */ + public function updateFilecache(string $ext, int $mimeTypeId): int; } diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php index dcbb455efc9f3..a11a59bed1ee0 100644 --- a/tests/lib/Files/Type/DetectionTest.php +++ b/tests/lib/Files/Type/DetectionTest.php @@ -100,6 +100,41 @@ public function testDetectString(): void { $this->assertEquals($expected, $result); } + public function dataMimeTypeCustom(): array { + return [ + ['123', 'foobar/123'], + ['a123', 'foobar/123'], + ['bar', 'foobar/bar'], + ]; + } + + /** + * @dataProvider dataMimeTypeCustom + * + * @param string $ext + * @param string $mime + */ + public function testDetectMimeTypeCustom(string $ext, string $mime): void { + $confDir = sys_get_temp_dir(); + file_put_contents($confDir . '/mimetypemapping.dist.json', json_encode([])); + + /** @var IURLGenerator $urlGenerator */ + $urlGenerator = $this->getMockBuilder(IURLGenerator::class) + ->disableOriginalConstructor() + ->getMock(); + + /** @var LoggerInterface $logger */ + $logger = $this->createMock(LoggerInterface::class); + + // Create new mapping file + file_put_contents($confDir . '/mimetypemapping.dist.json', json_encode([$ext => [$mime]])); + + $detection = new Detection($urlGenerator, $logger, $confDir, $confDir); + $mappings = $detection->getAllMappings(); + $this->assertArrayHasKey($ext, $mappings); + $this->assertEquals($mime, $detection->detectPath('foo.' . $ext)); + } + public function dataGetSecureMimeType(): array { return [ ['image/svg+xml', 'text/plain'],