Skip to content

[Bug]: Fix PDF scanner perfomed on AI files #733

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
kingjia90 merged 3 commits into from
Oct 28, 2024
Merged

[Bug]: Fix PDF scanner perfomed on AI files #733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6e23ca
avoid AI files getting scanned, having pdf mime type
kingjia90 Oct 25, 2024
fb07b2e
replace with a const to fix sonarcloud
kingjia90 Oct 25, 2024
3560c31
oh forgot we are not in 8.3
kingjia90 Oct 25, 2024
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
9 changes: 5 additions & 4 deletions src/Controller/Admin/Asset/AssetController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class AssetController extends ElementControllerBase implements KernelControllerE
use ElementEditLockHelperTrait;
use ApplySchedulerDataTrait;
use UserNameTrait;
final const PDF_MIMETYPE = 'application/pdf';

protected Asset\Service $_assetService;

Expand Down Expand Up @@ -933,7 +934,7 @@ public function showVersionAction(Request $request, Environment $twig): Response
throw $this->createAccessDeniedHttpException('Permission denied, version id [' . $id . ']');
}

if ($asset->getMimeType() === 'application/pdf') {
if ($asset instanceof Asset\Document && $asset->getMimeType() === self::PDF_MIMETYPE) {
$scanResponse = $this->getResponseByScanStatus($asset, false);
if ($scanResponse) {
return $scanResponse;
Expand Down Expand Up @@ -1432,7 +1433,7 @@ public function getPreviewDocumentAction(
}

if ($asset->isAllowed('view')) {
if ($asset->getMimeType() === 'application/pdf') {
if ($asset instanceof Asset\Document && $asset->getMimeType() === self::PDF_MIMETYPE) {
$scanResponse = $this->getResponseByScanStatus($asset);
if ($scanResponse) {
return $scanResponse;
Expand All @@ -1444,7 +1445,7 @@ public function getPreviewDocumentAction(
return new StreamedResponse(function () use ($stream) {
fpassthru($stream);
}, 200, [
'Content-Type' => 'application/pdf',
'Content-Type' => self::PDF_MIMETYPE,
]);
} else {
throw $this->createNotFoundException('Unable to get preview for asset ' . $asset->getId());
Expand Down Expand Up @@ -1484,7 +1485,7 @@ protected function getDocumentPreviewPdf(Asset\Document $asset)
{
$stream = null;

if ($asset->getMimeType() == 'application/pdf') {
if ($asset->getMimeType() == self::PDF_MIMETYPE) {
$stream = $asset->getStream();
}

Expand Down
Loading