Restrict EXIF extracting to a subset of formats

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · May 9, 2023 · b67e34f · b67e34f
1 parent 157be42
commit b67e34f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/private/Metadata/Provider/ExifProvider.php b/lib/private/Metadata/Provider/ExifProvider.php
@@ -44,11 +44,15 @@ public static function isAvailable(): bool {
 		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 @@ public function execute(File $file): array {
 	}
 
 	public static function getMimetypesSupported(): string {
-		return '/image\/.*/';
+		return '/image\/(png|jpeg|heif|webp|tiff)/';
 	}
 
 	/**