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.

Sign up for GitHub

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

Don't rely on device list being updated on invite/join for x-signing federation tests #1119

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+56 −4
Open

Don't rely on device list being updated on invite/join for x-signing federation tests #1119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 56 additions & 4 deletions tests/41end-to-end-keys/08-cross-signing.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,37 @@
})->then( sub {
matrix_invite_user_to_room( $user1, $user2, $room_id )
})->then( sub {
sync_until_user_in_device_list( $user1, $user2 );
await_sync_timeline_contains( $user1, $room_id, check => sub {
my ( $event ) = @_;

assert_json_keys( $event, qw( type content sender state_key ));
return unless $event->{type} eq "m.room.member";
return unless $event->{sender} eq $user1->user_id;
return unless $event->{state_key} eq $user2->user_id;

assert_json_keys( my $content = $event->{content}, qw( membership ));
$content->{membership} eq "invite" or
die "Expected invite membership";

return 1;
});
})->then( sub {
matrix_join_room( $user2, $room_id );
})->then( sub {
sync_until_user_in_device_list( $user1, $user2 );
await_sync_timeline_contains( $user1, $room_id, check => sub {
my ( $event ) = @_;

assert_json_keys( $event, qw( type content sender state_key ));
return unless $event->{type} eq "m.room.member";
return unless $event->{sender} eq $user2->user_id;
return unless $event->{state_key} eq $user2->user_id;

assert_json_keys( my $content = $event->{content}, qw( membership ));
$content->{membership} eq "join" or
die "Expected join membership";

return 1;
});
})->then( sub {
matrix_set_cross_signing_key( $user2, {
"auth" => {
Expand Down Expand Up @@ -647,11 +673,37 @@
})->then( sub {
matrix_invite_user_to_room( $user1, $user2, $room_id )
})->then( sub {
sync_until_user_in_device_list( $user1, $user2 );
await_sync_timeline_contains( $user1, $room_id, check => sub {
my ( $event ) = @_;

assert_json_keys( $event, qw( type content sender state_key ));
return unless $event->{type} eq "m.room.member";
return unless $event->{sender} eq $user1->user_id;
return unless $event->{state_key} eq $user2->user_id;

assert_json_keys( my $content = $event->{content}, qw( membership ));
$content->{membership} eq "invite" or
die "Expected ${\$user2->user_id} to have been invited";

return 1;
});
})->then( sub {
matrix_join_room( $user2, $room_id );
})->then( sub {
sync_until_user_in_device_list( $user1, $user2 );
await_sync_timeline_contains( $user1, $room_id, check => sub {
my ( $event ) = @_;

assert_json_keys( $event, qw( type content sender state_key ));
return unless $event->{type} eq "m.room.member";
return unless $event->{sender} eq $user2->user_id;
return unless $event->{state_key} eq $user2->user_id;

assert_json_keys( my $content = $event->{content}, qw( membership ));
$content->{membership} eq "join" or
die "Expected ${\$user2->user_id} to have joined";

return 1;
});
})->then( sub {
sign_json(
$device, secret_key => $self_signing_secret_key,
Expand Down