badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[core] only check image contents if the mime type is one we can handle

Browse source
This commit is contained in:
Shish 2024-01-09 01:05:33 +00:00
parent 0762da54eb
commit baf5f38a25
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/extension.php
View file

@ -301,9 +301,12 @@ abstract class DataHandlerExtension extends Extension
public function onDataUpload(DataUploadEvent $event) public function onDataUpload(DataUploadEvent $event)
{ {
$supported_mime = $this->supported_mime($event->mime); if ($this->supported_mime($event->mime)) {
$check_contents = $this->check_contents($event->tmpname); if (!$this->check_contents($event->tmpname)) {
if ($supported_mime && $check_contents) { // We DO support this extension - but the file looks corrupt
throw new UploadException("Invalid or corrupted file");
}
$this->move_upload_to_archive($event); $this->move_upload_to_archive($event);
/* Check if we are replacing an image */ /* Check if we are replacing an image */
@ -348,9 +351,6 @@ abstract class DataHandlerExtension extends Extension
send_event(new LockSetEvent($image, $event->metadata['locked'])); send_event(new LockSetEvent($image, $event->metadata['locked']));
} }
} }
} elseif ($supported_mime && !$check_contents) {
// We DO support this extension - but the file looks corrupt
throw new UploadException("Invalid or corrupted file");
} }
} }