-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
feat: Support deleting metadata from WebDAV #50852
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
build/integration/features/bootstrap/MetadataContext.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| <?php | ||
| /** | ||
| * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| use Behat\Behat\Context\Context; | ||
| use Behat\Step\Then; | ||
| use Behat\Step\When; | ||
| use PHPUnit\Framework\Assert; | ||
| use Sabre\DAV\Client as SClient; | ||
|
|
||
| require __DIR__ . '/../../vendor/autoload.php'; | ||
|
|
||
| class MetadataContext implements Context { | ||
| private string $davPath = '/remote.php/dav'; | ||
|
|
||
| public function __construct( | ||
| private string $baseUrl, | ||
| private array $admin, | ||
| private string $regular_user_password, | ||
| ) { | ||
| // in case of ci deployment we take the server url from the environment | ||
| $testServerUrl = getenv('TEST_SERVER_URL'); | ||
| if ($testServerUrl !== false) { | ||
| $this->baseUrl = substr($testServerUrl, 0, -5); | ||
| } | ||
| } | ||
|
|
||
| #[When('User :user sets the :metadataKey prop with value :metadataValue on :fileName')] | ||
| public function userSetsProp(string $user, string $metadataKey, string $metadataValue, string $fileName) { | ||
| $client = new SClient([ | ||
| 'baseUri' => $this->baseUrl, | ||
| 'userName' => $user, | ||
| 'password' => '123456', | ||
| 'authType' => SClient::AUTH_BASIC, | ||
| ]); | ||
|
|
||
| $body = '<?xml version="1.0"?> | ||
| <d:propertyupdate xmlns:d="DAV:" xmlns:nc="http://nextcloud.com/ns"> | ||
| <d:set> | ||
| <d:prop> | ||
| <nc:' . $metadataKey . '>' . $metadataValue . '</nc:' . $metadataKey . '> | ||
| </d:prop> | ||
| </d:set> | ||
| </d:propertyupdate>'; | ||
|
|
||
| $davUrl = $this->getDavUrl($user, $fileName); | ||
| $client->request('PROPPATCH', $this->baseUrl . $davUrl, $body); | ||
| } | ||
|
|
||
| #[When('User :user deletes the :metadataKey prop on :fileName')] | ||
| public function userDeletesProp(string $user, string $metadataKey, string $fileName) { | ||
| $client = new SClient([ | ||
| 'baseUri' => $this->baseUrl, | ||
| 'userName' => $user, | ||
| 'password' => '123456', | ||
| 'authType' => SClient::AUTH_BASIC, | ||
| ]); | ||
|
|
||
| $body = '<?xml version="1.0"?> | ||
| <d:propertyupdate xmlns:d="DAV:" xmlns:nc="http://nextcloud.com/ns"> | ||
| <d:remove> | ||
| <d:prop> | ||
| <nc:' . $metadataKey . '></nc:' . $metadataKey . '> | ||
| </d:prop> | ||
| </d:remove> | ||
| </d:propertyupdate>'; | ||
|
|
||
| $davUrl = $this->getDavUrl($user, $fileName); | ||
| $client->request('PROPPATCH', $this->baseUrl . $davUrl, $body); | ||
| } | ||
|
|
||
| #[Then('User :user should see the prop :metadataKey equal to :metadataValue for file :fileName')] | ||
| public function checkPropForFile(string $user, string $metadataKey, string $metadataValue, string $fileName) { | ||
| $client = new SClient([ | ||
| 'baseUri' => $this->baseUrl, | ||
| 'userName' => $user, | ||
| 'password' => '123456', | ||
| 'authType' => SClient::AUTH_BASIC, | ||
| ]); | ||
|
|
||
| $body = '<?xml version="1.0"?> | ||
| <d:propfind xmlns:d="DAV:" xmlns:nc="http://nextcloud.com/ns"> | ||
| <d:prop> | ||
| <nc:' . $metadataKey . '></nc:' . $metadataKey . '> | ||
| </d:prop> | ||
| </d:propfind>'; | ||
|
|
||
| $davUrl = $this->getDavUrl($user, $fileName); | ||
| $response = $client->request('PROPFIND', $this->baseUrl . $davUrl, $body); | ||
| $parsedResponse = $client->parseMultistatus($response['body']); | ||
|
|
||
| Assert::assertEquals($parsedResponse[$davUrl]['200']['{http://nextcloud.com/ns}' . $metadataKey], $metadataValue); | ||
| } | ||
|
|
||
| #[Then('User :user should not see the prop :metadataKey for file :fileName')] | ||
| public function checkPropDoesNotExistsForFile(string $user, string $metadataKey, string $fileName) { | ||
| $client = new SClient([ | ||
| 'baseUri' => $this->baseUrl, | ||
| 'userName' => $user, | ||
| 'password' => '123456', | ||
| 'authType' => SClient::AUTH_BASIC, | ||
| ]); | ||
|
|
||
| $body = '<?xml version="1.0"?> | ||
| <d:propfind xmlns:d="DAV:" xmlns:nc="http://nextcloud.com/ns"> | ||
| <d:prop> | ||
| <nc:' . $metadataKey . '></nc:' . $metadataKey . '> | ||
| </d:prop> | ||
| </d:propfind>'; | ||
|
|
||
| $davUrl = $this->getDavUrl($user, $fileName); | ||
| $response = $client->request('PROPFIND', $this->baseUrl . $davUrl, $body); | ||
| $parsedResponse = $client->parseMultistatus($response['body']); | ||
|
|
||
| Assert::assertEquals($parsedResponse[$davUrl]['404']['{http://nextcloud.com/ns}' . $metadataKey], null); | ||
| } | ||
|
|
||
| private function getDavUrl(string $user, string $fileName) { | ||
| return $this->davPath . '/files/' . $user . $fileName; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
| # SPDX-License-Identifier: AGPL-3.0-only | ||
| Feature: metadata | ||
|
|
||
| Scenario: Setting metadata works | ||
| Given user "user0" exists | ||
| When User "user0" uploads file with content "AAA" to "/test.txt" | ||
| And User "user0" sets the "metadata-files-live-photo" prop with value "metadata-value" on "/test.txt" | ||
| Then User "user0" should see the prop "metadata-files-live-photo" equal to "metadata-value" for file "/test.txt" | ||
|
|
||
| Scenario: Deleting metadata works | ||
| Given user "user0" exists | ||
| When User "user0" uploads file with content "AAA" to "/test.txt" | ||
| And User "user0" sets the "metadata-files-live-photo" prop with value "metadata-value" on "/test.txt" | ||
| And User "user0" deletes the "metadata-files-live-photo" prop on "/test.txt" | ||
| Then User "user0" should not see the prop "metadata-files-live-photo" for file "/test.txt" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.