The Wayback Machine - https://web.archive.org/web/20200714034626/https://github.com/matrix-org/matrix-js-sdk/pull/832
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 commented Feb 1, 2019

As per matrix-org/matrix-doc#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.

dbkr added 5 commits Jan 30, 2019
Start of cross-signing impl
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
dbkr added 8 commits Feb 1, 2019
because Travis and npm now have a thing where they combust if your
package-lock is out of sync
Lint
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 vector-im/riot-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
@lampholder lampholder mentioned this pull request Apr 9, 2019
5 of 11 tasks complete
@dbkr
Copy link
Member Author

dbkr commented Nov 15, 2019

Right, lots more stuff fixed - ptal!

@dbkr dbkr requested a review from jryans Nov 15, 2019
@jryans
jryans approved these changes Nov 15, 2019
Copy link
Member

jryans left a comment

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 Nov 15, 2019
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Typo
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
c+p fail
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
c+p fail
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
c+p fail
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 Nov 15, 2019
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
@dbkr dbkr force-pushed the dbkr/cross_signing branch from ca1bdaa to 04b57bb Nov 15, 2019
dbkr added 2 commits Nov 15, 2019
Not Just For Backups Anymore
@dbkr dbkr requested a review from jryans Nov 15, 2019
@jryans
jryans approved these changes Nov 15, 2019
Copy link
Member

jryans left a comment

🎉

@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
5 checks passed
5 checks passed
buildkite/matrix-js-sdk Build #699 passed (1 minute, 14 seconds)
Details
buildkite/matrix-js-sdk/docs Passed (1 minute, 2 seconds)
Details
buildkite/matrix-js-sdk/eslint-lint Passed (48 seconds)
Details
buildkite/matrix-js-sdk/karma-tests Passed (1 minute, 9 seconds)
Details
buildkite/matrix-js-sdk/pipeline Passed (2 seconds)
Details
@lampholder lampholder removed the phase:1 label Nov 18, 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 vector-im/riot-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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.