1
=== modified file 'django_project/settings_base.py'
2
--- django_project/settings_base.py	2015-06-30 21:39:29 +0000
3
+++ django_project/settings_base.py	2015-07-20 19:43:14 +0000
4
@@ -42,6 +42,8 @@
5
42
APP_SERVERS = []
42
APP_SERVERS = []
6
43
AUTHENTICATION_BACKENDS = [
43
AUTHENTICATION_BACKENDS = [
7
44
    'identityprovider.auth.LaunchpadBackend',
44
    'identityprovider.auth.LaunchpadBackend',
8
45
    # Once we debug LP: # 1476255, we should remove the ModelBackend
9
46
    # from this list
10
45
    'django.contrib.auth.backends.ModelBackend',
47
    'django.contrib.auth.backends.ModelBackend',
11
46
    'django_openid_auth.auth.OpenIDBackend',
48
    'django_openid_auth.auth.OpenIDBackend',
12
47
]
49
]
13
48
50
14
=== modified file 'src/identityprovider/login.py'
15
--- src/identityprovider/login.py	2015-07-01 15:16:55 +0000
16
+++ src/identityprovider/login.py	2015-07-20 19:43:14 +0000
17
@@ -1,5 +1,8 @@
18
1
# Copyright 2010-2013 Canonical Ltd.  This software is licensed under the
1
# Copyright 2010-2013 Canonical Ltd.  This software is licensed under the
19
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
20
3
21
4
import logging
22
5
23
3
from django.contrib import auth
6
from django.contrib import auth
24
4
from django.template.loader import render_to_string
7
from django.template.loader import render_to_string
25
5
from django.utils.translation import ugettext_lazy as _
8
from django.utils.translation import ugettext_lazy as _
26
@@ -12,6 +15,7 @@
27
12
from identityprovider.validators import ValidationError, get_password_validator
15
from identityprovider.validators import ValidationError, get_password_validator
28
13
16
29
14
LOGIN_INCORRECT = _('Incorrect email/password combination')
17
LOGIN_INCORRECT = _('Incorrect email/password combination')
30
18
logger = logging.getLogger(__name__)
31
15
19
32
16
20
33
17
class AuthenticationError(Exception):
21
class AuthenticationError(Exception):
34
@@ -71,6 +75,16 @@
35
71
75
36
72
        raise AuthenticationError(LOGIN_INCORRECT)
76
        raise AuthenticationError(LOGIN_INCORRECT)
37
73
77
38
78
    # Adding debug information for LP: #1476255
39
79
    # AttributeError: 'User' object has no attribute 'person_in_team'
40
80
    if not isinstance(account, Account):
41
81
        logger.warning(
42
82
            'authenticate_user: call to auth.authenticate returned a non '
43
83
            'Account instance (%s, id: %r, backend: %r) for email %r, '
44
84
            'and rpconfig %r.',
45
85
            account.__class__.__name__, getattr(account, 'id', None),
46
86
            getattr(account, 'backend', None), email, rpconfig)
47
87
48
74
    validate_policy = get_password_validator(account=account)
88
    validate_policy = get_password_validator(account=account)
49
75
    try:
89
    try:
50
76
        validate_policy(password)
90
        validate_policy(password)
51
77
91
52
=== modified file 'src/identityprovider/tests/test_admin.py'
53
--- src/identityprovider/tests/test_admin.py	2015-06-24 23:20:24 +0000
54
+++ src/identityprovider/tests/test_admin.py	2015-07-20 19:43:14 +0000
55
@@ -139,13 +139,22 @@
56
139
            'devices-INITIAL_FORMS': '0',
139
            'devices-INITIAL_FORMS': '0',
57
140
        }
140
        }
58
141
        parameters.update(kwargs)
141
        parameters.update(kwargs)
60
142
        r = self.client.post(change_view, parameters)
142
        response = self.client.post(change_view, parameters)
61
143
143
62
144
        if success:
144
        if success:
63
145
            status_code = response.status_code
64
146
            # If view returns with 200 on POST, it means the form has errors.
65
147
            if status_code == 200:
66
148
                self.assertEqual(response.context['errors'], [])
67
149
68
145
            # Any non-error status code would be fine here, but right now
150
            # Any non-error status code would be fine here, but right now
69
146
            # it redirects with a 302.
151
            # it redirects with a 302.
72
147
            self.assertEqual(r.status_code, 302)
152
            self.assertEqual(
73
148
        return r
153
                status_code, 302,
74
154
                'Response did not redirect as expected, response is: %s' %
75
155
                response)
76
156
77
157
        return response
78
149
158
79
150
    def test_account_change(self):
159
    def test_account_change(self):
80
151
        new_email = 'mark2@example.com'
160
        new_email = 'mark2@example.com'
81
152
161
82
=== modified file 'src/identityprovider/tests/test_models_account.py'
83
--- src/identityprovider/tests/test_models_account.py	2015-07-01 19:20:49 +0000
84
+++ src/identityprovider/tests/test_models_account.py	2015-07-20 19:43:14 +0000
85
@@ -1251,3 +1251,16 @@
86
1251
1251
87
1252
        self.assertIn('there was a security breach', str(ctx.exception))
1252
        self.assertIn('there was a security breach', str(ctx.exception))
88
1253
        self.assertEqual(ctx.exception.account, self.account)
1253
        self.assertEqual(ctx.exception.account, self.account)
89
1254
90
1255
    def test_non_account_instance(self):
91
1256
        mock_logger = self._apply_patch('identityprovider.login.logger')
92
1257
        user = User.objects.create_user(username='test', password='12345678')
93
1258
94
1259
        with self.assertRaises(AttributeError):
95
1260
            authenticate_user(user.username, '12345678')
96
1261
97
1262
        mock_logger.warning.assert_called_once_with(
98
1263
            'authenticate_user: call to auth.authenticate returned a non '
99
1264
            'Account instance (%s, id: %r, backend: %r) for email %r, and '
100
1265
            'rpconfig %r.', 'User', user.id,
101
1266
            'django.contrib.auth.backends.ModelBackend', 'test', None)
Reviewer	Date Requested	Status
Daniel Manrique (community)		Approve on 2015-07-20
Matt Goodall (community)	2015-07-20	Approve on 2015-07-20
Review via email: mp+265286@code.launchpad.net