Skip to content

[stable31] fix(dav): do not list intermediate files #59856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
backportbot wants to merge 3 commits into
base: stable31
Choose a base branch
from
+16 −4
Open

[stable31] fix(dav): do not list intermediate files #59856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7adeca3
fix(dav): do not read intermediate uploads
susnux Apr 8, 2026
0b67a0f
fix(dav): do not list intermediate upload folders
susnux Apr 8, 2026
5eb2070
ci: make stable branch work
susnux Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/files-external-smb-kerberos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
with:
persist-credentials: false
repository: nextcloud/user_saml
ref: stable-6
path: apps/user_saml

- name: Install user_saml
Expand Down
13 changes: 12 additions & 1 deletion apps/dav/lib/Upload/ChunkingV2Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use OCP\Lock\ILockingProvider;
use Sabre\DAV\Exception\BadRequest;
use Sabre\DAV\Exception\InsufficientStorage;
use Sabre\DAV\Exception\MethodNotAllowed;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\PreconditionFailed;
use Sabre\DAV\ICollection;
Expand Down Expand Up @@ -68,14 +69,24 @@ public function __construct(ICacheFactory $cacheFactory) {
* @inheritdoc
*/
public function initialize(Server $server) {
$server->on('afterMethod:MKCOL', [$this, 'afterMkcol']);
$server->on('beforeMethod:GET', $this->beforeGet(...));
$server->on('beforeMethod:PUT', [$this, 'beforePut']);
$server->on('beforeMethod:DELETE', [$this, 'beforeDelete']);
$server->on('beforeMove', [$this, 'beforeMove'], 90);
$server->on('afterMethod:MKCOL', [$this, 'afterMkcol']);

$this->server = $server;
}

protected function beforeGet(RequestInterface $request) {
$sourceNode = $this->server->tree->getNodeForPath($request->getPath());
if (($sourceNode instanceof FutureFile) || ($sourceNode instanceof UploadFile)) {
throw new MethodNotAllowed('Reading intermediate uploads is not allowed');
}

return true;
}

/**
* @param string $path
* @param bool $createIfNotExists
Expand Down
1 change: 1 addition & 0 deletions apps/dav/lib/Upload/RootCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public function __construct(
private IUserSession $userSession,
) {
parent::__construct($principalBackend, $principalPrefix);
$this->disableListing = true;
}

/**
Expand Down
5 changes: 2 additions & 3 deletions apps/dav/lib/Upload/UploadHome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use OCP\Files\NotFoundException;
use OCP\IUserSession;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\MethodNotAllowed;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\ICollection;

Expand Down Expand Up @@ -44,9 +45,7 @@ public function getChild($name): UploadFolder {
}

public function getChildren(): array {
return array_map(function ($node) {
return new UploadFolder($node, $this->cleanupService, $this->getStorage());
}, $this->impl()->getChildren());
throw new MethodNotAllowed('Listing members of this collection is disabled');
}

public function childExists($name): bool {
Expand Down
Loading