Migrate inbound sessions to cryptostore #587

dbkr · 2017-12-06T19:43:00Z

Same deal as usual, this time for inbound group sessions.

…ons_to_cryptostore

Apparently they are parsed at a different layer

richvdh · 2017-12-08T14:13:28Z

src/crypto/OlmDevice.js

+            'readwrite', [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS], (txn) => {
+                this._cryptoStore.countEndToEndInboundGroupSessions(txn, (count) => {
+                    if (count) {
+                        console.log(


I really think we might as well migrate IGSs. They ought to work fine.

richvdh · 2017-12-08T14:14:10Z

src/crypto/OlmDevice.js

+                        ++numIbSessions;
+                    }
+                    console.log(
+                        "Migrating " + numIbSessions +


s/migrating/migrated?

richvdh · 2017-12-08T14:14:36Z

src/crypto/OlmDevice.js

+                            );
+                        } catch (e) {
+                            console.warn(
+                                "Failed to import session " + s.senderKey + "/" +


can we say something like "failed to migrate" instead of "failed to import"? Import sounds like a different thing.

richvdh · 2017-12-08T14:15:59Z

src/crypto/OlmDevice.js

-    this._sessionStore.storeEndToEndInboundGroupSession(
-        senderCurve25519Key, sessionId, JSON.stringify(sessionData),
-    );
+OlmDevice.prototype._unpickleInboundGroupSession = function(sessionData, func) {


can haz doc?

oh alright then

richvdh · 2017-12-08T14:16:31Z

src/crypto/OlmDevice.js

 *
 * @param {string} roomId
 * @param {string} senderKey
 * @param {string} sessionId
+ * @param {*} txn Opaque transaction object from cryptoStore.doTxn()
 * @param {function(Olm.InboundGroupSession, InboundGroupSessionData): T} func


we no longer expect this to return a T

richvdh · 2017-12-08T14:16:40Z

src/crypto/OlmDevice.js

- * @return {null} the sessionId is unknown
- *
- * @return {T} result of func
- *
 * @private
 * @template {T}


this is dead now

richvdh · 2017-12-08T15:13:18Z

src/crypto/OlmDevice.js

-    }
+            // if we were given a room ID, check that the it matches the original one for the session. This stops
+            // the HS pretending a message was targeting a different room.
+            if (roomId !== null && roomId !== sessionData.room_id) {


why do we now check for null?

ah, because as part of the migration we ended up calling this not knowing (or caring) what room the session was for, so null skips the check. I totally neglected to document it - now fixed.

richvdh · 2017-12-08T15:23:07Z

src/crypto/store/indexeddb-crypto-store-backend.js

+            senderCurve25519Key, sessionId, session: sessionData,
+        });
+        addReq.onerror = () => {
+            abortWithException(txn, new Error("Inbound Session already exists"));


surely there are other reasons this can fail here?

true - have made the message a little more general

richvdh · 2017-12-08T15:24:14Z

src/crypto/store/indexeddb-crypto-store-backend.js

+            resolve();
+        };
+        txn.onerror = () => {
+            if (txn._mx_abortexception !== undefined) {


do we need this as well as the onabort?

Since in abortWithException, we may not always be able to abort the txn, this is to cover the cases where we can't, so the exception still gets thrown.

…ons_to_cryptostore

richvdh

looks good otherwise

richvdh · 2018-01-05T11:10:41Z

src/crypto/store/indexeddb-crypto-store-backend.js

@@ -324,6 +328,77 @@ export class Backend {
        objectStore.put({deviceKey, sessionId, session});
    }

+    // Inbound group sessions
+
+    countEndToEndInboundGroupSessions(txn, func) {


I think countEndToEndInboundGroupSessions is dead, and I'd be in favour of removing the impls.

[Full Changelog](matrix-org/matrix-js-sdk@v0.9.2...v0.10.0-rc.1) * Fix duplicated state events in timeline from peek [\matrix-org#630](matrix-org#630) * Create indexeddb worker when starting the store [\matrix-org#627](matrix-org#627) * Fix indexeddb logging [\matrix-org#626](matrix-org#626) * Don't do /keys/changes on incremental sync [\matrix-org#625](matrix-org#625) * Don't mark devicelist dirty unnecessarily [\matrix-org#623](matrix-org#623) * Cache the joined member count for a room state [\matrix-org#619](matrix-org#619) * Fix JS doc [\matrix-org#618](matrix-org#618) * Precompute push actions for state events [\matrix-org#617](matrix-org#617) * Fix bug where global "Never send to unverified..." is ignored [\matrix-org#616](matrix-org#616) * Intern legacy top-level 'membership' field [\matrix-org#615](matrix-org#615) * Don't synthesize RR for m.room.redaction as causes the RR to go missing. [\matrix-org#598](matrix-org#598) * Make Events create Dates on demand [\matrix-org#613](matrix-org#613) * Stop cloning events when adding to state [\matrix-org#612](matrix-org#612) * De-dup code: use the initialiseState function [\matrix-org#611](matrix-org#611) * Create sentinel members on-demand [\matrix-org#610](matrix-org#610) * Some more doc on how sentinels work [\matrix-org#609](matrix-org#609) * Migrate room encryption store to crypto store [\matrix-org#597](matrix-org#597) * add parameter to getIdentityServerUrl to strip the protocol for invites [\matrix-org#600](matrix-org#600) * Move Device Tracking Data to Crypto Store [\matrix-org#594](matrix-org#594) * Optimise pushprocessor [\matrix-org#591](matrix-org#591) * Set event error before emitting [\matrix-org#592](matrix-org#592) * Add event type for stickers [WIP] [\matrix-org#590](matrix-org#590) * Migrate inbound sessions to cryptostore [\matrix-org#587](matrix-org#587) * Disambiguate names if they contain an mxid [\matrix-org#588](matrix-org#588) * Check for sessions in indexeddb before migrating [\matrix-org#585](matrix-org#585) * Emit an event for crypto store migration [\matrix-org#586](matrix-org#586) * Supporting fixes For making UnknownDeviceDialog not pop up automatically [\matrix-org#575](matrix-org#575) * Move sessions to the crypto store [\matrix-org#584](matrix-org#584) * Change crypto store transaction API [\matrix-org#582](matrix-org#582) * Add some missed copyright notices [\matrix-org#581](matrix-org#581) * Move Olm account to IndexedDB [\matrix-org#579](matrix-org#579) * Fix logging of DecryptionErrors to be more useful [\matrix-org#580](matrix-org#580) * [BREAKING] Change the behaviour of the unverfied devices blacklist flag [\matrix-org#568](matrix-org#568) * Support set_presence=offline for syncing [\matrix-org#557](matrix-org#557) * Consider cases where the sender may not redact their own event [\matrix-org#556](matrix-org#556)

dbkr added 16 commits December 5, 2017 21:47

Migrate inbound group sessions to crypto store

0b4ef8d

Merge remote-tracking branch 'origin/develop' into dbkr/inbound_sessi…

bc99a9d

…ons_to_cryptostore

Add impl to localstorage & memory store

30e00d5

er, this isn't an object

b6330c3

Fix test (needs a cryptostore now)

e6dd573

lint

d92a77f

Unused var

0362e61

Much tedious linting

0dd8ffa

Fix exportInboundGroupSession

8da4821

Fix key export

0fffd64

lint

f80626a

Migrate inbound sessions from session store

0748c86

Missed txn

1414c24

Fix inbound group session migration

a1ddeea

Apparently they are parsed at a different layer

json encode before saving to localstorage

b0365f8

more linting

7188f17

dbkr changed the title ~~[WIP] Migrate inbound sessions to cryptostore~~ Migrate inbound sessions to cryptostore Dec 8, 2017

dbkr assigned richvdh Dec 8, 2017

richvdh reviewed Dec 8, 2017

View reviewed changes

richvdh assigned dbkr and unassigned richvdh Dec 8, 2017

dbkr added 9 commits December 8, 2017 19:06

Merge remote-tracking branch 'origin/develop' into dbkr/inbound_sessi…

e5086f2

…ons_to_cryptostore

Always migrate inbound group sessions

c43ccb8

Wording fix

e26ade0

Wording fix

fee90ba

jsdoc

124ab30

Fix doc

6f3d279

Update comment

b290ce7

Make error message more truthful

c856eb9

doc return

7a069c4

Merge remote-tracking branch 'origin/develop' into dbkr/inbound_sessi…

1568bb0

…ons_to_cryptostore

dbkr assigned richvdh and unassigned dbkr Jan 2, 2018

richvdh approved these changes Jan 5, 2018

View reviewed changes

richvdh assigned dbkr and unassigned richvdh Jan 5, 2018

Remove unused countEndToEndInboundGroupSessions

145c760

dbkr merged commit af4f05c into develop Jan 9, 2018

t3chguy deleted the dbkr/inbound_sessions_to_cryptostore branch May 10, 2022 14:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate inbound sessions to cryptostore #587

Migrate inbound sessions to cryptostore #587

dbkr commented Dec 6, 2017 •

edited

Loading

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh Dec 8, 2017

dbkr Jan 2, 2018 •

edited

Loading

richvdh Dec 8, 2017

dbkr Jan 2, 2018

richvdh left a comment

richvdh Jan 5, 2018

Migrate inbound sessions to cryptostore #587

Migrate inbound sessions to cryptostore #587

Conversation

dbkr commented Dec 6, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbkr Jan 2, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richvdh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbkr commented Dec 6, 2017 •

edited

Loading

dbkr Jan 2, 2018 •

edited

Loading