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

Check that master key is returned when querying device for first time #1166

Merged
merged 5 commits into from
Nov 11, 2021

Conversation

erikjohnston
Copy link
Member

@erikjohnston erikjohnston requested a review from a team November 3, 2021 09:30
@anoadragon453
Copy link
Member

There seem to be a mix of tabs vs. spaces going on here.

@erikjohnston
Copy link
Member Author

There seem to be a mix of tabs vs. spaces going on here.

WHY WOULD YOU DO THIS TO ME VIM WHY 😭

@@ -241,7 +241,7 @@ sub configure_logger

loggers => {
synapse => {
level => "INFO"
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this just for temporary debugging?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh blast, I carefully didn't add this, and then clearly did a git commit -a.

@DMRobertson DMRobertson requested a review from a team November 3, 2021 13:06
@DMRobertson
Copy link
Contributor

DMRobertson commented Nov 3, 2021

@erikjohnston
Copy link
Member Author

/me waits to see how else he has messed up this PR

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Seems reasonable; one question

Comment on lines +664 to +667
assert_json_keys( $content->{master_keys}, $user2_id );
assert_json_keys( $content->{master_keys}->{$user2_id}, "keys");
assert_json_keys( $content->{master_keys}->{$user2_id}{keys},
"ed25519:nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unI9kDYcHwk");
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we also expect to see this in the second call to matrix_get_e2e_keys on +685?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes we should. I suppose its worth checking that its still there

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Thanks!

@erikjohnston erikjohnston merged commit 491d3fe into develop Nov 11, 2021
@erikjohnston erikjohnston deleted the erikj/e2e_cross_signing branch November 11, 2021 11:50
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.

3 participants