Merge lp:~maxiberta/canonical-identity-provider/improve-password-validation-ascii into lp:canonical-identity-provider/release

[Maximiliano Bertacchini]

Improve password placeholder and validation message to include the requirement of ascii encoding.

Screenshot: https://private-fileshare.canonical.com/~maxiberta/sso-login-pass-validation-error.png

[Jonathan Hartley (tartley)]

Looks good to me. One suggestion about wording of the error message, but approved regardless.

review: Approve

=== modified file 'src/api/v10/tests/test_forms.py'
--- src/api/v10/tests/test_forms.py	2018-10-16 21:41:53 +0000
+++ src/api/v10/tests/test_forms.py	2019-10-16 14:01:58 +0000
@@ -7,6 +7,7 @@
 
 from api.v10.forms import WebserviceCreateAccountForm
 from identityprovider.tests.utils import SSOBaseTestCase
+from identityprovider.validators import PASSWORD_ENCODING_ERROR
 
 
 class WebServiceCreateAccountFormTestCase(SSOBaseTestCase):
@@ -16,8 +17,7 @@
                 'remote_ip': '127.0.0.1'}
         form = WebserviceCreateAccountForm(data=data)
         self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors['password'][0],
-                         'Invalid characters in password')
+        self.assertEqual(form.errors['password'], [PASSWORD_ENCODING_ERROR])
 
     def test_default_platform(self):
         form = WebserviceCreateAccountForm()

=== modified file 'src/identityprovider/tests/test_forms.py'
--- src/identityprovider/tests/test_forms.py	2019-06-18 20:13:31 +0000
+++ src/identityprovider/tests/test_forms.py	2019-10-16 14:01:58 +0000
@@ -57,7 +57,7 @@
 from identityprovider.models.const import AccountStatus, EmailStatus
 from identityprovider.tests import DEFAULT_USER_PASSWORD
 from identityprovider.tests.utils import SSOBaseTestCase
-from identityprovider.validators import BasicValidator
+from identityprovider.validators import PASSWORD_ENCODING_ERROR, BasicValidator
 
 
 class ValidNameTestCase(TestCase):
@@ -261,8 +261,7 @@
         data = {'password': u'Ñandú'}
         form = self.get_form(data=data)
         self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors['password'][0],
-                         'Invalid characters in password')
+        self.assertEqual(form.errors['password'], [PASSWORD_ENCODING_ERROR])
 
     def test_short_password(self):
         data = {'password': u'abcdef'}
@@ -551,8 +550,7 @@
         data = {'password': u'changüí'}
         form = self.get_form(data=data)
         self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors['password'][0],
-                         'Invalid characters in password')
+        self.assertEqual(form.errors['password'], [PASSWORD_ENCODING_ERROR])
 
     def test_no_preferredemail(self):
         # replace preferredemail property

=== modified file 'src/identityprovider/validators.py'
--- src/identityprovider/validators.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/validators.py	2019-10-16 14:01:58 +0000
@@ -7,10 +7,13 @@
 from identityprovider.timeline_helpers import get_request_timing_function
 from identityprovider.utils import password_is_blacklisted
 
+PASSWORD_ENCODING_ERROR = _(
+    'Password must consist of lower or upper-case characters, digits, '
+    'spaces, or symbols in the ASCII encoding.')
 PASSWORD_POLICY_ERROR = _(
     'Password must be at least {min_length} characters long')
 PASSWORD_POLICY_HELP_TEXT = _(
-    'Password with at least {min_length} characters')
+    'Password with at least {min_length} characters (ASCII only)')
 CANONICAL_PASSWORD_POLICY_ERROR = _(
     "Password must consist of lower- and upper-case characters, and at "
     "least one digit."
@@ -62,7 +65,7 @@
             # ascii only!
             str(password)
         except UnicodeEncodeError:
-            raise ValidationError(_("Invalid characters in password"))
+            raise ValidationError(PASSWORD_ENCODING_ERROR)
         if password is None or len(password) < self.MIN_LENGTH:
             raise ValidationError(
                 PASSWORD_POLICY_ERROR.format(min_length=self.MIN_LENGTH))