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

Jump to bottom

Test that remote device list is refetched on leave/rejoin #793

Merged
merged 6 commits into from
Feb 6, 2020
Merged

Test that remote device list is refetched on leave/rejoin #793

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25459f7
Fix federation package to store rooms joined via client.
erikjohnston Jan 29, 2020
d6695ab
Test that remote device list is refetched on leave/rejoin
erikjohnston Jan 29, 2020
afe2ddd
Fix federation tests
erikjohnston Jan 30, 2020
ff5c2e2
Update tests/50federation/40devicelists.pl
erikjohnston Jan 31, 2020
40b523c
Add back v1 endpoint code
erikjohnston Feb 3, 2020
d953214
Fixup
erikjohnston Feb 6, 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
7 changes: 3 additions & 4 deletions lib/SyTest/Federation/Client.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,11 @@ sub join_room
$self->do_request_json(
method => "PUT",
hostname => $server_name,
uri => "/v1/send_join/$room_id/$event_id",
uri => "/v2/send_join/$room_id/$event_id",
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
content => $member_event,
)->then( sub {
my ( $join_body ) = @_;

# /v1/send_join has an extraneous [ 200, ... ] wrapper (see MSC1802)
$join_body = $join_body->[1];

my $room = SyTest::Federation::Room->new(
datastore => $store,
room_id => $room_id,
Expand All @@ -271,6 +268,8 @@ sub join_room

$room->insert_event( $member_event );

$store->{rooms_by_id}{ $room->room_id } = $room;

Future->done( $room );
});
});
Expand Down
5 changes: 4 additions & 1 deletion lib/SyTest/Federation/Datastore.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,10 @@ sub get_auth_chain_events
while( @event_ids ) {
my $event = $events_by_id{shift @event_ids};

my @auth_ids = map { $_->[0] } @{ $event->{auth_events} };
my $room = $self->get_room( $event->{room_id} ) or
croak "Unknown room $event->{room_id}";

my @auth_ids = @{ $room->event_ids_from_refs( $event->{auth_events} ) };

foreach my $id ( @auth_ids ) {
next if $events_by_id{$id};
Expand Down
4 changes: 4 additions & 0 deletions lib/SyTest/Federation/Room.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ sub insert_outlier_event

croak "Event not ref" unless ref $event;

my $event_id = $self->id_for_event( $event );

$self->{datastore}->put_event( $event_id, $event );

if( defined $event->{state_key} ) {
$self->{current_state}{ join "\0", $event->{type}, $event->{state_key} }
= $event;
Expand Down
14 changes: 13 additions & 1 deletion lib/SyTest/Federation/Server.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,13 @@ sub on_request_federation_v1_make_join
404, "Not found", [ Content_length => 0 ], "",
) );

my $room_version = $room->room_version;

Future->done( json => {
event => $room->make_join_protoevent(
user_id => $user_id,
),
room_version => "$room_version",
} );
}

Expand Down Expand Up @@ -308,7 +311,7 @@ sub on_request_federation_v2_send_join
my $event = $req->body_from_json;

my @auth_chain = $store->get_auth_chain_events(
map { $_->[0] } @{ $event->{auth_events} }
@{ $room->event_ids_from_refs( $event->{auth_events} ) }
);
my @state_events = $room->current_state_events;

Expand Down Expand Up @@ -477,6 +480,15 @@ sub on_request_federation_v1_send

