kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

Refer to steam method

Browse Source
This commit is contained in:
James Cole
2021-10-03 06:05:30 +02:00
parent 1e0e5d0fe9
commit 5d71baa4a1
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Exceptions/Handler.php
View File

@@ -202,7 +202,7 @@ class Handler extends ExceptionHandler
protected function invalid($request, LaravelValidationException $exception): Application|RedirectResponse|Redirector protected function invalid($request, LaravelValidationException $exception): Application|RedirectResponse|Redirector
{ {
// protect against open redirect when submitting invalid forms. // protect against open redirect when submitting invalid forms.
$previous = $this->getPreviousUrl(); $previous = app('steam')->getSafePreviousUrl();
$redirect = $this->getRedirectUrl($exception); $redirect = $this->getRedirectUrl($exception);
return redirect($redirect ?? $previous) return redirect($redirect ?? $previous)
@@ -210,21 +210,6 @@ class Handler extends ExceptionHandler
->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag)); ->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag));
} }
/**
* Only return the previousUrl() if it is a valid URL. Return default redirect otherwise.
*
* @return string
*/
private function getPreviousUrl(): string
{
$safe = route('index');
$previous = url()->previous();
$previousHost = parse_url($previous, PHP_URL_HOST);
$safeHost = parse_url($safe, PHP_URL_HOST);
return null !== $previousHost && $previousHost === $safeHost ? $previous : $safe;
}
/** /**
* Only return the redirectTo property from the exception if it is a valid URL. Return NULL otherwise. * Only return the redirectTo property from the exception if it is a valid URL. Return NULL otherwise.
* *