Merge pull request #990 from bdovaz/fix-redirect-url

Use absolute paths instead of relative paths
nextcloud · Dec 4, 2024 · 10dec7f · 10dec7f
2 parents 0c2f96a + bbf13e6
commit 10dec7f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -81,6 +81,7 @@ private function checkLoginToken(TokenService $tokenService): void {
 	private function registerRedirect(IRequest $request, IURLGenerator $urlGenerator, SettingsService $settings, ProviderMapper $providerMapper): void {
 		$providers = $this->getCachedProviders($providerMapper);
 		$redirectUrl = $request->getParam('redirect_url');
+		$absoluteRedirectUrl = !empty($redirectUrl) ? $urlGenerator->getAbsoluteURL($redirectUrl) : $redirectUrl;
 
 		// Handle immediate redirect to the oidc provider if just one is configured and no other backends are allowed
 		$isDefaultLogin = false;
@@ -92,7 +93,7 @@ private function registerRedirect(IRequest $request, IURLGenerator $urlGenerator
 		if ($isDefaultLogin && !$settings->getAllowMultipleUserBackEnds() && count($providers) === 1) {
 			$targetUrl = $urlGenerator->linkToRoute(self::APP_ID . '.login.login', [
 				'providerId' => $providers[0]->getId(),
-				'redirectUrl' => $redirectUrl
+				'redirectUrl' => $absoluteRedirectUrl
 			]);
 			header('Location: ' . $targetUrl);
 			exit();
@@ -101,12 +102,13 @@ private function registerRedirect(IRequest $request, IURLGenerator $urlGenerator
 
 	private function registerLogin(IRequest $request, IL10N $l10n, IURLGenerator $urlGenerator, ProviderMapper $providerMapper): void {
 		$redirectUrl = $request->getParam('redirect_url');
+		$absoluteRedirectUrl = !empty($redirectUrl) ? $urlGenerator->getAbsoluteURL($redirectUrl) : $redirectUrl;
 		$providers = $this->getCachedProviders($providerMapper);
 		foreach ($providers as $provider) {
 			// FIXME: Move to IAlternativeLogin but requires boot due to db connection
 			OC_App::registerLogIn([
 				'name' => $l10n->t('Login with %1s', [$provider->getIdentifier()]),
-				'href' => $urlGenerator->linkToRoute(self::APP_ID . '.login.login', ['providerId' => $provider->getId(), 'redirectUrl' => $redirectUrl]),
+				'href' => $urlGenerator->linkToRoute(self::APP_ID . '.login.login', ['providerId' => $provider->getId(), 'redirectUrl' => $absoluteRedirectUrl]),
 			]);
 		}