keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent template generation in media/photo/upload output

Browse source
This commit is contained in:
Hypolite Petovan 2023-03-15 19:25:17 -04:00
parent a0f3a49238
commit c62762297c
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Module/Media/Photo/Upload.php
View file

@ -25,10 +25,9 @@ use Friendica\App;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Database\Database; use Friendica\Core\System;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\BaseApi;
use Friendica\Module\Response; use Friendica\Module\Response;
use Friendica\Navigation\SystemMessages; use Friendica\Navigation\SystemMessages;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
@ -45,9 +44,6 @@ use Psr\Log\LoggerInterface;
*/ */
class Upload extends \Friendica\BaseModule class Upload extends \Friendica\BaseModule
{ {
/** @var Database */
private $database;
/** @var IHandleUserSessions */ /** @var IHandleUserSessions */
private $userSession; private $userSession;
@ -60,14 +56,17 @@ class Upload extends \Friendica\BaseModule
/** @var bool */ /** @var bool */
private $isJson = false; private $isJson = false;
public function __construct(IManageConfigValues $config, SystemMessages $systemMessages, IHandleUserSessions $userSession, Database $database, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) /** @var App\Page */
private $page;
public function __construct(App\Page $page, IManageConfigValues $config, SystemMessages $systemMessages, IHandleUserSessions $userSession, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{ {
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->database = $database;
$this->userSession = $userSession; $this->userSession = $userSession;
$this->systemMessages = $systemMessages; $this->systemMessages = $systemMessages;
$this->config = $config; $this->config = $config;
$this->page = $page;
} }
protected function post(array $request = []) protected function post(array $request = [])
@ -80,12 +79,12 @@ class Upload extends \Friendica\BaseModule
if (!$owner) { if (!$owner) {
$this->logger->warning('Owner not found.', ['uid' => $this->userSession->getLocalUserId()]); $this->logger->warning('Owner not found.', ['uid' => $this->userSession->getLocalUserId()]);
return $this->return(401, $this->t('Invalid request.')); $this->return(401, $this->t('Invalid request.'));
} }
if (empty($_FILES['userfile']) && empty($_FILES['media'])) { if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
$this->logger->warning('Empty "userfile" and "media" field'); $this->logger->warning('Empty "userfile" and "media" field');
return $this->return(401, $this->t('Invalid request.')); $this->return(401, $this->t('Invalid request.'));
} }
$src = ''; $src = '';
@ -134,7 +133,7 @@ class Upload extends \Friendica\BaseModule
if ($src == '') { if ($src == '') {
$this->logger->warning('File source (temporary file) cannot be determined', ['$_FILES' => $_FILES]); $this->logger->warning('File source (temporary file) cannot be determined', ['$_FILES' => $_FILES]);
return $this->return(401, $this->t('Invalid request.'), true); $this->return(401, $this->t('Invalid request.'), true);
} }
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype); $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
@ -152,7 +151,7 @@ class Upload extends \Friendica\BaseModule
if (!$image->isValid()) { if (!$image->isValid()) {
@unlink($src); @unlink($src);
$this->logger->warning($this->t('Unable to process image.'), ['imagedata[]' => gettype($imagedata), 'filetype' => $filetype]); $this->logger->warning($this->t('Unable to process image.'), ['imagedata[]' => gettype($imagedata), 'filetype' => $filetype]);
return $this->return(401, $this->t('Unable to process image.')); $this->return(401, $this->t('Unable to process image.'));
} }
$image->orient($src); $image->orient($src);
@ -185,7 +184,7 @@ class Upload extends \Friendica\BaseModule
if ($filesize > $maximagesize) { if ($filesize > $maximagesize) {
@unlink($src); @unlink($src);
$this->logger->notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); $this->logger->notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
return $this->return(401, $this->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))); $this->return(401, $this->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
} }
} }
@ -203,7 +202,7 @@ class Upload extends \Friendica\BaseModule
$result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 0, Photo::DEFAULT, $allow_cid); $result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 0, Photo::DEFAULT, $allow_cid);
if (!$result) { if (!$result) {
$this->logger->warning('Photo::store() failed', ['result' => $result]); $this->logger->warning('Photo::store() failed', ['result' => $result]);
return $this->return(401, $this->t('Image upload failed.')); $this->return(401, $this->t('Image upload failed.'));
} }
if ($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
@ -223,7 +222,7 @@ class Upload extends \Friendica\BaseModule
} }
$this->logger->info('upload done'); $this->logger->info('upload done');
return $this->return(200, "\n\n" . '[url=' . $this->baseUrl . '/photos/' . $owner['nickname'] . '/image/' . $resource_id . '][img]' . $this->baseUrl . "/photo/$resource_id-$smallest." . $image->getExt() . "[/img][/url]\n\n"); $this->return(200, "\n\n" . '[url=' . $this->baseUrl . '/photos/' . $owner['nickname'] . '/image/' . $resource_id . '][img]' . $this->baseUrl . "/photo/$resource_id-$smallest." . $image->getExt() . "[/img][/url]\n\n");
} }
/** /**
@ -250,5 +249,8 @@ class Upload extends \Friendica\BaseModule
$this->response->addContent($message); $this->response->addContent($message);
} }
$this->page->exit($this->response->generate());
System::exit();
} }
} }