fix: skip reserved keys from sync conflict #1065
Merged
Conversation
This file contains 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
gkc
requested changes
Jun 14, 2023
| // and do not require actions. Hence skipping from checking conflict resolution. | ||
| if (key.startsWith('publickey.') || | ||
| key.startsWith('shared_key.') || | ||
| key.contains('shared_key') || |
There was a problem hiding this comment.
Let's be a bit more precise - we should match on the key looking like either @alice:shared_key@bob or shared_key.alice@bob
There was a problem hiding this comment.
Modified the conditions as key.startsWith(RegExp('shared_key.+@.+|@.+shared_key@.+'))
gkc
requested changes
Jun 15, 2023
| // and do not require actions. Hence skipping from checking conflict resolution. | ||
| if (key.startsWith('publickey.') || | ||
| key.startsWith('shared_key.') || | ||
| key.startsWith(RegExp('shared_key.+@.+|@.+shared_key@.+')) || |
There was a problem hiding this comment.
shared_key.+@.+ will match shared_keyyyyyyy@alice
@.+shared_key@.+ will match @ssssssshared_key:phone.wavi@alice
There was a problem hiding this comment.
Updated the Regular expression and added unit tests.
gkc
added a commit
that referenced
this pull request
Jun 19, 2023
…keys during sync conflict checking)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
- How I did it
startsWith(shared_key)tocontains(shared_key)- How to verify it
- Description for the changelog