Skip to content

Comments

feat: add federated file locking#954

Merged
juliusknorr merged 1 commit intomainfrom
feat/federated-file-locking
Feb 5, 2026
Merged

feat: add federated file locking#954
juliusknorr merged 1 commit intomainfrom
feat/federated-file-locking

Conversation

@benjaminfrueh
Copy link
Contributor

@benjaminfrueh benjaminfrueh commented Jan 7, 2026 •
edited
Loading

Summary

Implements federated file locking, allowing locks to propagate between servers.

Changes

- Added OCS api endpoint to check locks by share token

  • Request locks using webdav propfind
  • Check remote locks before allowing file operations
  • Show hostname in lock display for remote locks (e.g. admin@nextcloud.local)

Fixes #896

Requires nextcloud/server#57914

@benjaminfrueh benjaminfrueh added enhancement New feature or request 3. to review labels Jan 7, 2026
@github-project-automation github-project-automation bot moved this to 🧭 Planning evaluation (don't pick) in 📝 Productivity team Jan 7, 2026
@benjaminfrueh benjaminfrueh force-pushed the feat/federated-file-locking branch 2 times, most recently from 421fdea to 1fbdd05 Compare January 7, 2026 20:40
juliusknorr
juliusknorr reviewed Jan 8, 2026
View reviewed changes
juliusknorr
juliusknorr reviewed Jan 8, 2026
View reviewed changes
juliusknorr
juliusknorr reviewed Jan 8, 2026
View reviewed changes
@benjaminfrueh benjaminfrueh moved this from 🧭 Planning evaluation (don't pick) to 🏗️ In progress in 📝 Productivity team Jan 8, 2026
@max-nextcloud max-nextcloud removed their request for review January 8, 2026 19:21
@max-nextcloud
Copy link
Collaborator

max-nextcloud commented Jan 8, 2026

unassigning myself as a reviewer as I do not have time to look into this.

@github-actions
Copy link
Contributor

github-actions bot commented Jan 22, 2026

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@juliusknorr juliusknorr requested a review from samin-z January 22, 2026 08:52
samin-z
samin-z reviewed Jan 22, 2026
View reviewed changes
@benjaminfrueh benjaminfrueh marked this pull request as draft January 28, 2026 23:58
@benjaminfrueh benjaminfrueh force-pushed the feat/federated-file-locking branch from 17a6953 to ad0002b Compare January 29, 2026 16:03
@benjaminfrueh benjaminfrueh marked this pull request as ready for review January 29, 2026 16:05
@benjaminfrueh benjaminfrueh moved this from 🏗️ In progress to 👀 In review in 📝 Productivity team Jan 29, 2026
@benjaminfrueh benjaminfrueh force-pushed the feat/federated-file-locking branch 2 times, most recently from f69eed0 to 2029c30 Compare January 29, 2026 16:23
@juliusknorr juliusknorr mentioned this pull request Jan 29, 2026
Merged
juliusknorr
juliusknorr reviewed Jan 29, 2026
View reviewed changes
juliusknorr
juliusknorr reviewed Jan 29, 2026
View reviewed changes
juliusknorr
juliusknorr reviewed Jan 29, 2026
View reviewed changes
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor comments

@benjaminfrueh
Copy link
Contributor Author

benjaminfrueh commented Jan 29, 2026

Some minor comments

Thank you for the feedback, I made changes accordingly.

@benjaminfrueh benjaminfrueh force-pushed the feat/federated-file-locking branch 2 times, most recently from b891482 to 3cdea3e Compare January 29, 2026 19:08
@benjaminfrueh
Copy link
Contributor Author

benjaminfrueh commented Jan 29, 2026

/backport to stable33

@benjaminfrueh
Copy link
Contributor Author

benjaminfrueh commented Jan 29, 2026

/backport to stable32

@benjaminfrueh @juliusknorr
feat: add federated file locking
b826403 
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>

fix: use ocp methods instead of sql queries and add path param for folder support

Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>

feat: request federated locks using webdav propfind

Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>

Update lib/Service/LockService.php

Co-authored-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: Benjamin Früh <134610227+benjaminfrueh@users.noreply.github.com>

refactor: rename propfind event and use first userfolder node directly

Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>

Apply suggestions from code review

Co-authored-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: Benjamin Früh <134610227+benjaminfrueh@users.noreply.github.com>
@benjaminfrueh benjaminfrueh force-pushed the feat/federated-file-locking branch from 3cdea3e to b826403 Compare January 30, 2026 11:34
@juliusknorr
Copy link
Member

juliusknorr commented Feb 5, 2026

The CI failure is unrelated, but should be checked separately

@juliusknorr juliusknorr merged commit 8ca9719 into main Feb 5, 2026
33 of 50 checks passed
@juliusknorr juliusknorr deleted the feat/federated-file-locking branch February 5, 2026 09:51
@github-project-automation github-project-automation bot moved this from 👀 In review to ☑️ Done in 📝 Productivity team Feb 5, 2026
This was referenced Feb 5, 2026
Open
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@samin-z samin-z Awaiting requested review from samin-z

Assignees

No one assigned

Labels

3. to review enhancement New feature or request feedback-requested

Projects

📝 Productivity team
Status: ☑️ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug]: Temporary files lock & federation

4 participants

@benjaminfrueh @max-nextcloud @juliusknorr @samin-z