Fix | Share room keys with dehydrated devices with rust stack #1858
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
|
I have been testing this PR against a local Web instance running on a synapse with |
BillCarsonFr
commented
Jun 6, 2024
| /** | ||
| The device keys per devices per users. | ||
| */ | ||
| @property (nonatomic) NSDictionary<NSString *, id> *deviceKeys; |
There was a problem hiding this comment.
In the existing MXKeysQueryResponse this was a MXUsersDevicesMap<MXDeviceInfo*> *deviceKeys
stefanceriu
approved these changes
Jun 6, 2024
uhoreg
approved these changes
Jun 6, 2024
| /** | ||
| Cross-signing keys per users. | ||
| */ | ||
| @property (nonatomic) NSDictionary<NSString*, MXCrossSigningInfo*> *crossSigningKeys; |
There was a problem hiding this comment.
How easy would it be to do the same thing to the cross-signing keys, because we'll have the same problem here. If it's easy, may as well do it while we're touching the code here.
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.
Pull Request Checklist
Fixes element-hq/element-ios#7795
The new MSC3814matrix-org/matrix-spec-proposals#3814 is introducing a new format for dehydrated devices (to get messages even if all your sessions are logged out).
As per the new format, the DeviceKey payload from a keys/query call now contains a new boolean field
dehydrated, that is used when computing the signature.The problem is that the SDK converts the http response to a JSON Model
MXKeysQueryResponseand this model was not aware of that field. As a consequence when passing back the response to rust viamarkRequestAsSentusingmodel.jsonString(), thedehydratedfield was dropped, thus the rust layer was refusing the device because the signature was invalid.First approach would be to add the
dehydratedfield to the model, but this is not very future proof as any new future field would cause the same problem.The rust crypto stack also just pass this payload and is not using it (the legacy stack neeeded the typed model).
Unfortunatly I cannot just modify the existing model to just use a generic Dictionnary because some parts of the sdk for the legacy crypto still needed it.
So I created a new
MXKeysQueryResponseRawalmost similar to the existingMXKeysQueryResponse, but that is not trying to convert the device info to a typed model. This is now used by the rust layer to query and pass back to the olm machine.