IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up referral URL catch

Browse Source
This commit is contained in:
James Cole 2021-10-01 05:30:05 +02:00
parent b1b6ea9b11
commit a694329998
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Middleware/StartFireflySession.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Http\Middleware;
use Illuminate\Contracts\Session\Session; use Illuminate\Contracts\Session\Session;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Session\Middleware\StartSession; use Illuminate\Session\Middleware\StartSession;
use Log;
/** /**
* Class StartFireflySession. * Class StartFireflySession.
@ -41,21 +42,17 @@ class StartFireflySession extends StartSession
*/ */
protected function storeCurrentUrl(Request $request, $session): void protected function storeCurrentUrl(Request $request, $session): void
{ {
$uri = $request->fullUrl(); $url = $request->fullUrl();
$isScriptPage = strpos($uri, 'jscript'); $forbiddenWords = strpos($url, 'offline') || strpos($url, 'jscript') || strpos($url, 'delete') || strpos($url, '/login') || strpos($url, '/json') || strpos($url, 'serviceworker') || strpos($url, '/attachments/view');
$isDeletePage = strpos($uri, 'delete');
$isLoginPage = strpos($uri, '/login');
$isJsonPage = strpos($uri, '/json') || strpos($uri, 'serviceworker');
$isView = strpos($uri, '/attachments/view');
// also stop remembering "delete" URL's. // also stop remembering "delete" URL's.
if (false === $isScriptPage && false === $isDeletePage if (false === $forbiddenWords
&& false === $isLoginPage
&& false === $isJsonPage
&& false === $isView
&& 'GET' === $request->method() && 'GET' === $request->method()
&& !$request->ajax()) { && !$request->ajax()) {
$session->setPreviousUrl($uri); Log::debug(sprintf('Redirect is now "%s".', $url));
$session->setPreviousUrl($url);
return;
} }
Log::debug(sprintf('Refuse to set "%s" as current URL.', $url));
} }
} }