From b67e34f78f73cfa67c8e1df76f3608c9280d7b47 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Sat, 6 May 2023 17:33:55 +0200 Subject: [PATCH] Restrict EXIF extracting to a subset of formats Signed-off-by: Louis Chemineau --- lib/private/Metadata/Provider/ExifProvider.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/private/Metadata/Provider/ExifProvider.php b/lib/private/Metadata/Provider/ExifProvider.php index 4e211e7b6c4..b1598abbbc8 100644 --- a/lib/private/Metadata/Provider/ExifProvider.php +++ b/lib/private/Metadata/Provider/ExifProvider.php @@ -44,11 +44,15 @@ class ExifProvider implements IMetadataProvider { return extension_loaded('exif'); } - /** @return array{'gps': FileMetadata, 'size': FileMetadata} */ + /** @return array{'gps'?: FileMetadata, 'size'?: FileMetadata} */ public function execute(File $file): array { $exifData = []; $fileDescriptor = $file->fopen('rb'); + if ($fileDescriptor === false) { + return []; + } + $data = null; try { // Needed to make reading exif data reliable. @@ -107,7 +111,7 @@ class ExifProvider implements IMetadataProvider { } public static function getMimetypesSupported(): string { - return '/image\/.*/'; + return '/image\/(png|jpeg|heif|webp|tiff)/'; } /**