Browse Source
Use non-absolute logout URL to fix wrong URL in reverse proxy scenario
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/15430/head
Morris Jobke
7 years ago
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with
5 additions and
7 deletions
-
lib/private/legacy/user.php
-
tests/lib/NavigationManagerTest.php
|
|
@ -269,7 +269,7 @@ class OC_User { |
|
|
|
return $backend->getLogoutUrl(); |
|
|
|
} |
|
|
|
|
|
|
|
$logoutUrl = $urlGenerator->linkToRouteAbsolute('core.login.logout'); |
|
|
|
$logoutUrl = $urlGenerator->linkToRoute('core.login.logout'); |
|
|
|
$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister()); |
|
|
|
|
|
|
|
return $logoutUrl; |
|
|
|
|
|
@ -217,14 +217,12 @@ class NavigationManagerTest extends TestCase { |
|
|
|
$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) { |
|
|
|
return "/apps/$appName/img/$file"; |
|
|
|
}); |
|
|
|
$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function () { |
|
|
|
$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) { |
|
|
|
if ($route === 'core.login.logout') { |
|
|
|
return 'https://example.com/logout'; |
|
|
|
} |
|
|
|
return '/apps/test/'; |
|
|
|
}); |
|
|
|
$this->urlGenerator |
|
|
|
->expects($this->once()) |
|
|
|
->method('linkToRouteAbsolute') |
|
|
|
->with('core.login.logout') |
|
|
|
->willReturn('https://example.com/logout'); |
|
|
|
$user = $this->createMock(IUser::class); |
|
|
|
$user->expects($this->any())->method('getUID')->willReturn('user001'); |
|
|
|
$this->userSession->expects($this->any())->method('getUser')->willReturn($user); |
|
|
|