2020-03-19 10:49:40 +00:00
|
|
|
|
import pytest
|
2018-02-20 11:22:17 +00:00
|
|
|
|
from flask import url_for
|
2018-04-25 14:12:58 +01:00
|
|
|
|
|
2018-10-18 14:34:07 +01:00
|
|
|
|
from tests.conftest import (
|
|
|
|
|
|
SERVICE_ONE_ID,
|
|
|
|
|
|
normalize_spaces,
|
|
|
|
|
|
set_config,
|
|
|
|
|
|
url_for_endpoint_with_token,
|
|
|
|
|
|
)
|
2016-04-27 16:39:17 +01:00
|
|
|
|
|
2015-12-07 16:56:11 +00:00
|
|
|
|
|
2021-06-14 12:40:12 +01:00
|
|
|
|
@pytest.fixture
|
|
|
|
|
|
def mock_email_validated_recently(mocker):
|
|
|
|
|
|
return mocker.patch('app.main.views.two_factor.email_needs_revalidating', return_value=False)
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-10-09 11:42:46 +01:00
|
|
|
|
@pytest.mark.parametrize('request_url', ['two_factor_email_sent', 'revalidate_email_sent'])
|
2020-10-12 12:01:39 +01:00
|
|
|
|
@pytest.mark.parametrize('redirect_url', [None, f'/services/{SERVICE_ONE_ID}/templates'])
|
2020-10-09 11:41:24 +01:00
|
|
|
|
@pytest.mark.parametrize('email_resent, page_title', [
|
|
|
|
|
|
(None, 'Check your email'),
|
|
|
|
|
|
(True, 'Email resent')
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_two_factor_email_sent_page(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2020-10-09 11:41:24 +01:00
|
|
|
|
email_resent,
|
|
|
|
|
|
page_title,
|
2020-10-09 11:42:46 +01:00
|
|
|
|
redirect_url,
|
|
|
|
|
|
request_url
|
2020-10-09 11:41:24 +01:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
f'main.{request_url}',
|
|
|
|
|
|
next=redirect_url,
|
|
|
|
|
|
email_resent=email_resent,
|
|
|
|
|
|
)
|
2020-10-09 11:41:24 +01:00
|
|
|
|
|
|
|
|
|
|
assert page.h1.string == page_title
|
|
|
|
|
|
# there shouldn't be a form for updating mobile number
|
|
|
|
|
|
assert page.find('form') is None
|
|
|
|
|
|
resend_email_link = page.find('a', class_="govuk-link govuk-link--no-visited-state page-footer-secondary-link")
|
|
|
|
|
|
assert resend_email_link.text == 'Not received an email?'
|
|
|
|
|
|
assert resend_email_link['href'] == url_for('main.email_not_received', next=redirect_url)
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-10-09 11:42:21 +01:00
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
|
|
|
|
None,
|
2020-10-12 12:01:39 +01:00
|
|
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
2020-10-09 11:42:21 +01:00
|
|
|
|
])
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_render_two_factor_page(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user_by_email,
|
2020-10-09 11:42:21 +01:00
|
|
|
|
mocker,
|
|
|
|
|
|
redirect_url
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2017-02-03 12:07:21 +00:00
|
|
|
|
# TODO this lives here until we work out how to
|
|
|
|
|
|
# reassign the session after it is lost mid register process
|
2022-01-04 15:40:42 +00:00
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-01-27 18:10:45 +00:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=api_user_active)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.get('main.two_factor_sms', next=redirect_url)
|
|
|
|
|
|
|
2018-05-07 22:26:24 +01:00
|
|
|
|
assert page.select_one('main p').text.strip() == (
|
|
|
|
|
|
'We’ve sent you a text message with a security code.'
|
|
|
|
|
|
)
|
2019-11-01 10:43:01 +00:00
|
|
|
|
assert page.select_one('label').text.strip() == (
|
2018-05-07 22:57:18 +01:00
|
|
|
|
'Text message code'
|
|
|
|
|
|
)
|
2018-05-07 22:26:24 +01:00
|
|
|
|
assert page.select_one('input')['type'] == 'tel'
|
|
|
|
|
|
assert page.select_one('input')['pattern'] == '[0-9]*'
|
2015-12-07 16:56:11 +00:00
|
|
|
|
|
2020-10-09 11:42:21 +01:00
|
|
|
|
assert page.select_one(
|
|
|
|
|
|
'a:contains("Not received a text message?")'
|
|
|
|
|
|
)['href'] == url_for('main.check_and_resend_text_code', next=redirect_url)
|
|
|
|
|
|
|
2015-12-07 16:56:11 +00:00
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_login_user_and_should_redirect_to_next_url(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_user_by_email,
|
|
|
|
|
|
mock_check_verify_code,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-01-27 18:10:45 +00:00
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
next='/services/{}'.format(SERVICE_ONE_ID),
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for(
|
|
|
|
|
|
'main.service_dashboard',
|
|
|
|
|
|
service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
_external=True
|
|
|
|
|
|
),
|
2017-10-18 14:51:26 +01:00
|
|
|
|
)
|
2016-03-14 16:30:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
2020-01-27 18:10:45 +00:00
|
|
|
|
def test_should_send_email_and_redirect_to_info_page_if_user_needs_to_revalidate_email(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2020-01-27 18:10:45 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_check_verify_code,
|
|
|
|
|
|
mock_create_event,
|
|
|
|
|
|
mock_send_verify_code,
|
|
|
|
|
|
mocker
|
|
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
2020-01-27 18:10:45 +00:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=api_user_active)
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mocker.patch('app.main.views.two_factor.email_needs_revalidating', return_value=True)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
with client_request.session_transaction() as session:
|
2020-01-27 18:10:45 +00:00
|
|
|
|
session['user_details'] = {
|
|
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
next=f'/services/{SERVICE_ONE_ID}',
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for(
|
|
|
|
|
|
'main.revalidate_email_sent',
|
|
|
|
|
|
_external=True,
|
|
|
|
|
|
next=f'/services/{SERVICE_ONE_ID}'
|
|
|
|
|
|
),
|
2020-10-09 11:42:21 +01:00
|
|
|
|
)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
|
2020-01-27 18:10:45 +00:00
|
|
|
|
mock_send_verify_code.assert_called_with(api_user_active['id'], 'email', None, mocker.ANY)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_login_user_and_not_redirect_to_external_url(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_user_by_email,
|
|
|
|
|
|
mock_check_verify_code,
|
|
|
|
|
|
mock_get_services_with_one_service,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-01-27 18:10:45 +00:00
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
next='http://www.google.com',
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for('main.show_accounts_or_dashboard', _external=True)
|
|
|
|
|
|
)
|
2016-02-05 14:25:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
2020-03-19 10:49:40 +00:00
|
|
|
|
@pytest.mark.parametrize('platform_admin', (
|
|
|
|
|
|
True, False,
|
|
|
|
|
|
))
|
2018-03-19 16:38:57 +00:00
|
|
|
|
def test_should_login_user_and_redirect_to_show_accounts(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_user_by_email,
|
|
|
|
|
|
mock_check_verify_code,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2020-03-19 10:49:40 +00:00
|
|
|
|
platform_admin,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-03-19 10:49:40 +00:00
|
|
|
|
api_user_active['platform_admin'] = platform_admin
|
2020-01-27 18:10:45 +00:00
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for('main.show_accounts_or_dashboard', _external=True)
|
|
|
|
|
|
)
|
2015-12-08 12:36:54 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_return_200_with_sms_code_error_when_sms_code_is_wrong(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user_by_email,
|
|
|
|
|
|
mock_check_verify_code_code_not_found,
|
2020-01-27 18:10:45 +00:00
|
|
|
|
mocker
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-01-27 18:10:45 +00:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=api_user_active)
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
_data={'sms_code': '23456'},
|
|
|
|
|
|
_expected_status=200,
|
|
|
|
|
|
)
|
|
|
|
|
|
assert 'Code not found' in page.text
|
2015-12-31 13:16:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_login_user_when_multiple_valid_codes_exist(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_user_by_email,
|
|
|
|
|
|
mock_check_verify_code,
|
|
|
|
|
|
mock_get_services_with_one_service,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address']}
|
2020-01-27 18:10:45 +00:00
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
_data={'sms_code': '23456'},
|
|
|
|
|
|
_expected_status=302,
|
|
|
|
|
|
)
|
2016-02-23 15:45:19 +00:00
|
|
|
|
|
|
|
|
|
|
|
2021-06-11 18:09:28 +01:00
|
|
|
|
def test_two_factor_sms_should_set_password_when_new_password_exists_in_session(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
api_user_active,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_check_verify_code,
|
|
|
|
|
|
mock_get_services_with_one_service,
|
2017-02-20 14:55:28 +00:00
|
|
|
|
mock_update_user_password,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_active['id'],
|
|
|
|
|
|
'email': api_user_active['email_address'],
|
2017-02-03 12:07:21 +00:00
|
|
|
|
'password': 'changedpassword'}
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for('main.show_accounts_or_dashboard', _external=True),
|
|
|
|
|
|
)
|
2018-03-19 16:38:57 +00:00
|
|
|
|
|
2020-02-18 14:28:03 +00:00
|
|
|
|
mock_update_user_password.assert_called_once_with(
|
2021-08-17 16:43:35 +01:00
|
|
|
|
api_user_active['id'], 'changedpassword',
|
2020-02-18 14:28:03 +00:00
|
|
|
|
)
|
2017-02-15 14:56:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
2021-06-11 18:09:28 +01:00
|
|
|
|
def test_two_factor_sms_returns_error_when_user_is_locked(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-15 14:56:22 +00:00
|
|
|
|
api_user_locked,
|
|
|
|
|
|
mock_get_locked_user,
|
2017-02-28 14:41:31 +00:00
|
|
|
|
mock_check_verify_code_code_not_found,
|
2017-02-15 14:56:22 +00:00
|
|
|
|
mock_get_services_with_one_service
|
|
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
|
|
|
|
|
|
|
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-15 14:56:22 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_locked['id'],
|
|
|
|
|
|
'email': api_user_locked['email_address'],
|
2017-02-15 14:56:22 +00:00
|
|
|
|
}
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post(
|
|
|
|
|
|
'main.two_factor_sms',
|
|
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_status=200,
|
|
|
|
|
|
)
|
|
|
|
|
|
assert 'Code not found' in page.text
|
2016-06-06 14:46:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
2021-06-11 18:09:28 +01:00
|
|
|
|
def test_two_factor_sms_post_should_redirect_to_sign_in_if_user_not_in_session(
|
2021-05-14 11:20:56 +01:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2021-05-14 11:20:56 +01:00
|
|
|
|
client_request.post(
|
2021-05-14 19:15:12 +01:00
|
|
|
|
'main.two_factor_sms',
|
2021-05-14 11:20:56 +01:00
|
|
|
|
_data={'sms_code': '12345'},
|
|
|
|
|
|
_expected_redirect=url_for('main.sign_in', _external=True)
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2021-05-14 19:15:12 +01:00
|
|
|
|
@pytest.mark.parametrize('endpoint', ['main.two_factor_webauthn', 'main.two_factor_sms'])
|
2021-06-11 18:09:28 +01:00
|
|
|
|
def test_two_factor_endpoints_get_should_redirect_to_sign_in_if_user_not_in_session(
|
2021-05-14 11:20:56 +01:00
|
|
|
|
client_request,
|
|
|
|
|
|
endpoint,
|
|
|
|
|
|
):
|
|
|
|
|
|
client_request.get(
|
|
|
|
|
|
endpoint,
|
|
|
|
|
|
_expected_redirect=url_for('main.sign_in', _external=True)
|
|
|
|
|
|
)
|
2016-09-09 15:22:56 +01:00
|
|
|
|
|
|
|
|
|
|
|
2021-06-10 19:27:17 +01:00
|
|
|
|
def test_two_factor_webauthn_should_have_auth_signin_button(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2021-06-10 19:27:17 +01:00
|
|
|
|
platform_admin_user,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2021-06-10 19:27:17 +01:00
|
|
|
|
mock_get_user = mocker.patch('app.user_api_client.get_user', return_value=platform_admin_user)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
with client_request.session_transaction() as session:
|
2021-06-10 19:27:17 +01:00
|
|
|
|
session['user_details'] = {'id': platform_admin_user['id'], 'email': platform_admin_user['email_address']}
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.get('main.two_factor_webauthn')
|
2021-06-10 19:27:17 +01:00
|
|
|
|
|
|
|
|
|
|
button = page.select_one("button[data-module=authenticate-security-key]")
|
|
|
|
|
|
|
|
|
|
|
|
assert button.text.strip() == 'Check security key'
|
|
|
|
|
|
|
|
|
|
|
|
assert button.name == 'button'
|
|
|
|
|
|
mock_get_user.assert_called_once_with(platform_admin_user['id'])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_two_factor_webauthn_should_reject_non_webauthn_auth_users(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2021-06-10 19:27:17 +01:00
|
|
|
|
platform_admin_user,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2021-06-10 19:27:17 +01:00
|
|
|
|
platform_admin_user['auth_type'] = 'sms_auth'
|
|
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=platform_admin_user)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
with client_request.session_transaction() as session:
|
2021-06-10 19:27:17 +01:00
|
|
|
|
session['user_details'] = {'id': platform_admin_user['id'], 'email': platform_admin_user['email_address']}
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.get(
|
|
|
|
|
|
'main.two_factor_webauthn',
|
|
|
|
|
|
_expected_status=403,
|
|
|
|
|
|
)
|
2021-06-10 19:27:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
2021-06-11 18:09:28 +01:00
|
|
|
|
def test_two_factor_sms_should_activate_pending_user(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mocker,
|
|
|
|
|
|
api_user_pending,
|
|
|
|
|
|
mock_check_verify_code,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mock_create_event,
|
2017-11-09 12:30:12 +00:00
|
|
|
|
mock_activate_user,
|
2021-06-14 12:40:12 +01:00
|
|
|
|
mock_email_validated_recently,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2016-09-09 15:22:56 +01:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=api_user_pending)
|
|
|
|
|
|
mocker.patch('app.service_api_client.get_services', return_value={'data': []})
|
2022-01-04 15:40:42 +00:00
|
|
|
|
with client_request.session_transaction() as session:
|
2017-02-03 12:07:21 +00:00
|
|
|
|
session['user_details'] = {
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
|
'id': api_user_pending['id'],
|
|
|
|
|
|
'email_address': api_user_pending['email_address']
|
2017-02-03 12:07:21 +00:00
|
|
|
|
}
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post('main.two_factor_sms', _data={'sms_code': '12345'})
|
2017-02-03 12:07:21 +00:00
|
|
|
|
|
2017-11-09 12:30:12 +00:00
|
|
|
|
assert mock_activate_user.called
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
2020-05-04 12:27:51 +01:00
|
|
|
|
@pytest.mark.parametrize('extra_args, expected_encoded_next_arg', (
|
|
|
|
|
|
({}, ''),
|
|
|
|
|
|
({'next': 'https://example.com'}, '?next=https%3A%2F%2Fexample.com')
|
2020-05-04 12:37:05 +01:00
|
|
|
|
))
|
2020-05-04 12:27:51 +01:00
|
|
|
|
def test_valid_two_factor_email_link_shows_interstitial(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
valid_token,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
extra_args,
|
|
|
|
|
|
expected_encoded_next_arg,
|
|
|
|
|
|
):
|
|
|
|
|
|
mock_check_code = mocker.patch('app.user_api_client.check_verify_code')
|
|
|
|
|
|
encoded_token = valid_token.replace('%2E', '.')
|
|
|
|
|
|
token_url = url_for(
|
|
|
|
|
|
'main.two_factor_email_interstitial',
|
|
|
|
|
|
token=encoded_token,
|
|
|
|
|
|
**extra_args
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
# This must match the URL we put in the emails
|
|
|
|
|
|
assert token_url == f'/email-auth/{encoded_token}{expected_encoded_next_arg}'
|
|
|
|
|
|
|
|
|
|
|
|
client_request.logout()
|
|
|
|
|
|
page = client_request.get_url(token_url)
|
|
|
|
|
|
|
|
|
|
|
|
assert normalize_spaces(page.select_one('main .js-hidden').text) == (
|
|
|
|
|
|
'Sign in '
|
|
|
|
|
|
'Continue to dashboard'
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
form = page.select_one('form')
|
|
|
|
|
|
expected_form_id = 'use-email-auth'
|
|
|
|
|
|
assert 'action' not in form
|
|
|
|
|
|
assert form['method'] == 'post'
|
|
|
|
|
|
assert form['id'] == expected_form_id
|
2021-03-08 15:36:23 +00:00
|
|
|
|
assert page.select_one('main script').string.strip() == (
|
2020-05-04 12:27:51 +01:00
|
|
|
|
f'document.getElementById("{expected_form_id}").submit();'
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert mock_check_code.called is False
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
def test_valid_two_factor_email_link_logs_in_user(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
valid_token,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_services_with_one_service,
|
2018-05-02 10:27:01 +01:00
|
|
|
|
mocker,
|
|
|
|
|
|
mock_create_event,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
):
|
|
|
|
|
|
mocker.patch('app.user_api_client.check_verify_code', return_value=(True, ''))
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.post_url(
|
2018-10-18 14:34:07 +01:00
|
|
|
|
url_for_endpoint_with_token('main.two_factor_email', token=valid_token),
|
2022-01-04 15:40:42 +00:00
|
|
|
|
_expected_redirect=url_for('main.show_accounts_or_dashboard', _external=True)
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-10-09 11:41:47 +01:00
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
|
|
|
|
None,
|
2020-10-12 12:01:39 +01:00
|
|
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
2020-10-09 11:41:47 +01:00
|
|
|
|
])
|
2017-11-07 16:11:31 +00:00
|
|
|
|
def test_two_factor_email_link_has_expired(
|
2021-05-12 14:57:21 +01:00
|
|
|
|
notify_admin,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
valid_token,
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
mock_send_verify_code,
|
2020-10-09 11:41:47 +01:00
|
|
|
|
fake_uuid,
|
|
|
|
|
|
redirect_url
|
2017-11-07 16:11:31 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
2021-05-12 14:57:21 +01:00
|
|
|
|
with set_config(notify_admin, 'EMAIL_2FA_EXPIRY_SECONDS', -1):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post_url(
|
2020-10-09 11:41:47 +01:00
|
|
|
|
url_for_endpoint_with_token('main.two_factor_email', token=valid_token, next=redirect_url),
|
2022-01-04 15:40:42 +00:00
|
|
|
|
_follow_redirects=True,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
2019-01-15 16:32:26 +00:00
|
|
|
|
assert page.h1.text.strip() == 'The link has expired'
|
2020-10-09 11:41:47 +01:00
|
|
|
|
assert page.select_one('a:contains("Sign in again")')['href'] == url_for('main.sign_in', next=redirect_url)
|
|
|
|
|
|
|
2020-08-28 13:26:14 +01:00
|
|
|
|
assert mock_send_verify_code.called is False
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_two_factor_email_link_is_invalid(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request
|
2017-11-07 16:11:31 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2017-11-07 16:11:31 +00:00
|
|
|
|
token = 12345
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post(
|
|
|
|
|
|
'main.two_factor_email',
|
|
|
|
|
|
token=token,
|
|
|
|
|
|
_follow_redirects=True,
|
|
|
|
|
|
_expected_status=404,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|
2022-01-04 15:40:42 +00:00
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
assert normalize_spaces(
|
|
|
|
|
|
page.select_one('.banner-dangerous').text
|
|
|
|
|
|
) == "There’s something wrong with the link you’ve used."
|
2020-10-09 11:41:47 +01:00
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
2020-10-09 11:41:47 +01:00
|
|
|
|
@pytest.mark.parametrize('redirect_url', [
|
|
|
|
|
|
None,
|
2020-10-12 12:01:39 +01:00
|
|
|
|
f'/services/{SERVICE_ONE_ID}/templates',
|
2020-10-09 11:41:47 +01:00
|
|
|
|
])
|
2017-11-07 16:11:31 +00:00
|
|
|
|
def test_two_factor_email_link_is_already_used(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
valid_token,
|
2017-11-09 17:06:24 +00:00
|
|
|
|
mocker,
|
2020-10-09 11:41:47 +01:00
|
|
|
|
mock_send_verify_code,
|
|
|
|
|
|
redirect_url
|
2017-11-09 17:06:24 +00:00
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2017-11-07 16:11:31 +00:00
|
|
|
|
mocker.patch('app.user_api_client.check_verify_code', return_value=(False, 'Code has expired'))
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post_url(
|
2020-10-09 11:41:47 +01:00
|
|
|
|
url_for_endpoint_with_token('main.two_factor_email', token=valid_token, next=redirect_url),
|
2022-01-04 15:40:42 +00:00
|
|
|
|
_follow_redirects=True,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
2019-01-15 16:32:26 +00:00
|
|
|
|
assert page.h1.text.strip() == 'The link has expired'
|
2020-10-09 11:41:47 +01:00
|
|
|
|
assert page.select_one('a:contains("Sign in again")')['href'] == url_for('main.sign_in', next=redirect_url)
|
|
|
|
|
|
|
2020-08-28 13:26:14 +01:00
|
|
|
|
assert mock_send_verify_code.called is False
|
2019-01-15 16:32:26 +00:00
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
|
|
|
|
|
def test_two_factor_email_link_when_user_is_locked_out(
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
valid_token,
|
2017-11-09 17:06:24 +00:00
|
|
|
|
mocker,
|
|
|
|
|
|
mock_send_verify_code
|
2017-11-07 16:11:31 +00:00
|
|
|
|
):
|
2022-01-04 15:40:42 +00:00
|
|
|
|
client_request.logout()
|
2017-11-07 16:11:31 +00:00
|
|
|
|
mocker.patch('app.user_api_client.check_verify_code', return_value=(False, 'Code not found'))
|
|
|
|
|
|
|
2022-01-04 15:40:42 +00:00
|
|
|
|
page = client_request.post_url(
|
2018-10-18 14:34:07 +01:00
|
|
|
|
url_for_endpoint_with_token('main.two_factor_email', token=valid_token),
|
2022-01-04 15:40:42 +00:00
|
|
|
|
_follow_redirects=True,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
2019-01-15 16:32:26 +00:00
|
|
|
|
assert page.h1.text.strip() == 'The link has expired'
|
2020-08-28 13:26:14 +01:00
|
|
|
|
assert mock_send_verify_code.called is False
|
2019-01-15 16:32:26 +00:00
|
|
|
|
|
2017-11-07 16:11:31 +00:00
|
|
|
|
|
|
|
|
|
|
def test_two_factor_email_link_used_when_user_already_logged_in(
|
2021-12-31 12:08:14 +00:00
|
|
|
|
client_request,
|
2017-11-07 16:11:31 +00:00
|
|
|
|
valid_token
|
|
|
|
|
|
):
|
2021-12-31 12:08:14 +00:00
|
|
|
|
client_request.post_url(
|
|
|
|
|
|
url_for_endpoint_with_token('main.two_factor_email', token=valid_token),
|
|
|
|
|
|
_expected_redirect=url_for('main.show_accounts_or_dashboard', _external=True),
|
2017-11-07 16:11:31 +00:00
|
|
|
|
)
|