From 8c1e75e0520d0efe51b615952329b1980d21f8b6 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 9 Aug 2018 14:27:20 +0200
Subject: [PATCH] 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>
---
 core/templates/403.php                                          | 2 +-
 .../AppFramework/Middleware/Security/SecurityMiddleware.php     | 2 +-
 .../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 e053fad764..72d5d3e4ae 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 2eedc39c3a..87954ccc1c 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 f51f7e9a1c..13c5379b14 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);
 	}