Commit a8d0fc10 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #17944 -- Prevented an error in the user change page of the admin when... 

Fixed #17944 -- Prevented an error in the user change page of the admin when the content of the password field doesn't match the expected format. Thanks saxix for the report and initial patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1e28567e

django/contrib/auth/fixtures/authtestdata.json

+92 −38
Original line number Diff line number Diff line
@@ -52,5 +52,59 @@ 
            "email": "staffmember@example.com",

            "date_joined": "2006-12-17 07:03:31"

        }

    },

    {

        "pk": "4",

        "model": "auth.user",

        "fields": {

            "username": "empty_password",

            "first_name": "Empty",

            "last_name": "Password",

            "is_active": true,

            "is_superuser": false,

            "is_staff": false,

            "last_login": "2006-12-17 07:03:31",

            "groups": [],

            "user_permissions": [],

            "password": "",

            "email": "empty_password@example.com",

            "date_joined": "2006-12-17 07:03:31"

        }

    },

    {

        "pk": "5",

        "model": "auth.user",

        "fields": {

            "username": "unmanageable_password",

            "first_name": "Unmanageable",

            "last_name": "Password",

            "is_active": true,

            "is_superuser": false,

            "is_staff": false,

            "last_login": "2006-12-17 07:03:31",

            "groups": [],

            "user_permissions": [],

            "password": "$",

            "email": "unmanageable_password@example.com",

            "date_joined": "2006-12-17 07:03:31"

        }

    },

    {

        "pk": "6",

        "model": "auth.user",

        "fields": {

            "username": "unknown_password",

            "first_name": "Unknown",

            "last_name": "Password",

            "is_active": true,

            "is_superuser": false,

            "is_staff": false,

            "last_login": "2006-12-17 07:03:31",

            "groups": [],

            "user_permissions": [],

            "password": "foo$bar",

            "email": "unknown_password@example.com",

            "date_joined": "2006-12-17 07:03:31"

        }

    }

]

django/contrib/auth/forms.py

+9 −5
Original line number Diff line number Diff line
@@ -29,11 +29,15 @@ class ReadOnlyPasswordHashWidget(forms.Widget): 
        encoded = smart_str(encoded)



        if len(encoded) == 32 and '$' not in encoded:

            hasher = get_hasher('unsalted_md5')

            algorithm = 'unsalted_md5'

        else:

            algorithm = encoded.split('$', 1)[0]

            hasher = get_hasher(algorithm)



        try:

            hasher = get_hasher(algorithm)

        except ValueError:

            summary = "<strong>%s</strong>" % ugettext("Invalid password format or unknown hashing algorithm.")

        else:

            summary = ""

            for key, value in hasher.safe_summary(encoded).iteritems():

                summary += "<strong>%(key)s</strong>: %(value)s " % {"key": ugettext(key), "value": value}

django/contrib/auth/tests/forms.py

+19 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ class UserCreationFormTest(TestCase): 


    def test_success(self):

        # The success case.



        data = {

            'username': 'jsmith@example.com',

            'password1': 'test123',
@@ -236,6 +235,25 @@ class UserChangeFormTest(TestCase): 
        # Just check we can create it

        form = MyUserForm({})



    def test_bug_17944_empty_password(self):

        user = User.objects.get(username='empty_password')

        form = UserChangeForm(instance=user)

        # Just check that no error is raised.

        form.as_table()



    def test_bug_17944_unmanageable_password(self):

        user = User.objects.get(username='unmanageable_password')

        form = UserChangeForm(instance=user)

        # Just check that no error is raised.

        form.as_table()



    def test_bug_17944_unknown_password_algorithm(self):

        user = User.objects.get(username='unknown_password')

        form = UserChangeForm(instance=user)

        # Just check that no error is raised.

        form.as_table()





UserChangeFormTest = override_settings(USE_TZ=False)(UserChangeFormTest)