[stable35] fix: two regressions from the CoreQueryBuilder removal - #1281
Merged
Conversation
backportbot
Bot
requested review from
benjaminfrueh and
juliusknorr
as code owners
September 7, 2026 21:16
Since the CoreQueryBuilder removal, FileLock::import() expects database column names, but the controller feeds it the object itself when a lock is refused and the jsonSerialize() shape when an unlock is refused. Both 423 answers therefore died with a TypeError and the client saw a 500 with no lock in it. The same mismatch broke the remote lock read for federated shares, which passes its own array. Keep the lock as an object until the responder serializes it, and let import() accept the shape jsonSerialize() produces as well as the database one. Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Spotted by @benjaminfrueh in review. Making import() tolerant moved this value to the wrong field. The name a federated lock carries comes from the remote as free text, so it belongs in displayName, which is where the old 'owner' key put it. As 'userId' it left displayName empty, and the line below appends the host to it, so the web UI showed a lock owned by plain "@remotehost". It is also not a local user id. getOwner() feeds nc:lock-owner, which the frontend compares against the current user to decide whether to offer unlock, so a remote name that happened to match a local uid would have offered it wrongly. Nothing sets userId for a remote lock now, as before. Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
The command had no test at all. This drives it through CommandAdapter, the same wrapper the console registers it with, so the attribute-based signature is exercised as the runtime sees it. Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
benjaminfrueh
force-pushed
the
backport/1269/stable35
branch
from
September 7, 2026 21:37
1eb6558 to
de66797
Compare
benjaminfrueh
approved these changes
Sep 7, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport of PR #1269