Migrate room encryption store to crypto store #597

dbkr · 2018-01-22T17:33:26Z

Final cryptostore migration PR!

Based on #594 so probably want to get that merge before trying to review.

Doesn't do data migration yet

in localstorage and memory stores

…exeddb

richvdh · 2018-01-29T13:29:50Z

package.json

@@ -54,6 +54,7 @@
    "bluebird": "^3.5.0",
    "browser-request": "^0.3.3",
    "content-type": "^1.0.2",
+    "olm": "https://matrix.org/packages/npm/olm/olm-2.2.2.tgz",


olm was deliberately omitted here for some reason involving making it possible to do without it. the details currently escape me, but what is the reason for adding it?

bah, because npm now adds any package you install to package.json even if you don't specify --save.

richvdh · 2018-01-29T13:34:16Z

src/client.js

@@ -181,6 +182,11 @@ function MatrixClient(opts) {
    if (CRYPTO_ENABLED) {
        this.olmVersion = Crypto.getOlmVersion();
    }
+
+    // List of what rooms have encryption enabled: separate from crypto because


which rooms

richvdh · 2018-01-29T13:34:23Z

src/client.js

@@ -181,6 +182,11 @@ function MatrixClient(opts) {
    if (CRYPTO_ENABLED) {
        this.olmVersion = Crypto.getOlmVersion();
    }
+
+    // List of what rooms have encryption enabled: separate from crypto because
+    // we still want to know what rooms are encrypted even if crypto is disabled:


richvdh · 2018-01-29T13:34:32Z

src/client.js

+
+    // List of what rooms have encryption enabled: separate from crypto because
+    // we still want to know what rooms are encrypted even if crypto is disabled:
+    // we don't want to start sening unencrypted events to them.


richvdh · 2018-01-29T13:41:00Z

src/crypto/RoomList.js

+        this._cryptoStore = cryptoStore;
+        this._sessionStore = sessionStore;
+
+        // Object of roomId -> room e2e info object


could we document the shape of said object hereabouts?

have added that it's the body of the m.room.encryption object

richvdh · 2018-01-29T13:42:03Z

src/crypto/index.js

-                          "a change of config in " + roomId);
-            return;
-        }
+    const existingConfig = await this.getRoomEncryption(roomId);


given this seems to be the only place getRoomEncryption is used, any reason not to inline it?

richvdh · 2018-01-29T13:43:02Z

src/crypto/index.js

+ *
+ * @param {string} roomId The room ID to query
+ *
+ * @return {object} The current end-to-end encyption status, or null if


I don't really understand why you've made this async, but given you have, the return type is a promise

ah ok. I think the reason it's async was to match the rest of the crypto stuff which assumes it's going to be indexeddb backed. I'd also assumed that the Promise return type was implicit on an async function.

richvdh

lgtm

[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 7 commits January 22, 2018 15:48

Migrate e2e rooms to crypto store

c360dd1

Doesn't do data migration yet

Hopefully working migration

88a082a

Actually working migration

e720963

Use the right prefix function to remove prefix

e4de333

comment typo

81d54c7

remove debugging

ac659e8

Missed arg

3149958

dbkr assigned richvdh Jan 22, 2018

dbkr added 3 commits January 22, 2018 18:34

Remove unused function

e4ffc93

Doc param

d856285

lint

341371b

dbkr assigned dbkr and unassigned richvdh Jan 22, 2018

Implement correct function

1ba0e48

in localstorage and memory stores

dbkr assigned richvdh and unassigned dbkr Jan 22, 2018

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

fdf987f

…exeddb

richvdh requested changes Jan 29, 2018

View reviewed changes

richvdh assigned dbkr and unassigned richvdh Jan 29, 2018

dbkr added 7 commits January 31, 2018 17:30

Revert npm helpfully adding packages

022df1b

comment grammar

c0ca85f

more comment grammar

f1194b1

basically I just can't type

b6cd826

more doc

6f50c39

Correct return type

cf72052

inline fucntion that was only used once

cf19526

dbkr assigned richvdh and unassigned dbkr Jan 31, 2018

richvdh approved these changes Feb 5, 2018

View reviewed changes

richvdh assigned dbkr and unassigned richvdh Feb 5, 2018

dbkr merged commit 47dfb4b into develop Feb 6, 2018

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate room encryption store to crypto store #597

Migrate room encryption store to crypto store #597

dbkr commented Jan 22, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh Jan 29, 2018

dbkr Jan 31, 2018

richvdh left a comment

Migrate room encryption store to crypto store #597

Migrate room encryption store to crypto store #597

Conversation

dbkr commented Jan 22, 2018

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

richvdh left a comment

Choose a reason for hiding this comment