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

Merge pull request #20042 from nextcloud/fix/noid/styled-dav-browser-error 

fix dav browser error page not styled
This commit is contained in:
Roeland Jago Douma 2020-03-22 14:23:17 +01:00 committed by GitHub
parent 47fafead81 82f8a167a6
commit 019ba27943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/dav/lib/Files/BrowserErrorPagePlugin.php
View File

@ -25,6 +25,7 @@ namespace OCA\DAV\Files;
use OC\AppFramework\Http\Request;
use OC_Template;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\IRequest;
use Sabre\DAV\Exception;
use Sabre\DAV\Server;
@ -80,8 +81,10 @@ class BrowserErrorPagePlugin extends ServerPlugin {
}
$this->server->httpResponse->addHeaders($headers);
$this->server->httpResponse->setStatus($httpCode);
$body = $this->generateBody();
$body = $this->generateBody($httpCode);
$this->server->httpResponse->setBody($body);
$csp = new ContentSecurityPolicy();
$this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy());
$this->sendResponse();
}
@ -89,9 +92,15 @@ class BrowserErrorPagePlugin extends ServerPlugin {
* @codeCoverageIgnore
* @return bool|string
*/
public function generateBody() {
public function generateBody(int $httpCode) {
$request = \OC::$server->getRequest();
$content = new OC_Template('dav', 'exception', 'guest');
$templateName = 'exception';
if($httpCode === 403 || $httpCode === 404) {
$templateName = (string)$httpCode;
}
$content = new OC_Template('core', $templateName, 'guest');
$content->assign('title', $this->server->httpResponse->getStatusText());
$content->assign('remoteAddr', $request->getRemoteAddress());
$content->assign('requestID', $request->getId());

33
apps/dav/templates/exception.php
View File

@ -1,33 +0,0 @@
<?php
/**
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
style('core', ['styles', 'header']);
/** @param $_ array */
?>
<span class="error error-wide">
<h2><?php p($_['title']) ?></h2>
<h3><strong><?php p($l->t('Technical details')) ?></strong></h3>
<ul>
<li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li>
<li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li>
</ul>
</span>