Skip to content

Filter out large EXIF entries #2280

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
artonge merged 1 commit into from
Jan 25, 2024
Merged

Filter out large EXIF entries #2280

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
20 changes: 16 additions & 4 deletions lib/Listener/ExifMetadataProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ public function handle(Event $event): void {
}

if ($rawExifData && array_key_exists('EXIF', $rawExifData)) {
$event->getMetadata()->setArray('photos-exif', $this->sanitizeEntries($rawExifData['EXIF']));
$event->getMetadata()->setArray('photos-exif', $this->sanitizeEntries($rawExifData['EXIF'], $node));
}

if ($rawExifData && array_key_exists('IFD0', $rawExifData)) {
$event->getMetadata()->setArray('photos-ifd0', $this->sanitizeEntries($rawExifData['IFD0']));
$event->getMetadata()->setArray('photos-ifd0', $this->sanitizeEntries($rawExifData['IFD0'], $node));
}

if (
Expand Down Expand Up @@ -154,7 +154,7 @@ private function parseGPSData(string $rawData): float {
*
* @param array<string, string> $data
*/
private function sanitizeEntries(array $data): array {
private function sanitizeEntries(array $data, File $node): array {
$cleanData = [];

foreach ($data as $key => $value) {
Expand All @@ -169,7 +169,19 @@ private function sanitizeEntries(array $data): array {
$key = preg_replace('/[^a-zA-Z]/', '_', $key);
}

$cleanData[$key] = $value;
// Arbitrary limit to filter out large EXIF entries.
if (is_string($value) && strlen($value) > 1000) {
$this->logger->info(
"EXIF entry ignored as it is too large",
[
'key' => $key,
'value' => $value,
'fileId' => $node->getId(),
]
);
} else {
$cleanData[$key] = $value;
}
}

return $cleanData;
Expand Down