Skip to content

Fix "Event with an invalid signature in the send_join response should not cause room join to fail" #973

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

Merged
neilalexander merged 2 commits into from
Oct 14, 2020
Merged

Fix "Event with an invalid signature in the send_join response should not cause room join to fail" #973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ad03b
Fix "Event with an invalid signature in the send_join response should…
neilalexander Oct 14, 2020
f809e90
Indentation, again, damnit
neilalexander Oct 14, 2020
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
19 changes: 11 additions & 8 deletions tests/50federation/30room-join.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ sub assert_is_valid_pdu {
my $room_id = $room->room_id;

my $event = $room->create_and_insert_event(
sender => "\@test:$local_server_name",
sender => "$creator_id",
type => "test",
room_id => $room_id,
state_key => "",
Expand Down Expand Up @@ -1089,14 +1089,17 @@ sub assert_is_valid_pdu {

$body->{room_id} eq $room_id or
die "Expected room_id to be $room_id";
})->then(sub {
await_sync_timeline_contains( $user, $room_id, check => sub {
my ( $event ) = @_;

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

matrix_get_my_member_event( $user, $room_id )
})->then( sub {
my ( $event ) = @_;

assert_json_keys( $event->{content}, qw( membership ) );

Future->done(1);
Future->done(1);
});
}),
)
};
Expand Down