Skip to content
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

Public-files endpoint won't stream multistatus #39797

Merged
merged 4 commits into from
Feb 17, 2022
Merged

Public-files endpoint won't stream multistatus #39797

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
805e51b
Public-files endpoint won't stream multistatus
jvillafanez Feb 16, 2022
b249556
Add changelog entry
jvillafanez Feb 16, 2022
67cf0d8
Adjust acceptance test
jvillafanez Feb 16, 2022
1e19ed6
enable streaming only for the "files" subtree
jvillafanez Feb 17, 2022
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
2 changes: 1 addition & 1 deletion apps/dav/lib/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public function __construct(IRequest $request, $baseUri) {
OC::$server->getLazyRootFolder()
));

if ($this->isRequestForSubtree(['files', 'meta', 'trash-bin', 'public-files'])) {
jvillafanez marked this conversation as resolved.
Show resolved Hide resolved
if ($this->isRequestForSubtree(['files', 'meta', 'trash-bin'])) {
\Sabre\DAV\Server::$streamMultiStatus = true;
$this->server->addPlugin(new ViewOnlyPlugin(
OC::$server->getLogger()
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/39797
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: Fix wrong formatted XML in public-files dav endpoint

Previously, trying to perform a PROPFIND over the public-files endpoint
could cause an exception to be thrown, which would generate a wrong formatted
XML response. Now, the XML response is properly formatted and can be parsed
without problems.

https://github.com/owncloud/core/pull/39797
4 changes: 2 additions & 2 deletions tests/acceptance/features/webUIUpload/upload.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Feature: File Upload
And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/simple-folder/lorem.txt"
And user "Alice" has created a public link share with settings
| path | /simple-folder |
| permissions | read,update,create |
| permissions | change |
When the public accesses the last created public link using the webUI
And the user uploads overwriting file "lorem.txt" using the webUI and retries if the file is locked
Then file "lorem.txt" should be listed on the webUI
Expand All @@ -154,4 +154,4 @@ Feature: File Upload
| lorem.txt |
| lorem-big.txt |
And as "Alice" file "/simple-folder/lorem.txt" should exist
And as "Alice" file "/simple-folder/lorem-big.txt" should exist
And as "Alice" file "/simple-folder/lorem-big.txt" should exist