diff options
| -rw-r--r-- | lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 2 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index d5f7a7660a7..d60d5749d57 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -250,7 +250,7 @@ class SecurityMiddleware extends Middleware { $url = $this->urlGenerator->linkToRoute( 'core.login.showLoginForm', [ - 'redirect_url' => urlencode($this->request->server['REQUEST_URI']), + 'redirect_url' => $this->request->server['REQUEST_URI'], ] ); $response = new RedirectResponse($url); diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index b3014ed09f3..eaa82ec8701 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -975,7 +975,7 @@ class OC_Util { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( 'core.login.showLoginForm', [ - 'redirect_url' => urlencode(\OC::$server->getRequest()->getRequestUri()), + 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), ] ) ); diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 480bff5f59f..5a988751070 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -459,7 +459,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp' ] ], $this->createMock(ISecureRandom::class), @@ -472,10 +472,10 @@ class SecurityMiddlewareTest extends \Test\TestCase { ->with( 'core.login.showLoginForm', [ - 'redirect_url' => 'owncloud%2Findex.php%2Fapps%2Fspecialapp', + 'redirect_url' => 'nextcloud/index.php/apps/specialapp', ] ) - ->will($this->returnValue('http://localhost/index.php/login?redirect_url=owncloud%2Findex.php%2Fapps%2Fspecialapp')); + ->will($this->returnValue('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp')); $this->logger ->expects($this->once()) ->method('debug') @@ -485,7 +485,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'test', new NotLoggedInException() ); - $expected = new RedirectResponse('http://localhost/index.php/login?redirect_url=owncloud%2Findex.php%2Fapps%2Fspecialapp'); + $expected = new RedirectResponse('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp'); $this->assertEquals($expected , $response); } @@ -494,7 +494,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { [ 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp', + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp', ], ], $this->createMock(ISecureRandom::class), @@ -540,7 +540,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp' ] ], $this->createMock(ISecureRandom::class), |