diff options
Diffstat (limited to 'service/test')
| -rw-r--r-- | service/test/unit/resources/test_backup_account_resource.py | 45 | ||||
| -rw-r--r-- | service/test/unit/resources/test_login_resource.py | 51 | ||||
| -rw-r--r-- | service/test/unit/test_account_recovery.py | 33 | ||||
| -rw-r--r-- | service/test/unit/test_application.py | 49 | ||||
| -rw-r--r-- | service/test/unit/test_authentication.py | 1 |
5 files changed, 140 insertions, 39 deletions
diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py index 21ae5aab..e169062e 100644 --- a/service/test/unit/resources/test_backup_account_resource.py +++ b/service/test/unit/resources/test_backup_account_resource.py @@ -19,6 +19,7 @@ import os from mock import MagicMock, patch from twisted.trial import unittest from twisted.web.test.requesthelper import DummyRequest +from twisted.internet import defer from pixelated.resources.backup_account_resource import BackupAccountResource from test.unit.resources import DummySite @@ -27,7 +28,7 @@ from test.unit.resources import DummySite class TestBackupAccountResource(unittest.TestCase): def setUp(self): self.services_factory = MagicMock() - self.resource = BackupAccountResource(self.services_factory) + self.resource = BackupAccountResource(self.services_factory, MagicMock()) self.web = DummySite(self.resource) def test_get(self): @@ -41,3 +42,45 @@ class TestBackupAccountResource(unittest.TestCase): d.addCallback(assert_200_when_user_logged_in) return d + + @patch('pixelated.resources.backup_account_resource.AccountRecovery') + def test_post_updates_recovery_code(self, mock_account_recovery_init): + mock_account_recovery = MagicMock() + mock_account_recovery_init.return_value = mock_account_recovery + mock_account_recovery.update_recovery_code.return_value = defer.succeed("Success") + request = DummyRequest(['/backup-account']) + request.method = 'POST' + d = self.web.get(request) + + def assert_update_recovery_code_called(_): + mock_account_recovery_init.assert_called_with(self.resource._authenticator.bonafide_sesssion) + mock_account_recovery.update_recovery_code.assert_called() + + d.addCallback(assert_update_recovery_code_called) + return d + + @patch('pixelated.resources.backup_account_resource.AccountRecovery.update_recovery_code') + def test_post_returns_successfully(self, mock_update_recovery_code): + mock_update_recovery_code.return_value = defer.succeed("Success") + request = DummyRequest(['/backup-account']) + request.method = 'POST' + d = self.web.get(request) + + def assert_successful_response(_): + self.assertEqual(204, request.responseCode) + + d.addCallback(assert_successful_response) + return d + + @patch('pixelated.resources.backup_account_resource.AccountRecovery.update_recovery_code') + def test_post_returns_internal_server_error(self, mock_update_recovery_code): + mock_update_recovery_code.return_value = defer.fail(Exception) + request = DummyRequest(['/backup-account']) + request.method = 'POST' + d = self.web.get(request) + + def assert_successful_response(_): + self.assertEqual(500, request.responseCode) + + d.addCallback(assert_successful_response) + return d diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py index 733583a3..9f940bc6 100644 --- a/service/test/unit/resources/test_login_resource.py +++ b/service/test/unit/resources/test_login_resource.py @@ -16,7 +16,7 @@ import os -from mock import patch +from mock import patch, MagicMock from mockito import mock, when, any as ANY from twisted.cred.error import UnauthorizedLogin from twisted.internet import defer @@ -52,7 +52,7 @@ class TestLoginResource(unittest.TestCase): def setUp(self): self.services_factory = mock() self.portal = mock() - self.resource = LoginResource(self.services_factory, self.portal) + self.resource = LoginResource(self.services_factory, self.portal, authenticator=mock()) self.web = DummySite(self.resource) def test_children_resources_are_unauthorized_when_not_logged_in(self): @@ -170,7 +170,8 @@ class TestLoginPOST(unittest.TestCase): def setUp(self): self.services_factory = mock() self.provider = mock() - self.resource = LoginResource(self.services_factory, self.provider) + self.authenticator = MagicMock() + self.resource = LoginResource(self.services_factory, self.provider, authenticator=self.authenticator) self.web = DummySite(self.resource) self.request = DummyRequest(['']) @@ -185,10 +186,9 @@ class TestLoginPOST(unittest.TestCase): user_auth.uuid = 'some_user_uuid' self.user_auth = user_auth - @patch('pixelated.authentication.Authenticator.authenticate') @patch('twisted.web.util.redirectTo') @patch('pixelated.resources.session.PixelatedSession.is_logged_in') - def test_should_redirect_to_home_if_user_if_already_logged_in(self, mock_logged_in, mock_redirect, mock_authenticate): + def test_should_redirect_to_home_if_user_if_already_logged_in(self, mock_logged_in, mock_redirect): mock_logged_in.return_value = True when(self.services_factory).has_session(ANY()).thenReturn(True) mock_redirect.return_value = "mocked redirection" @@ -197,24 +197,23 @@ class TestLoginPOST(unittest.TestCase): def assert_redirected_to_home(_): mock_redirect.assert_called_once_with('/', self.request) - self.assertFalse(mock_authenticate.called) + self.assertFalse(self.authenticator.authenticate.called) d.addCallback(assert_redirected_to_home) return d @patch('pixelated.config.leap.BootstrapUserServices.setup') @patch('twisted.web.util.redirectTo') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_should_redirect_to_login_with_error_flag_when_login_fails(self, mock_authenticate, + def test_should_redirect_to_login_with_error_flag_when_login_fails(self, mock_redirect, mock_user_bootstrap_setup): - mock_authenticate.side_effect = UnauthorizedLogin() + self.authenticator.authenticate.side_effect = UnauthorizedLogin() mock_redirect.return_value = "mocked redirection" d = self.web.get(self.request) def assert_redirected_to_login(_): - mock_authenticate.assert_called_once_with(self.username, self.password) + self.authenticator.authenticate.assert_called_once_with(self.username, self.password) mock_redirect.assert_called_once_with('/login?auth-error', self.request) self.assertFalse(mock_user_bootstrap_setup.called) self.assertFalse(self.resource.get_session(self.request).is_logged_in()) @@ -223,14 +222,13 @@ class TestLoginPOST(unittest.TestCase): return d @patch('pixelated.config.leap.BootstrapUserServices.setup') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_successful_login_responds_interstitial(self, mock_authenticate, mock_user_bootstrap_setup): - mock_authenticate.return_value = self.user_auth + def test_successful_login_responds_interstitial(self, mock_user_bootstrap_setup): + self.authenticator.authenticate.return_value = self.user_auth d = self.web.get(self.request) def assert_interstitial_in_response(_): - mock_authenticate.assert_called_once_with(self.username, self.password) + self.authenticator.authenticate.assert_called_once_with(self.username, self.password) interstitial_js_in_template = '<script src="/public/interstitial.js"></script>' self.assertIn(interstitial_js_in_template, self.request.written[0]) @@ -238,9 +236,8 @@ class TestLoginPOST(unittest.TestCase): return d @patch('pixelated.config.leap.BootstrapUserServices.setup') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_successful_login_runs_user_services_bootstrap_when_interstitial_loaded(self, mock_authenticate, mock_user_bootstrap_setup): - mock_authenticate.return_value = self.user_auth + def test_successful_login_runs_user_services_bootstrap_when_interstitial_loaded(self, mock_user_bootstrap_setup): + self.authenticator.authenticate.return_value = self.user_auth d = self.web.get(self.request) @@ -251,9 +248,8 @@ class TestLoginPOST(unittest.TestCase): return d @patch('pixelated.config.leap.BootstrapUserServices.setup') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_successful_adds_cookies_to_indicate_logged_in_status_when_services_are_loaded(self, mock_authenticate, mock_user_bootstrap_setup): - mock_authenticate.return_value = self.user_auth + def test_successful_adds_cookies_to_indicate_logged_in_status_when_services_are_loaded(self, mock_user_bootstrap_setup): + self.authenticator.authenticate.return_value = self.user_auth irrelevant = None mock_user_bootstrap_setup.return_value = defer.succeed(irrelevant) @@ -266,9 +262,8 @@ class TestLoginPOST(unittest.TestCase): return d @patch('pixelated.resources.session.PixelatedSession.login_started') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_session_adds_login_started_status_after_authentication(self, mock_authenticate, mock_login_started): - mock_authenticate.return_value = self.user_auth + def test_session_adds_login_started_status_after_authentication(self, mock_login_started): + self.authenticator.authenticate.return_value = self.user_auth d = self.web.get(self.request) @@ -280,9 +275,8 @@ class TestLoginPOST(unittest.TestCase): @patch('pixelated.resources.session.PixelatedSession.login_successful') @patch('pixelated.config.leap.BootstrapUserServices.setup') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_session_adds_login_successful_status_when_services_setup_finishes(self, mock_authenticate, mock_user_bootstrap_setup, mock_login_successful): - mock_authenticate.return_value = self.user_auth + def test_session_adds_login_successful_status_when_services_setup_finishes(self, mock_user_bootstrap_setup, mock_login_successful): + self.authenticator.authenticate.return_value = self.user_auth mock_user_bootstrap_setup.return_value = defer.succeed(None) d = self.web.get(self.request) @@ -295,9 +289,8 @@ class TestLoginPOST(unittest.TestCase): @patch('pixelated.resources.session.PixelatedSession.login_error') @patch('pixelated.config.leap.BootstrapUserServices.setup') - @patch('pixelated.authentication.Authenticator.authenticate') - def test_session_adds_login_error_status_when_services_setup_gets_error(self, mock_authenticate, mock_user_bootstrap_setup, mock_login_error): - mock_authenticate.return_value = self.user_auth + def test_session_adds_login_error_status_when_services_setup_gets_error(self, mock_user_bootstrap_setup, mock_login_error): + self.authenticator.authenticate.return_value = self.user_auth mock_user_bootstrap_setup.return_value = defer.fail(Exception('Could not setup user services')) d = self.web.get(self.request) diff --git a/service/test/unit/test_account_recovery.py b/service/test/unit/test_account_recovery.py new file mode 100644 index 00000000..51ba3fd0 --- /dev/null +++ b/service/test/unit/test_account_recovery.py @@ -0,0 +1,33 @@ +# +# Copyright (c) 2017 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + +from twisted.internet.defer import inlineCallbacks +from twisted.trial import unittest + +from mock import patch, Mock + +from pixelated.account_recovery import AccountRecovery + + +class AccountRecoveryTest(unittest.TestCase): + + @inlineCallbacks + def test_update_recovery_code(self): + mock_session = Mock() + account_recovery = AccountRecovery(mock_session) + + yield account_recovery.update_recovery_code('ABC') + mock_session.update_recovery_code.assert_called_once_with('ABC') diff --git a/service/test/unit/test_application.py b/service/test/unit/test_application.py index 178bab22..a61489fb 100644 --- a/service/test/unit/test_application.py +++ b/service/test/unit/test_application.py @@ -19,6 +19,7 @@ from twisted.trial import unittest from leap.common.events import catalog as events from mock import patch, MagicMock, ANY import pixelated +from pixelated.authentication import Authenticator class ApplicationTest(unittest.TestCase): @@ -97,22 +98,23 @@ class ApplicationTest(unittest.TestCase): @patch('leap.common.events.client') @patch('pixelated.application.reactor') @patch('pixelated.application.services.Services') - def test_should_log_user_out_if_invalid_soledad_token(self, services_mock, reactor_mock, events_mock): + def test_that_start_user_agent_binds_to_ssl_if_ssl_options(self, services_mock, reactor_mock, _): + # FIXME patch something closer, instead of leap.common app_mock = MagicMock() services_factory_mock = MagicMock() - - mock_service_log_user_out = MagicMock(return_value=None) - services_factory_mock.destroy_session = mock_service_log_user_out - leap_session = MagicMock() leap_session.fresh_account = False - register_mock = events_mock.register - register_mock.register.return_value = None + pixelated.application._ssl_options = lambda x, y: 'options' + + config = ApplicationTest.MockConfig(12345, '127.0.0.1', sslkey="sslkey", sslcert="sslcert") - config = ApplicationTest.MockConfig(12345, '127.0.0.1') d = pixelated.application.start_user_agent_in_single_user_mode(app_mock, services_factory_mock, config.home, leap_session) - pixelated.application.add_top_level_system_callbacks(d, services_factory_mock) + def _assert(_): + services_mock.assert_called_once_with(leap_session) + + d.addCallback(_assert) + return d def _assert_user_logged_out_using_uuid(_): used_arguments = register_mock.call_args[0] @@ -135,6 +137,27 @@ class ApplicationTest(unittest.TestCase): return d @patch('pixelated.application.reactor') + @patch('pixelated.application.services.Services') + def test_initialize_authenticator_in_single_user_mode(self, mock_services, _): + root_resources_mock = MagicMock() + services_factory_mock = MagicMock() + leap_session = MagicMock() + leap_session.fresh_account = False + + d = pixelated.application.start_user_agent_in_single_user_mode( + root_resources_mock, + services_factory_mock, + "", + leap_session) + + def assert_root_resource_initialize_called_with_authenticator(_): + authenticator = root_resources_mock.initialize.call_args[1]['authenticator'] + self.assertIsInstance(authenticator, Authenticator) + + d.addCallback(assert_root_resource_initialize_called_with_authenticator) + return d + + @patch('pixelated.application.reactor') @patch('pixelated.application._setup_multi_user') def test_should_defer_fail_errors_during_multi_user_start_site(self, mock_multi_user_bootstrap, reactor_mock): args_mock = MagicMock() @@ -170,3 +193,11 @@ class ApplicationTest(unittest.TestCase): d.addErrback(_assert_the_same_error_is_relayed_in_the_deferred) return d + + def test_set_up_protected_resources_initializes_authenticator(self): + mock_root_resource = MagicMock() + mock_provider = MagicMock() + pixelated.application.set_up_protected_resources(mock_root_resource, mock_provider, MagicMock()) + + authenticator = mock_root_resource.initialize.call_args[1]['authenticator'] + self.assertIsInstance(authenticator, Authenticator) diff --git a/service/test/unit/test_authentication.py b/service/test/unit/test_authentication.py index 8ef1bce8..7b260905 100644 --- a/service/test/unit/test_authentication.py +++ b/service/test/unit/test_authentication.py @@ -77,6 +77,7 @@ class AuthenticatorTest(unittest.TestCase): self.assertEquals('username', resulting_auth.username) self.assertEquals('some_token', resulting_auth.token) self.assertEquals('some_uuid', resulting_auth.uuid) + self.assertEquals(mock_srp_auth, auth.bonafide_sesssion) def test_username_without_domain_is_not_changed(self): username_without_domain = 'username' |