openinfra/refstack
Code Issues Proposed changes

Merge "Improve authentication alerts"

Browse Source
This commit is contained in:
Jenkins 2015-09-03 22:58:52 +00:00 committed by Gerrit Code Review
commit 78f0f2da7c
6 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
refstack-ui/app/app.js
View File

@ -26,12 +26,12 @@ refstackApp.config([
templateUrl: '/components/capabilities/capabilities.html',
controller: 'capabilitiesController'
}).
state('community_results', {
state('communityResults', {
url: '/community_results',
templateUrl: '/components/results/results.html',
controller: 'resultsController'
}).
state('user_results', {
state('userResults', {
url: '/user_results',
templateUrl: '/components/results/results.html',
controller: 'resultsController'
@ -45,6 +45,11 @@ refstackApp.config([
url: '/profile',
templateUrl: '/components/profile/profile.html',
controller: 'profileController'
}).
state('authFailure', {
url: '/auth_failure/:message',
templateUrl: '/components/home/home.html',
controller: 'authFailureController'
});
}
]);

17
refstack-ui/app/components/auth-failure/authFailureController.js Normal file
View File

@ -0,0 +1,17 @@
/**
* Refstack Auth Failure Controller
* This controller handles messages from Refstack API if user auth fails.
*/
var refstackApp = angular.module('refstackApp');
refstackApp.controller('authFailureController',
[
'$stateParams', '$state', 'raiseAlert',
function($stateParams, $state, raiseAlert) {
'use strict';
raiseAlert('danger', 'Authentication Failure:',
$stateParams.message);
$state.go('home');
}
]);

2
refstack-ui/app/components/results/resultsController.js
View File

@ -33,7 +33,7 @@ refstackApp.controller('resultsController',
/** The upload date upper limit to be used in filtering results. */
$scope.endDate = '';
$scope.isUserResults = $state.current.name === 'user_results';
$scope.isUserResults = $state.current.name === 'userResults';
$scope.pageHeader = $scope.isUserResults ?
'Private test results' : 'Community test results';
/**

1
refstack-ui/app/index.html
View File

@ -44,6 +44,7 @@
<script src="components/results/resultsController.js"></script>
<script src="components/results-report/resultsReportController.js"></script>
<script src="components/profile/profileController.js"></script>
<script src="components/auth-failure/authFailureController.js"></script>
<!-- Filters -->
<script src="shared/filters.js"></script>

10
refstack/api/controllers/auth.py
View File

@ -101,6 +101,10 @@ class AuthController(rest.RestController):
"signout": ["GET"]
}
def _auth_failure(self, message):
pecan.redirect(parse.urljoin(CONF.ui_url,
'/#/auth_failure/%s') % message)
@pecan.expose()
def signin(self):
"""Handle signin request."""
@ -138,17 +142,17 @@ class AuthController(rest.RestController):
session = api_utils.get_user_session()
if pecan.request.GET.get(const.OPENID_ERROR):
api_utils.delete_params_from_user_session([const.CSRF_TOKEN])
pecan.abort(401, pecan.request.GET.get(const.OPENID_ERROR))
self._auth_failure(pecan.request.GET.get(const.OPENID_ERROR))
if pecan.request.GET.get(const.OPENID_MODE) == 'cancel':
api_utils.delete_params_from_user_session([const.CSRF_TOKEN])
pecan.abort(401, 'Authentication canceled.')
self._auth_failure('Authentication canceled.')
session_token = session.get(const.CSRF_TOKEN)
request_token = pecan.request.GET.get(const.CSRF_TOKEN)
if request_token != session_token:
api_utils.delete_params_from_user_session([const.CSRF_TOKEN])
pecan.abort(401, 'Authentication is failed. Try again.')
self._auth_failure('Authentication failed. Please try again.')
api_utils.verify_openid_request(pecan.request)
user_info = {

48
refstack/tests/unit/test_api.py
View File

@ -412,7 +412,7 @@ class AuthControllerTestCase(BaseControllerTestCase):
self.config_fixture = config_fixture.Config()
self.CONF = self.useFixture(self.config_fixture).conf
self.CONF.set_override('app_dev_mode', True, 'api')
self.CONF.set_override('ui_url', '127.0.0.1')
self.CONF.set_override('ui_url', 'http://127.0.0.1')
@mock.patch('refstack.api.utils.get_user_session')
@mock.patch('pecan.redirect', side_effect=webob.exc.HTTPRedirection)
@ -420,7 +420,7 @@ class AuthControllerTestCase(BaseControllerTestCase):
mock_session = mock.MagicMock(**{const.USER_OPENID: 'foo@bar.org'})
mock_get_user_session.return_value = mock_session
self.assertRaises(webob.exc.HTTPRedirection, self.controller.signin)
mock_redirect.assert_called_with('127.0.0.1')
mock_redirect.assert_called_with('http://127.0.0.1')
@mock.patch('refstack.api.utils.get_user_session')
@mock.patch('pecan.redirect', side_effect=webob.exc.HTTPRedirection)
@ -434,8 +434,10 @@ class AuthControllerTestCase(BaseControllerTestCase):
@mock.patch('socket.gethostbyname', return_value='1.1.1.1')
@mock.patch('refstack.api.utils.get_user_session')
def test_signin_return_failed(self, mock_get_user_session, mock_socket):
self.mock_abort.side_effect = webob.exc.HTTPError
@mock.patch('pecan.redirect', side_effect=webob.exc.HTTPRedirection)
def test_signin_return_failed(self, mock_redirect,
mock_get_user_session,
mock_socket):
mock_session = mock.MagicMock(**{const.USER_OPENID: 'foo@bar.org',
const.CSRF_TOKEN: '42'})
mock_get_user_session.return_value = mock_session
@ -447,45 +449,51 @@ class AuthControllerTestCase(BaseControllerTestCase):
self.mock_request.environ['beaker.session'] = {
const.CSRF_TOKEN: 42
}
self.assertRaises(webob.exc.HTTPError, self.controller.signin_return)
self.mock_abort.assert_called_once_with(
401, self.mock_request.GET[const.OPENID_ERROR])
self.assertRaises(webob.exc.HTTPRedirection,
self.controller.signin_return)
mock_redirect.assert_called_once_with(
'http://127.0.0.1/#/auth_failure/foo is not bar!!!')
self.assertNotIn(const.CSRF_TOKEN,
self.mock_request.environ['beaker.session'])
self.mock_abort.reset_mock()
mock_redirect.reset_mock()
self.mock_request.environ['beaker.session'] = {
const.CSRF_TOKEN: 42
}
self.mock_request.GET = {
const.OPENID_MODE: 'cancel'
}
self.assertRaises(webob.exc.HTTPError, self.controller.signin_return)
self.mock_abort.assert_called_once_with(
401, 'Authentication canceled.')
self.assertRaises(webob.exc.HTTPRedirection,
self.controller.signin_return)
mock_redirect.assert_called_once_with(
'http://127.0.0.1/#/auth_failure/Authentication canceled.')
self.assertNotIn(const.CSRF_TOKEN,
self.mock_request.environ['beaker.session'])
self.mock_abort.reset_mock()
mock_redirect.reset_mock()
self.mock_request.environ['beaker.session'] = {
const.CSRF_TOKEN: 42
}
self.mock_request.GET = {}
self.assertRaises(webob.exc.HTTPError, self.controller.signin_return)
self.mock_abort.assert_called_once_with(
401, 'Authentication is failed. Try again.')
self.assertRaises(webob.exc.HTTPRedirection,
self.controller.signin_return)
mock_redirect.assert_called_once_with(
'http://127.0.0.1/#/auth_failure/'
'Authentication failed. Please try again.')
self.assertNotIn(const.CSRF_TOKEN,
self.mock_request.environ['beaker.session'])
self.mock_abort.reset_mock()
mock_redirect.reset_mock()
self.mock_request.environ['beaker.session'] = {
const.CSRF_TOKEN: 42
}
self.mock_request.GET = {const.CSRF_TOKEN: '24'}
self.mock_request.remote_addr = '1.1.1.1'
self.assertRaises(webob.exc.HTTPError, self.controller.signin_return)
self.mock_abort.assert_called_once_with(
401, 'Authentication is failed. Try again.')
self.assertRaises(webob.exc.HTTPRedirection,
self.controller.signin_return)
mock_redirect.assert_called_once_with(
'http://127.0.0.1/#/auth_failure/'
'Authentication failed. Please try again.')
self.assertNotIn(const.CSRF_TOKEN,
self.mock_request.environ['beaker.session'])
@ -519,7 +527,7 @@ class AuthControllerTestCase(BaseControllerTestCase):
const.CSRF_TOKEN: 42
}
self.assertRaises(webob.exc.HTTPRedirection, self.controller.signout)
mock_redirect.assert_called_with('127.0.0.1')
mock_redirect.assert_called_with('http://127.0.0.1')
self.assertNotIn(const.CSRF_TOKEN,
mock_request.environ['beaker.session'])