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.

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

when locking a file set If-Match header to ensure etag is correct #7595

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Dec 2, 2024

the file being locked may have been changed sinc the client synced it

so the server side file may have a modified etag. In such cases we do not want to lock the file and would rather sync the nex server changes before being able to lock the file

that would ensure that on client side the file being locked is matching teh state of teh file on server side and would prevent inadvertently overriding server changes

@mgallien mgallien added this to the 3.15.1 milestone Dec 2, 2024
@mgallien mgallien force-pushed the bugfix/reliableLockRequests branch 2 times, most recently from 8bd97d0 to 4192f71 Compare December 2, 2024 10:36
the file being locked may have been changed sinc the client synced it

so the server side file may have a modified etag. In such cases we do
not want to lock the file and would rather sync the nex server changes
before being able to lock the file

that would ensure that on client side the file being locked is matching
teh state of teh file on server side and would prevent inadvertently
overriding server changes

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/reliableLockRequests branch from 4192f71 to 52e78b3 Compare December 9, 2024 08:33
@mgallien mgallien enabled auto-merge December 9, 2024 08:34
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7595-52e78b3ecef41d86b251a075e75bdfaa67cc48e4-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link

sonarcloud bot commented Dec 9, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
63 New Code Smells (required ≤ 0)
E Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@mgallien mgallien merged commit d25846b into master Dec 9, 2024
13 of 16 checks passed
@mgallien mgallien deleted the bugfix/reliableLockRequests branch December 9, 2024 09:25
@mgallien
Copy link
Collaborator Author

mgallien commented Dec 9, 2024

/backport to stable-3.15

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants