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

Add tests for SSO + user interactive authentication. #845

Merged
merged 10 commits into from
Apr 17, 2020
Merged

Add tests for SSO + user interactive authentication. #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4be68cd
Add tests for SSO + user interactive authentication.
clokep Mar 30, 2020
1f6282f
Updates per changes to the Synapse PR.
clokep Apr 1, 2020
9727768
Basic review comments.
clokep Apr 1, 2020
275738e
Fix formatting.
clokep Apr 3, 2020
ef495d1
Use assert_json_list.
clokep Apr 3, 2020
f1c511a
Remove duplicated wait_for_cas_request function.
clokep Apr 3, 2020
99ad057
Move duplicated code to a function.
clokep Apr 3, 2020
f47494d
Update description of make_ticket_request function.
clokep Apr 9, 2020
cb5991e
Do not pass in a default value.
clokep Apr 9, 2020
80e01fb
Add comments about parameters of the wait_for_cas_request function.
clokep Apr 17, 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
76 changes: 9 additions & 67 deletions tests/10apidoc/12device_management.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sub matrix_delete_device {
}

test "GET /device/{deviceId}",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand All @@ -64,7 +64,7 @@ sub matrix_delete_device {
};

test "GET /device/{deviceId} gives a 404 for unknown devices",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand All @@ -78,7 +78,7 @@ sub matrix_delete_device {


test "GET /devices",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand Down Expand Up @@ -136,7 +136,7 @@ sub matrix_delete_device {
};

test "PUT /device/{deviceId} updates device fields",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand Down Expand Up @@ -172,7 +172,7 @@ sub matrix_delete_device {
};

test "PUT /device/{deviceId} gives a 404 for unknown devices",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand All @@ -188,7 +188,7 @@ sub matrix_delete_device {
};

test "DELETE /device/{deviceId}",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand Down Expand Up @@ -273,8 +273,8 @@ sub matrix_delete_device {
#
test "DELETE /device/{deviceId} requires UI auth user to match device owner",
requires => [
local_user_fixture( with_events => 0 ),
local_user_fixture( with_events => 0 ),
local_user_fixture(),
local_user_fixture(),
],

do => sub {
Expand Down Expand Up @@ -317,7 +317,7 @@ sub matrix_delete_device {


test "DELETE /device/{deviceId} with no body gives a 401",
requires => [ local_user_fixture( with_events => 0 ) ],
requires => [ local_user_fixture() ],

do => sub {
my ( $user ) = @_;
Expand All @@ -335,61 +335,3 @@ sub matrix_delete_device {
matrix_delete_device( $user, $DEVICE_ID, undef );
})->main::expect_http_401;
};


test "The deleted device must be consistent through an interactive auth session",
requires => [ local_user_fixture( with_events => 0 ) ],

do => sub {
my ( $user ) = @_;

my $DEVICE_ID = "login_device";
my $SECOND_DEVICE_ID = "second_device";

# Create two devices.
matrix_login_again_with_user(
$user,
device_id => $DEVICE_ID,
initial_device_display_name => "device display",
)->then( sub {
matrix_login_again_with_user(
$user,
device_id => $SECOND_DEVICE_ID,
initial_device_display_name => "device display",
)
})->then( sub {
# Initiate the interactive authentication session with the first device.
matrix_delete_device( $user, $DEVICE_ID, {} );
})->main::expect_http_401->then( sub {
my ( $resp ) = @_;

my $body = decode_json $resp->content;

log_if_fail( "Response to empty body", $body );

assert_json_keys( $body, qw( session params flows ));

# Continue the interactive authentication session (by providing
# credentials), but attempt to delete the second device.
matrix_delete_device( $user, $SECOND_DEVICE_ID, {
auth => {
type => "m.login.password",
user => $user->user_id,
password => $user->password,
session => $body->{session},
}
})->main::expect_http_403;
})->then( sub {
# The device delete was rejected (the device should still exist).
matrix_get_device( $user, $SECOND_DEVICE_ID );
})->then( sub {
my ( $device ) = @_;
assert_json_keys(
$device,
qw( device_id user_id display_name ),
);
assert_eq( $device->{device_id}, $SECOND_DEVICE_ID );
assert_eq( $device->{display_name}, "device display" );
Future->done( 1 );
});
};
Loading