mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

unicode: Fixed #4314 -- Allow non-ASCII characters in password strings.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-05-16 22:30:54 +00:00
parent d5946c5946
commit abba09c6d2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/auth/models.py
View File

@ -2,6 +2,7 @@ from django.core import validators
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db import backend, connection, models from django.db import backend, connection, models
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.utils.encoding import smart_str
from django.utils.translation import ugettext_lazy, ugettext as _ from django.utils.translation import ugettext_lazy, ugettext as _
import datetime import datetime
import urllib import urllib
@ -14,16 +15,16 @@ def check_password(raw_password, enc_password):
algo, salt, hsh = enc_password.split('$') algo, salt, hsh = enc_password.split('$')
if algo == 'md5': if algo == 'md5':
import md5 import md5
return hsh == md5.new(salt+raw_password).hexdigest() return hsh == md5.new(smart_str(salt + raw_password)).hexdigest()
elif algo == 'sha1': elif algo == 'sha1':
import sha import sha
return hsh == sha.new(salt+raw_password).hexdigest() return hsh == sha.new(smart_str(salt + raw_password)).hexdigest()
elif algo == 'crypt': elif algo == 'crypt':
try: try:
import crypt import crypt
except ImportError: except ImportError:
raise ValueError, "Crypt password algorithm not supported in this environment." raise ValueError, "Crypt password algorithm not supported in this environment."
return hsh == crypt.crypt(raw_password, salt) return hsh == crypt.crypt(smart_str(raw_password), smart_str(salt))
raise ValueError, "Got unknown password algorithm type in password." raise ValueError, "Got unknown password algorithm type in password."
class SiteProfileNotAvailable(Exception): class SiteProfileNotAvailable(Exception):
@ -153,7 +154,7 @@ class User(models.Model):
import sha, random import sha, random
algo = 'sha1' algo = 'sha1'
salt = sha.new(str(random.random())).hexdigest()[:5] salt = sha.new(str(random.random())).hexdigest()[:5]
hsh = sha.new(salt+raw_password).hexdigest() hsh = sha.new(salt + smart_str(raw_password)).hexdigest()
self.password = '%s$%s$%s' % (algo, salt, hsh) self.password = '%s$%s$%s' % (algo, salt, hsh)
def check_password(self, raw_password): def check_password(self, raw_password):
@ -165,7 +166,7 @@ class User(models.Model):
# algorithm or salt. # algorithm or salt.
if '$' not in self.password: if '$' not in self.password:
import md5 import md5
is_correct = (self.password == md5.new(raw_password).hexdigest()) is_correct = (self.password == md5.new(smart_str(raw_password)).hexdigest())
if is_correct: if is_correct:
# Convert the password to the new, more secure format. # Convert the password to the new, more secure format.
self.set_password(raw_password) self.set_password(raw_password)