diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-08-09 14:27:20 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-08-09 16:45:25 +0200 |
commit | 8c1e75e0520d0efe51b615952329b1980d21f8b6 (patch) | |
tree | 68e85271ba02bdadd28350da76b70f23f93ba532 | |
parent | 88603e98f89de716eedb6b1c94e0bc1f3366db3c (diff) | |
download | nextcloud-server-8c1e75e0520d0efe51b615952329b1980d21f8b6.tar.gz nextcloud-server-8c1e75e0520d0efe51b615952329b1980d21f8b6.zip |
Do not use file as template parameter
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r-- | core/templates/403.php | 2 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php | 2 | ||||
-rw-r--r-- | tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/403.php b/core/templates/403.php index e053fad764a..72d5d3e4ae6 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -12,6 +12,6 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to / <ul> <li class='error'> <?php p($l->t( 'Access forbidden' )); ?><br> - <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> + <p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p> </li> </ul> diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 2eedc39c3ab..87954ccc1cb 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -249,7 +249,7 @@ class SecurityMiddleware extends Middleware { $url = $this->urlGenerator->linkToRoute('core.login.showLoginForm', $params); $response = new RedirectResponse($url); } else { - $response = new TemplateResponse('core', '403', ['file' => $exception->getMessage()], 'guest'); + $response = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest'); $response->setStatus($exception->getCode()); } } diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index f51f7e9a1c6..13c5379b142 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -568,7 +568,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'test', $exception ); - $expected = new TemplateResponse('core', '403', ['file' => $exception->getMessage()], 'guest'); + $expected = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest'); $expected->setStatus($exception->getCode()); $this->assertEquals($expected , $response); } |