diff --git a/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php b/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php index 4018181..8ffa2f6 100644 --- a/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php +++ b/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php @@ -24,7 +24,7 @@ /** * {@inheritdoc} */ - protected function isSafe($url) { + protected function isLocal($url) { return !UrlHelper::isExternal($url) || UrlHelper::externalIsLocal($url, $this->getRequestContext()->getCompleteBaseUrl()); } diff --git a/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php b/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php index f6d4565..d2b8690 100644 --- a/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php +++ b/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php @@ -15,6 +15,8 @@ */ class LocalRedirectResponse extends SecuredRedirectResponse { - use SecuredRedirectResponseTrait; + use LocalAwareRedirectResponseTrait { + LocalAwareRedirectResponseTrait::isLocal as isSafe; + } } diff --git a/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php b/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php index bfeee0f..f29b146 100644 --- a/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php +++ b/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php @@ -17,9 +17,7 @@ */ class TrustedRedirectResponse extends SecuredRedirectResponse { - use SecuredRedirectResponseTrait { - SecuredRedirectResponseTrait::isSafe as traitIsSafe; - } + use LocalAwareRedirectResponseTrait; /** * A list of trusted URLs, which are safe to redirect to. @@ -52,8 +50,8 @@ public function setTrustedTargetUrl($url) { /** * {@inheritdoc} */ - protected function isSafe($url) { - return !empty($this->trustedUrls[$url]) || $this->traitIsSafe($url); + protected function isLocal($url) { + return !empty($this->trustedUrls[$url]) || $this->isLocal($url); } }