diff --git a/app/main/_blacklisted_passwords.py b/app/main/_commonly_used_passwords.py similarity index 99% rename from app/main/_blacklisted_passwords.py rename to app/main/_commonly_used_passwords.py index ecde9df21..f30052d77 100644 --- a/app/main/_blacklisted_passwords.py +++ b/app/main/_commonly_used_passwords.py @@ -1,4 +1,4 @@ -blacklisted_passwords = [ +commonly_used_passwords = [ 'govuknotify', 'GOVUKnotify', 'GOV.UK Notify', diff --git a/app/main/forms.py b/app/main/forms.py index 8884fdfa7..f75fe1f41 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -41,7 +41,7 @@ from wtforms.widgets import CheckboxInput, ListWidget from app import format_thousands from app.main.validators import ( - Blacklist, + CommonlyUsedPassword, CsvFileValidator, DoesNotStartWithDoubleZero, LettersNumbersFullStopsAndUnderscoresOnly, @@ -184,7 +184,7 @@ def password(label='Password'): return PasswordField(label, validators=[DataRequired(message='Cannot be empty'), Length(8, 255, message='Must be at least 8 characters'), - Blacklist(message='Choose a password that’s harder to guess')]) + CommonlyUsedPassword(message='Choose a password that’s harder to guess')]) class SMSCode(StringField): diff --git a/app/main/validators.py b/app/main/validators.py index d16092445..3bf5b19fe 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -9,18 +9,18 @@ from notifications_utils.recipients import ( from notifications_utils.sanitise_text import SanitiseSMS from wtforms import ValidationError -from app.main._blacklisted_passwords import blacklisted_passwords +from app.main._commonly_used_passwords import commonly_used_passwords from app.utils import Spreadsheet, is_gov_user -class Blacklist: +class CommonlyUsedPassword: def __init__(self, message=None): if not message: - message = 'Password is blacklisted.' + message = 'Password is in list of commonly used passwords.' self.message = message def __call__(self, form, field): - if field.data in blacklisted_passwords: + if field.data in commonly_used_passwords: raise ValidationError(self.message) diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py index 090f100fc..f9cc72419 100644 --- a/tests/app/main/views/test_register.py +++ b/tests/app/main/views/test_register.py @@ -150,7 +150,7 @@ def test_should_add_user_details_to_session( assert session['user_details']['email'] == email_address -def test_should_return_200_if_password_is_blacklisted( +def test_should_return_200_if_password_is_on_list_of_commonly_used_passwords( client, mock_get_user_by_email, mock_login,