client: prevent duplicate secrets when updating imported items - #578
Merged
bilelmoussaoui merged 2 commits intoSep 25, 2026
Merged
bilelmoussaoui merged 2 commits into
bilelmoussaoui merged 2 commits into
Conversation
An imported secret can have a different content type from its update. Ignore that difference when finding the item to replace.
| let attributes = attributes.as_attributes(); | ||
| self.hashed_attributes.len() == attributes.len() && self.matches(&attributes, key) | ||
| // The secret's content type does not identify the item. | ||
| let mut attributes = attributes.as_attributes(); |
Collaborator
There was a problem hiding this comment.
Wouldn't it be simpler to have a new as_search_attributes and make it skip that attribute, avoiding the current clone?
Contributor
Author
There was a problem hiding this comment.
You're right. I pushed an update using as_search_attributes() for exact matching and removed the clone in the unlocked path. Thanks!
📊 Code Coverage Report
Coverage report generated by cargo-tarpaulin |
Collaborator
|
Thanks |
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.
Summary
Imported secrets can have a different content type from their updates. That difference prevented replacement and left a duplicate item.
Ignore
xdg:content-typewhen matching an item for replacement. All other attributes must still match exactly. Add file backend and D-Bus collection regressions.Testing
cargo fmt --all --checkandgit diff --checkpassed.