haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 07:08:55 +00:00
Code Issues Releases Wiki Activity

Modify user authentication.

Browse Source 
* Don't read user password from ccnet.
* Call ccnet rpc to validate user password.
This commit is contained in:
killing
2013-02-01 11:56:04 +08:00
parent 3fa5033c49
commit 99fe9d6ad9
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
base/accounts.py
View File

@@ -55,7 +55,6 @@ class UserManager(object):
user = User(emailuser.email) user = User(emailuser.email)
user.id = emailuser.id user.id = emailuser.id
user.password = emailuser.passwd
user.is_staff = emailuser.is_staff user.is_staff = emailuser.is_staff
user.is_active = emailuser.is_active user.is_active = emailuser.is_active
user.ctime = emailuser.ctime user.ctime = emailuser.ctime
@@ -122,9 +121,7 @@ class User(object):
if raw_password is None: if raw_password is None:
self.set_unusable_password() self.set_unusable_password()
else: else:
algo = 'sha1' self.password = '%s' % raw_password
hsh = get_hexdigest(algo, '', raw_password)
self.password = '%s' % hsh
def check_password(self, raw_password): def check_password(self, raw_password):
""" """
@@ -134,11 +131,11 @@ class User(object):
# Backwards-compatibility check. Older passwords won't include the # Backwards-compatibility check. Older passwords won't include the
# algorithm or salt. # algorithm or salt.
if '$' not in self.password: # if '$' not in self.password:
is_correct = (self.password == \ # is_correct = (self.password == \
get_hexdigest('sha1', '', raw_password)) # get_hexdigest('sha1', '', raw_password))
return is_correct # return is_correct
return check_password(raw_password, self.password) return (ccnet_threaded_rpc.validate_emailuser(self.username, raw_password) == 0)
def email_user(self, subject, message, from_email=None): def email_user(self, subject, message, from_email=None):
"Sends an e-mail to this User." "Sends an e-mail to this User."