mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15452 from nextcloud/backport/15430/stable16 

[stable16] Use non-absolute logout URL to fix wrong URL in reverse proxy scenario
This commit is contained in:
Roeland Jago Douma 2019-05-08 20:44:32 +02:00 committed by GitHub
parent 26f5fffe72 3ab884a479
commit 6ef1b90e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/legacy/user.php
View File

@ -269,7 +269,7 @@ class OC_User {
return $backend->getLogoutUrl(); return $backend->getLogoutUrl();
} }
$logoutUrl = $urlGenerator->linkToRouteAbsolute('core.login.logout'); $logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister()); $logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
return $logoutUrl; return $logoutUrl;

10
tests/lib/NavigationManagerTest.php
View File

@ -217,14 +217,12 @@ class NavigationManagerTest extends TestCase {
$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) { $this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {
return "/apps/$appName/img/$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/'; 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 = $this->createMock(IUser::class);
$user->expects($this->any())->method('getUID')->willReturn('user001'); $user->expects($this->any())->method('getUID')->willReturn('user001');
$this->userSession->expects($this->any())->method('getUser')->willReturn($user); $this->userSession->expects($this->any())->method('getUser')->willReturn($user);