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.

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

Cross Signing Support #832

Merged
merged 103 commits into from
Nov 15, 2019
Merged

Cross Signing Support #832

merged 103 commits into from
Nov 15, 2019

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Feb 1, 2019

As per matrix-org/matrix-spec-proposals#1756

There are also some things in here which will need speccing in addition to the MSC above (as it currently stands), most notably, putting the SSK & USK in the backup auth_data.

and restore them from the key backup.

NB. This has an interface change to restoreKeyBackup where I've
changed it to take a backupInfo rather than a version (this also
saves us re-fetching the backup metadata in the case of a passphrase
restore).
whenever we get the SSK, ie. when creating or restoring a backup
and verify our own against our locally stored private part
because Travis and npm now have a thing where they combust if your
package-lock is out of sync
or at least the rules that are consistent with the rest of our
codebase
This was causing all the cross-signing stuff to fail and was almost
certainly the cause of element-hq/element-web#8213
Sp we don't stop tracking our own
 * Put back babel-eslint for class-properties
 * Allow arrow functions without params

This makes the style more consistent with react-sdk.

NB. The line lengths are still inconsistent but it's not clear which
way to go on that yet.
@uhoreg uhoreg self-assigned this Apr 1, 2019
@dbkr
Copy link
Member Author

dbkr commented Nov 15, 2019

Right, lots more stuff fixed - ptal!

@dbkr dbkr requested a review from jryans November 15, 2019 12:43
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Hooray, looks great! 😁 I have left a few more comments, but I expect they can be addressed / deferred without another round of review.

src/client.js Outdated Show resolved Hide resolved
src/crypto/CrossSigning.js Outdated Show resolved Hide resolved
src/client.js Outdated Show resolved Hide resolved
src/client.js Outdated Show resolved Hide resolved
src/client.js Outdated Show resolved Hide resolved
src/crypto/CrossSigning.js Outdated Show resolved Hide resolved
src/crypto/CrossSigning.js Outdated Show resolved Hide resolved
src/crypto/Secrets.js Outdated Show resolved Hide resolved
src/crypto/Secrets.js Outdated Show resolved Hide resolved
src/crypto/index.js Outdated Show resolved Hide resolved
dbkr and others added 9 commits November 15, 2019 14:38
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
src/client.js Outdated Show resolved Hide resolved
dbkr and others added 3 commits November 15, 2019 14:56
@dbkr dbkr requested a review from jryans November 15, 2019 16:00
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

🎉

@dbkr dbkr changed the title Initial Cross Signing Support Cross Signing Support Nov 15, 2019
@dbkr dbkr merged commit ac91367 into develop Nov 15, 2019
dbkr added a commit that referenced this pull request Nov 18, 2019
#832 added
cross-signing checks for backup trust but we failed to merge in the
check for the the backup being trusted locally.

Fixes element-hq/element-web#11404
jryans added a commit that referenced this pull request Dec 6, 2019
Some variables were changed during the course of the initial cross-signing PR
(#832) without updating the
storage path to match, so we weren't storing / loading cross-signing info for
devices in the end.

This updates storage and loading to match where the data now lives in memory.
@jryans jryans added the phase:1 label Feb 10, 2020
@t3chguy t3chguy deleted the dbkr/cross_signing branch May 10, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants