Skip to content

chore(dav): drop legacy v1 entrypoint #59377

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

Draft
skjnldsv wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

chore(dav): drop legacy v1 entrypoint #59377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e45bea
chore(dav): drop legacy v1 entrypoint
skjnldsv Apr 1, 2026
bdaec67
fix(ci): remove legacy webdav v1 endpoint from litmus matrix
Copilot Apr 1, 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
4 changes: 2 additions & 2 deletions .github/workflows/integration-litmus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fail-fast: false
matrix:
php-versions: ['8.2']
endpoint: ['webdav', 'dav']
endpoint: ['dav']

name: Litmus WebDAV ${{ matrix.endpoint }}

Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
ghcr.io/nextcloud/continuous-integration-litmus-php8.3:latest \
bash -c '\
cd /tmp/litmus/litmus-0.13;
make URL=http://host.docker.internal:8080/remote.php/${{ matrix.endpoint }}${{ matrix.endpoint == 'dav' && '/files/admin' || ''}} CREDS="admin admin" TESTS="basic copymove props largefile" check;
make URL=http://host.docker.internal:8080/remote.php/${{ matrix.endpoint }}/files/admin CREDS="admin admin" TESTS="basic copymove props largefile" check;
status=$?;
cat debug.log;
exit $status;'
Expand Down
132 changes: 0 additions & 132 deletions apps/dav/appinfo/v1/publicwebdav.php
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions apps/dav/appinfo/v1/webdav.php
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions apps/dav/lib/Connector/Sabre/ServerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ public function createServer(
Plugin $authPlugin,
callable $viewCallBack,
): Server {
// /public.php/webdav/ shows the files in the share in the root itself
// and not under /public.php/webdav/files/{token} so we should keep
// compatibility for that.
$needsSharesInRoot = $baseUri === '/public.php/webdav/';
$useCollection = $isPublicShare && !$needsSharesInRoot;
$useCollection = $isPublicShare;
$debugEnabled = $this->config->getSystemValue('debug', false);
[$tree, $rootCollection] = $this->getTree($useCollection);
$server = new Server($tree);
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/SetupChecks/WebdavEndpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getName(): string {

public function run(): SetupResult {
$urls = [
['propfind', '/remote.php/webdav', [207, 401]],
['propfind', '/remote.php/dav', [207, 401]],
];

foreach ($urls as [$verb,$url,$validStatuses]) {
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/tests/benchmarks/single_upload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ upload_file() {
-X PUT \
-k \
--limit-rate "${BANDWIDTH}k" \
--data-binary @"$file_local_path" "https://$USER:$PASS@$SERVER/remote.php/webdav/$file_remote_path"
--data-binary @"$file_local_path" "https://$USER:$PASS@$SERVER/remote.php/dav/files/$USER/$file_remote_path"
}
export -f upload_file

Expand Down
2 changes: 1 addition & 1 deletion apps/dav/tests/testsuits/litmus-v1/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ sleep 30

# run the tests
cd /tmp/litmus/litmus-0.13
make URL=http://127.0.0.1:8888/remote.php/webdav CREDS="admin admin" TESTS="basic copymove props largefile" check
make URL=http://127.0.0.1:8888/remote.php/dav/files/admin CREDS="admin admin" TESTS="basic copymove props largefile" check
3 changes: 1 addition & 2 deletions apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public function testHandleGetProperties(string $class, bool $expectedSuccessful)

public static function baseUriProvider(): array {
return [
['owncloud/remote.php/webdav/', 4567, 'owncloud/remote.php/dav/comments/files/4567'],
['owncloud/remote.php/files/', 4567, 'owncloud/remote.php/dav/comments/files/4567'],
['owncloud/remote.php/dav/files/user0/', 4567, 'owncloud/remote.php/dav/comments/files/4567'],
['owncloud/wicked.php/files/', 4567, null]
];
}
Expand Down
24 changes: 12 additions & 12 deletions build/integration/capabilities_features/capabilities.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -31,7 +31,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | EMPTY |
Expand All @@ -51,7 +51,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | EMPTY |
| files_sharing | public@@@enabled | EMPTY |
| files_sharing | public@@@upload | EMPTY |
Expand All @@ -70,7 +70,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | EMPTY |
| files_sharing | public@@@upload | EMPTY |
Expand All @@ -90,7 +90,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -110,7 +110,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -130,7 +130,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -150,7 +150,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -171,7 +171,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -192,7 +192,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -214,7 +214,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand All @@ -236,7 +236,7 @@ Feature: capabilities
And fields of capabilities match with
| capability | path_to_element | value |
| core | pollinterval | 60 |
| core | webdav-root | remote.php/webdav |
| core | webdav-root | remote.php/dav |
| files_sharing | api_enabled | 1 |
| files_sharing | public@@@enabled | 1 |
| files_sharing | public@@@upload | 1 |
Expand Down
Loading
Loading