GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ATTACHMENTS] Do not create thumbnails for attachments with mimetype different from 'image|video'

This commit is contained in:
Diogo Peralta Cordeiro 2021-05-02 00:50:16 +01:00 committed by Hugo Sales
parent 6a999b8237
commit 091f4b5194
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Controller/Attachment.php
View File

@ -34,6 +34,7 @@ use App\Util\Exception\ServerException;
use Symfony\Component\HttpFoundation\HeaderUtils;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use function App\Core\I18n\_m;
class Attachment extends Controller
{
@ -46,7 +47,7 @@ class Attachment extends Controller
if (!empty($res)) {
return $handle($res);
} else {
throw new ClientException('No such attachment', 404);
throw new ClientException(_m('No such attachment'), 404);
}
}
@ -67,7 +68,7 @@ class Attachment extends Controller
];
});
} catch (NotFoundException) {
throw new ClientException('No such attachment', 404);
throw new ClientException(_m('No such attachment'), 404);
}
}
@ -88,16 +89,20 @@ class Attachment extends Controller
* Controller to produce a thumbnail for a given attachment id
*
* @param Request $request
* @param int $id Attachment ID
*
* @throws NotFoundException
* @throws ServerException
* @param int $id Attachment ID
*
* @return Response
* @throws ClientException
* @throws NotFoundException
* @throws ServerException
* @throws \App\Util\Exception\DuplicateFoundException
*/
public function attachment_thumbnail(Request $request, int $id): Response
{
$attachment = DB::findOneBy('attachment', ['id' => $id]);
if (preg_match('/^(image|video)/', $attachment->getMimeType()) !== 1) {
throw new ClientException(_m('Can not generate thumbnail for attachment with id={id}', ['id' => $id]));
}
if (!is_null($attachment->getScope())) {
// && ($attachment->scope | VisibilityScope::PUBLIC) != 0
// $user = Common::ensureLoggedIn();
@ -113,7 +118,7 @@ class Attachment extends Controller
Event::handle('GetAllowedThumbnailSizes', [&$sizes]);
if (!in_array(['width' => $width, 'height' => $height], $sizes)) {
throw new ClientException('The requested thumbnail dimensions are not allowed', 400); // 400 Bad Request
throw new ClientException(_m('The requested thumbnail dimensions are not allowed'), 400); // 400 Bad Request
}
$thumbnail = AttachmentThumbnail::getOrCreate(attachment: $attachment, width: $width, height: $height, crop: $crop);