Add support for pushing secrets and receiving secret pushes by uhoreg · Pull Request #6164 · matrix-org/matrix-rust-sdk

uhoreg · 2026-02-12T00:29:11Z

Pushing secrets allow devices to send secrets to other devices without waiting for a secret request.

Public API changes documented in changelogs (optional)

Signed-off-by:

codecov · 2026-02-12T00:39:41Z

Codecov Report

❌ Patch coverage is 86.13139% with 19 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.85%. Comparing base (1fc7b34) to head (5a1f80b).
⚠️ Report is 9 commits behind head on main.
✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
crates/matrix-sdk-sqlite/src/crypto_store.rs	86.99%	2 Missing and 14 partials ⚠️
crates/matrix-sdk-crypto/src/store/types.rs	50.00%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6164      +/-   ##
==========================================
- Coverage   89.87%   89.85%   -0.02%     
==========================================
  Files         378      378              
  Lines      103367   103473     +106     
  Branches   103367   103473     +106     
==========================================
+ Hits        92900    92976      +76     
- Misses       6898     6918      +20     
- Partials     3569     3579      +10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

codspeed-hq · 2026-02-12T00:50:57Z

Merging this PR will not alter performance

✅ 50 untouched benchmarks

_{Comparing uhoreg:secret_push (5a1f80b) with main (a65fec3)}

richvdh

A couple of initial thoughts.

crates/matrix-sdk-crypto/src/store/traits.rs

richvdh

also, needs more CHANGELOG.md

rather than a full `GossippedSecret` struct

uhoreg · 2026-03-19T19:51:40Z

I believe this is ready for re-review

richvdh

Various comments.

crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs

crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v104_to_v106.rs

crates/matrix-sdk-crypto/src/store/types.rs

crates/matrix-sdk-sqlite/migrations/crypto_store/017_add_new_secrets_inbox.sql

crates/matrix-sdk-sqlite/src/crypto_store.rs

crates/matrix-sdk-crypto/CHANGELOG.md

crates/matrix-sdk-crypto/src/gossiping/machine.rs

crates/matrix-sdk-crypto/src/types/events/secret_push.rs

crates/matrix-sdk-crypto/CHANGELOG.md

crates/matrix-sdk-crypto/src/gossiping/machine.rs

uhoreg · 2026-03-31T02:23:56Z

I messed up the latest commits, because I forgot to enable the feature flag when trying to build it, so it failed to build without me noticing. :( So I'll have to redo some of the latest commits.

uhoreg · 2026-03-31T19:28:39Z

Should be ready for re-review, though I'm going to have to work out the merge conflict (merge conflicts with db migrations are fun).

crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs

crates/matrix-sdk-sqlite/migrations/crypto_store/016_add_new_secrets_inbox.sql

crates/matrix-sdk-sqlite/src/crypto_store.rs

crates/matrix-sdk-crypto/src/gossiping/machine.rs

crates/matrix-sdk-crypto/src/store/integration_tests.rs

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Hubert Chathi <hubert@uhoreg.ca> Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

richvdh

lgtm other than the minor problems below

crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs

richvdh · 2026-04-02T10:08:03Z

crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs

+        // delete the db in case it was used in a previous run
+        let _ = Database::delete_by_name(&db_name).unwrap().await.unwrap();
+
+        // Given a DB with data in it as it was at v5


why v5, of all things?

because there was already a helper function for creating a v5 db

uhoreg · 2026-04-02T21:06:33Z

@richvdh can you mash the "Merge" button? I don't seem to have permissions to do so.

uhoreg requested review from a team as code owners February 12, 2026 00:29

uhoreg requested review from poljar and stefanceriu and removed request for a team February 12, 2026 00:29

uhoreg mentioned this pull request Feb 12, 2026

add bindings for secret pushing matrix-org/matrix-sdk-crypto-wasm#295

Draft

richvdh reviewed Feb 25, 2026

View reviewed changes

crates/matrix-sdk-crypto/src/store/traits.rs Outdated Show resolved Hide resolved

crates/matrix-sdk-crypto/src/store/traits.rs Outdated Show resolved Hide resolved

richvdh reviewed Feb 25, 2026

View reviewed changes

stefanceriu removed their request for review March 4, 2026 08:36

poljar removed their request for review March 11, 2026 10:39

uhoreg added 2 commits March 19, 2026 13:02

make secrets inbox store just the secret

fce94da

rather than a full `GossippedSecret` struct

add functionality to push secrets to verified devices

feb9c44

uhoreg force-pushed the secret_push branch from f0cfff6 to 14f4f79 Compare March 19, 2026 18:56

handle receiving pushed secrets

51fc07e

uhoreg force-pushed the secret_push branch from 14f4f79 to 51fc07e Compare March 19, 2026 19:07

uhoreg requested a review from richvdh March 19, 2026 19:51

richvdh requested changes Mar 23, 2026

View reviewed changes

uhoreg added 6 commits March 31, 2026 14:24

documentation and logging fixes as requested in PR review

bb48c4c

sqlite store fixes as requested in review

ce38263

remove unnecessary (de)serialization, as noted in review

862feac

use derivation, as noted in review

255ec9c

fix crypto store tests

1fe0e28

Merge branch 'main' into secret_push

cc7d6d6

uhoreg force-pushed the secret_push branch from 3bddaa7 to cc7d6d6 Compare March 31, 2026 19:24

uhoreg requested a review from richvdh March 31, 2026 19:28

richvdh requested changes Apr 1, 2026

View reviewed changes

uhoreg and others added 5 commits April 1, 2026 11:07

Apply suggestions from code review

7a6f717

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Hubert Chathi <hubert@uhoreg.ca> Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

add missing docs

805479a

Merge branch 'main' into secret_push

4c14335

fmt

c09c42b

fix storage of duplicate secrets

414ec1c

uhoreg requested a review from richvdh April 1, 2026 21:40

richvdh approved these changes Apr 2, 2026

View reviewed changes

fix function names and comments

5a1f80b

Conversation

uhoreg commented Feb 12, 2026

Uh oh!

codecov bot commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

codspeed-hq bot commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

uhoreg commented Mar 19, 2026

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

uhoreg commented Mar 31, 2026

Uh oh!

uhoreg commented Mar 31, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

uhoreg Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

uhoreg commented Apr 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov bot commented Feb 12, 2026 •

edited

Loading

codspeed-hq bot commented Feb 12, 2026 •

edited

Loading