Skip to content

[stable25] fix(dav): Always respond custom error page on exceptions - #48304

Merged
sorbaugh merged 5 commits into
stable25from
backport/48297/stable25
Oct 1, 2024
Merged

[stable25] fix(dav): Always respond custom error page on exceptions#48304
sorbaugh merged 5 commits into
stable25from
backport/48297/stable25

Conversation

@backportbot

@backportbotbackportbotBot commented Sep 23, 2024•
edited by artonge
Loading

Copy link
Copy Markdown

Backport of #48297

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot
backportbotBot requested a review from artongeSeptember 23, 2024 16:12
@backportbotbackportbotBot added the 3. to review Waiting for reviews label Sep 23, 2024
@artonge
artongeforce-pushed the backport/48297/stable25 branch from b407afd to 71582d2CompareSeptember 24, 2024 09:26
@artongeartonge changed the title [stable25] [stable27] fix(dav): Always respond custom error page on exceptions[stable27] fix(dav): Always respond custom error page on exceptionsSep 24, 2024
@artonge
artonge marked this pull request as ready for review September 24, 2024 09:27
@artonge
artongeforce-pushed the backport/48297/stable25 branch from 71582d2 to 0d488dfCompareSeptember 24, 2024 09:27
github-advanced-security[bot]
github-advanced-securityAI found potential problems Sep 24, 2024
View reviewed changes
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php Fixed
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php Fixed
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php Fixed
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php Fixed
Comment threadapps/dav/lib/Server.php
if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
$this->server->addPlugin(new BrowserErrorPagePlugin());
}
$this->server->addPlugin(new ErrorPagePlugin($this->request, \OC::$server->getConfig()));

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Server::getConfig has been marked as deprecated
@artongeartonge changed the title [stable27] fix(dav): Always respond custom error page on exceptions[stable25] fix(dav): Always respond custom error page on exceptionsSep 24, 2024
@artonge
artongeforce-pushed the backport/48297/stable25 branch 2 times, most recently from 20d9af7 to c513c09CompareSeptember 24, 2024 10:38
github-advanced-security[bot]
github-advanced-securityAI found potential problems Sep 24, 2024
View reviewed changes
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
public function logException(\Throwable $ex): void {
if ($ex instanceof Exception) {
$httpCode = $ex->getHTTPCode();
$headers = $ex->getHTTPHeaders($this->server);

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of Sabre\DAV\Exception::getHTTPHeaders cannot be null, possibly null value provided
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
$httpCode = 500;
$headers = [];
}
$this->server->httpResponse->addHeaders($headers);

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $this->server of type Sabre\DAV\Server|null
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
$httpCode = 500;
$headers = [];
}
$this->server->httpResponse->addHeaders($headers);

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method addHeaders on possibly null value
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php Fixed
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
} else {
$templateName = 'xml_exception';
$renderAs = null;
$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $this->server of type Sabre\DAV\Server|null
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
/**
* @codeCoverageIgnore
*/
public function sendResponse() {

Check notice

Code scanning / Psalm

MissingReturnType

Method OCA\DAV\Files\ErrorPagePlugin::sendResponse does not have a return type, expecting void
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
* @codeCoverageIgnore
*/
public function sendResponse() {
$this->server->sapi->sendResponse($this->server->httpResponse);

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $this->server of type Sabre\DAV\Server|null
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
* @codeCoverageIgnore
*/
public function sendResponse() {
$this->server->sapi->sendResponse($this->server->httpResponse);

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method sendResponse on possibly null value
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
* @codeCoverageIgnore
*/
public function sendResponse() {
$this->server->sapi->sendResponse($this->server->httpResponse);

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $this->server of type Sabre\DAV\Server|null
Comment threadapps/dav/lib/Files/ErrorPagePlugin.php
* @codeCoverageIgnore
*/
public function sendResponse() {
$this->server->sapi->sendResponse($this->server->httpResponse);

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of Sabre\HTTP\Sapi::sendResponse cannot be null, possibly null value provided
@artonge
artongeforce-pushed the backport/48297/stable25 branch from c513c09 to 8c3e687CompareSeptember 24, 2024 12:07
@artonge
artongeforce-pushed the backport/48297/stable25 branch from 8c3e687 to 972fcb2CompareSeptember 25, 2024 16:03
@artongeartonge added bug feature: dav php Pull requests that update Php code labels Sep 26, 2024
@artonge
artongeforce-pushed the backport/48297/stable25 branch 2 times, most recently from d8e966a to a7d821dCompareSeptember 30, 2024 15:57
artongeand others added 5 commits September 30, 2024 18:30
@artonge
fix(dav): Always respond custom error page on exceptions
beb31be
Signed-off-by: Louis Chemineau <louis@chmn.me>
@susnux@artonge
fix: Replace conflicting tags in xml_exception template
1522ecd
The `<?xml` tag is interpreted as PHP short tags, so this causes errors.
Instead just print that part of the template.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@artonge
fix: Override start method of \Sabre\DAV\Server to remove exception o…
aff1f4b
…utput
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
fix: Prevent duplicate creation of print_exception function
af57c1b
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
fix: Disable constructor in ErrorPagePluginTest
fc6ab73
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
artongeforce-pushed the backport/48297/stable25 branch 2 times, most recently from 15b695d to fc6ab73CompareOctober 1, 2024 08:28
@sorbaugh
sorbaugh merged commit 188d747 into stable25Oct 1, 2024
@sorbaugh
sorbaugh deleted the backport/48297/stable25 branch October 1, 2024 12:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artongeartongeartonge approved these changes
@provokateurinprovokateurinprovokateurin approved these changes
@come-nccome-nccome-nc approved these changes

Assignees

@artongeartonge

Labels

3. to reviewWaiting for reviewsbugfeature: davphpPull requests that update Php code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@artonge@provokateurin@github-advanced-security@come-nc@sorbaugh@susnux