wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[UTIL][EXCEPTION][RedirectException] Remove hack that would attempt to generate a URL inplace

Browse Source
This commit is contained in:
Hugo Sales 2021-12-21 12:46:02 +00:00
parent 027adc97b2
commit 25900d38bd
No known key found for this signature in database
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Util/Exception/RedirectException.php
View File

@ -39,15 +39,11 @@ class RedirectException extends Exception
public function __construct(string $route_id_or_path = '', array $params = [], string $message = '', int $code = 302, ?string $url = null, bool $allow_open_redirect = false, ?Exception $previous_exception = null) public function __construct(string $route_id_or_path = '', array $params = [], string $message = '', int $code = 302, ?string $url = null, bool $allow_open_redirect = false, ?Exception $previous_exception = null)
{ {
if (!empty($route_id_or_path) || !empty($url)) { if (!empty($route_id_or_path) || !empty($url)) {
if ($route_id_or_path[0] === '/') { $url ??= Router::url($route_id_or_path, $params, Router::ABSOLUTE_PATH); // Absolute path doesn't include host
$url = "https://{$_ENV['SOCIAL_DOMAIN']}{$route_id_or_path}"; if (!$allow_open_redirect) {
} else { if (Router::isAbsolute($url)) {
$url ??= Router::url($route_id_or_path, $params, Router::ABSOLUTE_PATH); // Absolute path doesn't include host Log::warning("A RedirectException that shouldn't allow open redirects attempted to redirect to {$url}");
if (!$allow_open_redirect) { throw new ServerException(_m('Can not redirect to outside the website from here'), 5400); // 500 Internal server error (likely a bug)
if (Router::isAbsolute($url)) {
Log::warning("A RedirectException that shouldn't allow open redirects attempted to redirect to {$url}");
throw new ServerException(_m('Can not redirect to outside the website from here'), 5400); // 500 Internal server error (likely a bug)
}
} }
} }
$this->redirect_response = new RedirectResponse($url); $this->redirect_response = new RedirectResponse($url);