-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #48304 from nextcloud/backport/48297/stable25
[stable25] fix(dav): Always respond custom error page on exceptions
- Loading branch information
Showing
15 changed files
with
249 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016, ownCloud, Inc. | ||
| * | ||
| * @author Arthur Schiwon <[email protected]> | ||
| * @author Christoph Wurst <[email protected]> | ||
| * @author Lukas Reschke <[email protected]> | ||
| * @author Thomas Müller <[email protected]> | ||
| * | ||
| * @license AGPL-3.0 | ||
| * | ||
| * This code is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License, version 3, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * 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, version 3, | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| * | ||
| */ | ||
| namespace OCA\DAV\Files; | ||
|
|
||
| use OC_Template; | ||
| use OCP\AppFramework\Http\ContentSecurityPolicy; | ||
| use OCP\IConfig; | ||
| use OCP\IRequest; | ||
| use Sabre\DAV\Exception; | ||
| use Sabre\DAV\Server; | ||
| use Sabre\DAV\ServerPlugin; | ||
|
|
||
| class ErrorPagePlugin extends ServerPlugin { | ||
| private ?Server $server = null; | ||
| private IRequest $request; | ||
| private IConfig $config; | ||
|
|
||
| public function __construct( | ||
| IRequest $request, | ||
| IConfig $config | ||
| ) { | ||
| $this->request = $request; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| /** | ||
| * This initializes the plugin. | ||
| * | ||
| * This function is called by Sabre\DAV\Server, after | ||
| * addPlugin is called. | ||
| * | ||
| * This method should set up the required event subscriptions. | ||
| */ | ||
| public function initialize(Server $server): void { | ||
| $this->server = $server; | ||
| $server->on('exception', [$this, 'logException'], 1000); | ||
| } | ||
|
|
||
| public function logException(\Throwable $ex): void { | ||
| if ($ex instanceof Exception) { | ||
| $httpCode = $ex->getHTTPCode(); | ||
| $headers = $ex->getHTTPHeaders($this->server); | ||
| } else { | ||
| $httpCode = 500; | ||
| $headers = []; | ||
| } | ||
| $this->server->httpResponse->addHeaders($headers); | ||
| $this->server->httpResponse->setStatus($httpCode); | ||
| $body = $this->generateBody($ex, $httpCode); | ||
| $this->server->httpResponse->setBody($body); | ||
| $csp = new ContentSecurityPolicy(); | ||
| $this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy()); | ||
| $this->sendResponse(); | ||
| } | ||
|
|
||
| /** | ||
| * @codeCoverageIgnore | ||
| * @return string | ||
| */ | ||
| public function generateBody(\Throwable $ex, int $httpCode) { | ||
| if ($this->acceptHtml()) { | ||
| $templateName = 'exception'; | ||
| $renderAs = 'guest'; | ||
| if ($httpCode === 403 || $httpCode === 404) { | ||
| $templateName = (string)$httpCode; | ||
| } | ||
| } else { | ||
| $templateName = 'xml_exception'; | ||
| $renderAs = null; | ||
| $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8'); | ||
| } | ||
|
|
||
| $debug = $this->config->getSystemValueBool('debug', false); | ||
|
|
||
| $content = new OC_Template('core', $templateName, $renderAs); | ||
| $content->assign('title', $this->server->httpResponse->getStatusText()); | ||
| $content->assign('remoteAddr', $this->request->getRemoteAddress()); | ||
| $content->assign('requestID', $this->request->getId()); | ||
| $content->assign('debugMode', $debug); | ||
| $content->assign('errorClass', get_class($ex)); | ||
| $content->assign('errorMsg', $ex->getMessage()); | ||
| $content->assign('errorCode', $ex->getCode()); | ||
| $content->assign('file', $ex->getFile()); | ||
| $content->assign('line', $ex->getLine()); | ||
| $content->assign('exception', $ex); | ||
| return $content->fetchPage(); | ||
| } | ||
|
|
||
| /** | ||
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { | ||
| $this->server->sapi->sendResponse($this->server->httpResponse); | ||
| } | ||
|
|
||
| private function acceptHtml(): bool { | ||
| foreach (explode(',', $this->request->getHeader('Accept')) as $part) { | ||
| $subparts = explode(';', $part); | ||
| if (str_ends_with($subparts[0], '/html')) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.