Skip to content

[stable29] Bug/48678/restore dav error response - #49483

Merged
kesselb merged 6 commits into
stable29from
backport/49004/stable29
Feb 15, 2025
Merged

[stable29] Bug/48678/restore dav error response#49483
kesselb merged 6 commits into
stable29from
backport/49004/stable29

Conversation

@backportbot

@backportbot backportbot Bot commented Nov 25, 2024 •
edited by kesselb
Loading

Copy link
Copy Markdown

Backport of #49004

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 backportbot Bot added this to the Nextcloud 29.0.10 milestone Nov 25, 2024
@kesselb
kesselb force-pushed the backport/49004/stable29 branch from c7d77cc to 2ba73b4 Compare November 26, 2024 12:41
@kesselb

kesselb commented Nov 26, 2024

Copy link
Copy Markdown
Contributor

Conflicts: Constructor property promotion and Imports in Server and ServerFactory

github-advanced-security[bot]
github-advanced-security AI found potential problems Nov 26, 2024
View reviewed changes
Comment thread apps/dav/lib/Connector/Sabre/Server.php
$error->setAttribute('xmlns:s', self::NS_SABREDAV);
$DOM->appendChild($error);

$h = function ($v) {

Check notice

Code scanning / Psalm

MissingClosureReturnType

Closure does not have a return type, expecting string
Comment thread apps/dav/lib/Connector/Sabre/Server.php
$error->setAttribute('xmlns:s', self::NS_SABREDAV);
$DOM->appendChild($error);

$h = function ($v) {

Check notice

Code scanning / Psalm

MissingClosureParamType

Parameter $v has no provided type
Comment thread apps/dav/lib/Files/BrowserErrorPagePlugin.php
}
class BrowserErrorPagePlugin extends ServerPlugin {
/** @var Server */
private $server;

Check notice

Code scanning / Psalm

MissingConstructor

OCA\DAV\Files\BrowserErrorPagePlugin has an uninitialized property OCA\DAV\Files\BrowserErrorPagePlugin::$server, but no constructor
Comment thread apps/dav/lib/Files/BrowserErrorPagePlugin.php
$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
}
public function generateBody(int $httpCode) {
$request = \OC::$server->getRequest();

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Server::getRequest has been marked as deprecated
@kesselb
kesselb force-pushed the backport/49004/stable29 branch from 2ba73b4 to 95ea51a Compare November 26, 2024 12:58
@kesselb
kesselb marked this pull request as ready for review November 26, 2024 12:59
@skjnldsv skjnldsv mentioned this pull request Nov 27, 2024
Merged
4 tasks
kesselb
kesselb requested changes Nov 28, 2024
View reviewed changes

@kesselb kesselb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking

@kesselb
kesselb force-pushed the backport/49004/stable29 branch 2 times, most recently from e8c6d05 to 5de28cf Compare November 28, 2024 13:32
@skjnldsv skjnldsv mentioned this pull request Nov 29, 2024
Closed
3 tasks
@blizzz blizzz mentioned this pull request Dec 5, 2024
Merged
@kesselb kesselb mentioned this pull request Dec 22, 2024
Closed
4 tasks
@blizzz blizzz mentioned this pull request Jan 8, 2025
Merged
10 tasks
@kesselb
kesselb force-pushed the backport/49004/stable29 branch 2 times, most recently from e86568e to ec9e9e9 Compare January 29, 2025 14:44
This was referenced Feb 5, 2025
Merged
Merged
@kesselb
kesselb force-pushed the backport/49004/stable29 branch from ec9e9e9 to f90fd1a Compare February 11, 2025 12:25
@Altahrim Altahrim mentioned this pull request Feb 12, 2025
Merged
8 tasks
@kesselb
kesselb force-pushed the backport/49004/stable29 branch from f90fd1a to 09a6d38 Compare February 13, 2025 10:19
@kesselb
kesselb self-requested a review February 13, 2025 10:27
kesselb and others added 6 commits February 15, 2025 16:51
@kesselb
Revert "fix: Override start method of \Sabre\DAV\Server to remove exc…
aa30a1b 
…eption output"

This reverts commit e202896.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Revert "fix: Drop unnecessary exit"
13a3e5e 
This reverts commit d2bf361.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Revert "fix(dav): Always respond custom error page on exceptions"
1794829 
This reverts commit 9992e7d.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
fix: Replace the TypeError to prevent exposing the installation path
df590d3 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@icewind1991 @kesselb
fix: make locked exception path relative to the view
e020cbb 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @kesselb
fix: use relative paths for upload locks
f01f393 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@kesselb
kesselb force-pushed the backport/49004/stable29 branch from 09a6d38 to f01f393 Compare February 15, 2025 15:51
@kesselb
kesselb enabled auto-merge February 15, 2025 15:52
@kesselb
kesselb merged commit c4aec1b into stable29 Feb 15, 2025
@kesselb
kesselb deleted the backport/49004/stable29 branch February 15, 2025 19:18
This was referenced Feb 20, 2025
Closed
Closed
@blizzz blizzz mentioned this pull request Mar 4, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes
@kesselb kesselb kesselb approved these changes
@miaulalala miaulalala miaulalala approved these changes
@st3iny st3iny Awaiting requested review from st3iny st3iny is a code owner
@SebastianKrupinski SebastianKrupinski Awaiting requested review from SebastianKrupinski SebastianKrupinski is a code owner

Assignees

@kesselb kesselb

Labels

3. to review Waiting for reviews bug feature: dav

Projects

None yet

Milestone

Nextcloud 29.0.13

Development

Successfully merging this pull request may close these issues.

7 participants

@kesselb @ChristophWurst @miaulalala @github-advanced-security @blizzz @Altahrim @icewind1991