# A PDU is an event
foreach my $event ( @{ $body->{pdus} } ) {
my $room = $self->{datastore}->get_room( $event->{room_id} );

if ( $room ) {
my $event_id = $room->id_for_event( $event );
$room->insert_event( $event );
} else {
warn "Unknown room ${ $event->{room_id} }"
}

next if $self->on_event( $event );

warn "TODO: Unhandled incoming event of type '$event->{type}'";
Expand Down
66 changes: 31 additions & 35 deletions tests/50federation/30room-join.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,14 @@ sub assert_is_valid_pdu {
my $local_server_name = $inbound_server->server_name;
my $datastore = $inbound_server->datastore;

my $room = SyTest::Federation::Room->new(
datastore => $datastore,
);

$room->create_initial_events(
server => $inbound_server,
my $room_alias = "#50fed-room-alias:$local_server_name";
my $room = $datastore->create_room(
creator => $creator_id,
alias => $room_alias,
);

my $room_id = $room->room_id;

my $room_alias = "#50fed-room-alias:$local_server_name";
$datastore->{room_aliases}{$room_alias} = $room_id;

my $await_request_send_join;

if( $versionprefix eq "v1" ) {
Expand All @@ -86,7 +80,18 @@ sub assert_is_valid_pdu {
# that 404 response from SyTest and that fallback mechanism to test that the
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
# homeserver can query the v1 endpoint, and correctly handles responses from
# it.
$await_request_send_join = $inbound_server->await_request_v1_send_join( $room_id );
$await_request_send_join = Future->needs_all(
$inbound_server->await_request_v2_send_join( $room_id )
->then( sub {
my ( $req, $room_id, $event_id ) = @_;
$req->respond( HTTP::Response->new(
404, "Not found", [ Content_length => 0 ], "",
) );

Future->done
}),
$inbound_server->await_request_v1_send_join( $room_id )
);
}
elsif( $versionprefix eq "v2" ) {
$await_request_send_join = $inbound_server->await_request_v2_send_join( $room_id );
Expand Down Expand Up @@ -811,19 +816,14 @@ sub assert_is_valid_pdu {
my $local_server_name = $inbound_server->server_name;
my $datastore = $inbound_server->datastore;

my $room = SyTest::Federation::Room->new(
datastore => $datastore,
);

$room->create_initial_events(
my $room_alias = "#no_create_event:$local_server_name";
my $room = $datastore->create_room(
creator => $creator_id,
alias => $room_alias,
);

my $room_id = $room->room_id;

my $room_alias = "#no_create_event:$local_server_name";
$datastore->{room_aliases}{$room_alias} = $room_id;

Future->needs_all(
$inbound_server->await_request_make_join( $room_id, $user->user_id )->then( sub {
my ( $req, $room_id, $user_id ) = @_;
Expand All @@ -839,10 +839,12 @@ sub assert_is_valid_pdu {
event => $proto,
} );

log_if_fail "make_join resp", $proto;

Future->done;
}),

$inbound_server->await_request_send_join( $room_id )->then( sub {
$inbound_server->await_request_v2_send_join( $room_id )->then( sub {
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
my ( $req, $room_id, $event_id ) = @_;

$req->method eq "PUT" or
Expand All @@ -859,11 +861,10 @@ sub assert_is_valid_pdu {
@auth_chain = grep { $_->{type} ne 'm.room.create' } @auth_chain;

$req->respond_json(
# /v1/send_join has an extraneous [200, ...] wrapper (see MSC1802)
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
my $response = [ 200, {
my $response = {
auth_chain => \@auth_chain,
state => [ $room->current_state_events ],
} ]
}
);

log_if_fail "send_join response", $response;
Expand Down Expand Up @@ -901,20 +902,16 @@ sub assert_is_valid_pdu {
my $local_server_name = $inbound_server->server_name;
my $datastore = $inbound_server->datastore;

my $room = SyTest::Federation::Room->new(
datastore => $datastore,
);

$room->create_initial_events(
my $room_alias = "#no_create_event:$local_server_name";
my $room = $datastore->create_room(
creator => $creator_id,
alias => $room_alias,

room_version => 'sytest-room-ver',
);

my $room_id = $room->room_id;

my $room_alias = "#inconsistent-room-ver:$local_server_name";
$datastore->{room_aliases}{$room_alias} = $room_id;

Future->needs_all(
$inbound_server->await_request_make_join( $room_id, $user->user_id )->then( sub {
my ( $req, $room_id, $user_id ) = @_;
Expand All @@ -933,7 +930,7 @@ sub assert_is_valid_pdu {
Future->done;
}),

$inbound_server->await_request_send_join( $room_id )->then( sub {
$inbound_server->await_request_v2_send_join( $room_id )->then( sub {
my ( $req, $room_id, $event_id ) = @_;

$req->method eq "PUT" or
Expand All @@ -943,15 +940,14 @@ sub assert_is_valid_pdu {
log_if_fail "send_join event", $event;

my @auth_chain = $datastore->get_auth_chain_events(
map { $_->[0] } @{ $event->{auth_events} }
@{ $room->event_ids_from_refs( $event->{auth_events} ) }
);

$req->respond_json(
# /v1/send_join has an extraneous [200, ...] wrapper (see MSC1802)
my $response = [ 200, {
my $response = {
auth_chain => \@auth_chain,
state => [ $room->current_state_events ],
} ]
}
);

log_if_fail "send_join response", $response;
Expand Down
113 changes: 113 additions & 0 deletions tests/50federation/40devicelists.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,119 @@
};


test "Server correctly resyncs when server leaves and rejoins a room",
requires => [ $main::INBOUND_SERVER, federated_rooms_fixture() ],

check => sub {
my ( $inbound_server, $user, $federated_user_id, $room ) = @_;

# At first the server shares a room with the federated user, who at that
# point has a single device. The server will then leave and then rejoin
# the room, in the mean time the federated user has added a device, but
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
# won't have poked the server as they didn't share a room.
#
# When the server rejoins the subsequent calls by clients to fetch keys
# should result in the server resyncing the device lists.
my $device_id1 = "random_device_id1";
my $device_id2 = "random_device_id2";

Future->needs_all(
$inbound_server->await_request_user_devices( $federated_user_id )
->then( sub {
my ( $req, undef ) = @_;

assert_eq( $req->method, "GET", 'request method' );

$req->respond_json( {
user_id => $federated_user_id,
stream_id => 1,
devices => [
{
device_id => $device_id1,
keys => { device_keys => {} },
},
],
} );
Future->done(1);
}),
do_request_json_for( $user,
method => "POST",
uri => "/r0/keys/query",
content => {
device_keys => {
$federated_user_id => [],
},
},
),
)->then( sub {
my ( $first, $content ) = @_;

log_if_fail "first query response", $content;

assert_json_keys( $content, "device_keys" );

my $device_keys = $content->{device_keys};
assert_json_keys( $device_keys, $federated_user_id );

my $alice_keys = $device_keys->{ $federated_user_id };
assert_json_keys( $alice_keys, ( $device_id1 ) );

matrix_leave_room( $user, $room->room_id )
})->then( sub {
matrix_join_room( $user, $room->room_id,
server_name => $inbound_server->server_name,
)
})->then( sub {
Future->needs_all(
$inbound_server->await_request_user_devices( $federated_user_id )
->then( sub {
my ( $req, undef ) = @_;

assert_eq( $req->method, "GET", 'request method' );

$req->respond_json( {
user_id => $federated_user_id,
stream_id => 1,
devices => [
{
device_id => $device_id1,
keys => { device_keys => {} },
},
{
device_id => $device_id2,
keys => { device_keys => {} },
},
],
} );
Future->done(1);
}),
do_request_json_for( $user,
method => "POST",
uri => "/r0/keys/query",
content => {
device_keys => {
$federated_user_id => [],
},
},
),
)
})->then( sub {
my ( $first, $content ) = @_;

log_if_fail "second query response", $content;

assert_json_keys( $content, "device_keys" );

my $device_keys = $content->{device_keys};
assert_json_keys( $device_keys, $federated_user_id );

my $alice_keys = $device_keys->{ $federated_user_id };
assert_json_keys( $alice_keys, ( $device_id1, $device_id2 ) );

Future->done( 1 )
});
};

test "Local device key changes get to remote servers with correct prev_id",
requires => [ local_user_fixtures( 2 ), $main::INBOUND_SERVER, federation_user_id_fixture(), room_alias_name_fixture() ],

Expand Down
1 change: 0 additions & 1 deletion tests/50federation/50no-deextrem-outliers.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
->on_done( sub {
my ( $pl_event_b ) = @_;
$pl_event_b_id = $room->id_for_event( $pl_event_b );
$room->insert_event( $pl_event_b );
}),
)->then( sub {
my %state_before_c = %{ $room->{current_state} };
Expand Down