Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add CryptoApi.encryptToDeviceMessages() and deprecate Crypto.encryptAndSendToDevices() #4380

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from
Open

Add CryptoApi.encryptToDeviceMessages() and deprecate Crypto.encryptAndSendToDevices() #4380

wants to merge 23 commits into from
+522 −53

Conversation

hughns
Copy link
Member

@hughns hughns commented Sep 2, 2024 •
edited
Loading

Fixes #3304

  • Adds CryptoApi.encryptToDeviceMessages with rust and libolm implementations.
  • Deprecates Crypto.encryptAndSendToDevices.

Depends on matrix-org/matrix-rust-sdk-crypto-wasm#140 and #4396

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

@hughns
Add CryptoApi. encryptToDeviceMessages
ca07b18 
Deprecate Crypto. encryptAndSendToDevices and MatrixClient. encryptAndSendToDevices
@hughns hughns added T-Enhancement T-Deprecation A pull request that makes something deprecated labels Sep 2, 2024
@hughns hughns changed the title Add CryptoApi. encryptToDeviceMessages Implement MatrixClient.encryptAndSendToDevices for rust crypto and add CryptoApi.encryptToDeviceMessages Sep 2, 2024
@hughns hughns mentioned this pull request Sep 2, 2024
Open
@richvdh richvdh self-requested a review September 2, 2024 12:23
richvdh
richvdh reviewed Sep 2, 2024
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the right general direction to me

src/client.ts Outdated Show resolved Hide resolved
src/crypto-api/index.ts Outdated Show resolved Hide resolved
src/crypto-api/index.ts Outdated Show resolved Hide resolved
src/rust-crypto/rust-crypto.ts Outdated Show resolved Hide resolved
@hughns hughns changed the base branch from develop to hughns/matrix-sdk-crypto-wasm-8 September 9, 2024 09:58
@hughns hughns mentioned this pull request Sep 11, 2024
Closed
4 tasks
@hughns hughns changed the base branch from hughns/matrix-sdk-crypto-wasm-8 to develop September 18, 2024 08:55
@hughns hughns marked this pull request as ready for review October 7, 2024 14:11
@hughns hughns requested review from a team as code owners October 7, 2024 14:11
@hughns hughns mentioned this pull request Oct 7, 2024
Closed
4 tasks
richvdh
richvdh reviewed Oct 8, 2024
View reviewed changes
src/rust-crypto/rust-crypto.ts Outdated Show resolved Hide resolved
src/crypto-api/index.ts Outdated Show resolved Hide resolved
src/crypto-api/index.ts Outdated Show resolved Hide resolved
src/crypto-api/index.ts Outdated Show resolved Hide resolved
spec/unit/rust-crypto/rust-crypto.spec.ts Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to add an integration test in spec/integ/crypto that exercises the encryption without mocking out bits of OlmMachine. I'm aware that such things can be fiddly to get to work, though, so I won't insist.

@richvdh
Copy link
Member

richvdh commented Oct 8, 2024

BTW it looks like the description in the PR is a bit outdated -- could you give it a refresh?

@florianduros florianduros mentioned this pull request Oct 9, 2024
Closed
4 tasks
@hughns hughns changed the title Implement MatrixClient.encryptAndSendToDevices for rust crypto and add CryptoApi.encryptToDeviceMessages Add CryptoApi.encryptToDeviceMessages() and deprecate Crypto.encryptAndSendToDevices() Oct 11, 2024
@hughns
Copy link
Member Author

hughns commented Oct 22, 2024

@richvdh I've had a go at adding an integration test in a87a29f.

However, whilst it passes on libolm it doesn't pass on rust SDK. It appears that getMissingSessions() is always returning null. Any idea what might be happening or missing?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richvdh richvdh richvdh left review comments

@BillCarsonFr BillCarsonFr Awaiting requested review from BillCarsonFr BillCarsonFr is a code owner automatically assigned from matrix-org/element-crypto-web-reviewers

@florianduros florianduros Awaiting requested review from florianduros florianduros is a code owner automatically assigned from matrix-org/element-web-reviewers

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
T-Deprecation A pull request that makes something deprecated T-Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Element-R: wire up encryptAndSendToDevices
2 participants
@hughns @richvdh