tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #13308 from MrPetovan/bug/13216-toggle-mobile-local

Browse source 
Rework Module\ToggleMobile to check for local links
This commit is contained in:
Michael Vogel 2023-07-26 20:26:48 +02:00 committed by GitHub
parent f1da323b07 8c06f96531
commit 5c8708f4c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App/BaseURL.php
View file

@ -127,4 +127,14 @@ class BaseURL extends Uri implements UriInterface
$redirectTo = $this->__toString() . '/' . ltrim($toUrl, '/'); $redirectTo = $this->__toString() . '/' . ltrim($toUrl, '/');
System::externalRedirect($redirectTo); System::externalRedirect($redirectTo);
} }
public function isLocalUrl(string $url): bool
{
return strpos(Strings::normaliseLink($url), Strings::normaliseLink((string)$this)) === 0;
}
public function isLocalUri(UriInterface $uri): bool
{
return $this->isLocalUrl((string)$uri);
}
} }

41
src/Module/ToggleMobile.php
View file

@ -21,32 +21,43 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\DI; use Friendica\Core\L10n;
use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\Core\System;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Util;
use GuzzleHttp\Psr7\Uri;
use Psr\Log\LoggerInterface;
/** /**
* Toggles the mobile view (on/off) * Toggles the mobile view (on/off)
*/ */
class ToggleMobile extends BaseModule class ToggleMobile extends BaseModule
{ {
protected function content(array $request = []): string /** @var IHandleSessions */
private $session;
public function __construct(IHandleSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = [])
{ {
$a = DI::app(); parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
if (isset($_GET['off'])) { $this->session = $session;
$_SESSION['show-mobile'] = false; }
} else {
$_SESSION['show-mobile'] = true; protected function rawContent(array $request = [])
{
$address = $request['address'] ?? '' ?: $this->baseUrl;
$uri = new Uri($address);
if (!$this->baseUrl->isLocalUri($uri)) {
throw new BadRequestException();
} }
if (isset($_GET['address'])) { $this->session->set('show-mobile', !isset($request['off']));
$address = $_GET['address'];
} else {
$address = '';
}
$a->redirect($address); System::externalRedirect((string)$uri);
return '';
} }
} }

3
src/Util/Network.php
View file

@ -640,10 +640,11 @@ class Network
* @param string $url * @param string $url
* *
* @return bool * @return bool
* @deprecated since 2023.09, please use BaseUrl->isLocalUrl or BaseUrl->isLocalUri instead.
*/ */
public static function isLocalLink(string $url): bool public static function isLocalLink(string $url): bool
{ {
return (strpos(Strings::normaliseLink($url), Strings::normaliseLink(DI::baseUrl())) !== false); return DI::baseUrl()->isLocalUrl($url);
} }
/** /**