carddav: fix contact encryption key selection (user key vs address key)#10
Open
haurucknde wants to merge 1 commit into
Open
carddav: fix contact encryption key selection (user key vs address key)#10haurucknde wants to merge 1 commit into
haurucknde wants to merge 1 commit into
Conversation
Unlock() returned only address keys in the key ring. However, Proton's web client encrypts and signs contacts using the user key (the master account key), not the address key. On accounts where the user key and address key differ — which is the case for all modern Proton accounts — contacts written via CardDAV cannot be decrypted by the Proton client, resulting in "The decryption of the encrypted content failed" errors. Unlock() now includes user keys in the returned key ring (user keys first, then address keys) and tracks the primary user key ID separately. The CardDAV handler encrypts and signs contact data using the primary user key, matching the behaviour of Proton's own clients.
5 tasks
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
1 participant
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.
Changes
Contact encryption key selection (user key vs address key)
Same root cause as emersion#157 and emersion#288:
Unlock()returned only address keys, but Proton's web UI decrypts contactswith the user key (master account key). On modern Proton accounts these differ,
causing "decryption of encrypted content failed" for all contacts written via CardDAV.
Fix:
Unlock()now includes user keys first in the key ring and tracks the primaryuser key ID. CardDAV handler encrypts/signs with the user key.
Testing