[Web] Fix unable to change password
The hashlib update method requires bytes and raised a TypeError for salt passed as text. Added a test for auth change_password Fixes: #3262
This commit is contained in:
parent
5d7db3e727
commit
632089940c
|
@ -7,6 +7,7 @@
|
||||||
- Fix TypeError in Peers Tab setting country flag.
|
- Fix TypeError in Peers Tab setting country flag.
|
||||||
- Fix reverse proxy header TypeError (#3260).
|
- Fix reverse proxy header TypeError (#3260).
|
||||||
- Fix request.base 'idna' codec error (#3261).
|
- Fix request.base 'idna' codec error (#3261).
|
||||||
|
- Fix unable to change password (#3262).
|
||||||
|
|
||||||
### Documentation
|
### Documentation
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
|
||||||
|
# the additional special exception to link portions of this program with the OpenSSL library.
|
||||||
|
# See LICENSE for more details.
|
||||||
|
#
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from mock import patch
|
||||||
|
from twisted.trial import unittest
|
||||||
|
|
||||||
|
from deluge.ui.web import auth
|
||||||
|
|
||||||
|
|
||||||
|
class MockConfig(object):
|
||||||
|
def __init__(self, config):
|
||||||
|
self.config = config
|
||||||
|
|
||||||
|
def __getitem__(self, key):
|
||||||
|
return self.config[key]
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
self.config[key] = value
|
||||||
|
|
||||||
|
|
||||||
|
class WebAuthTestCase(unittest.TestCase):
|
||||||
|
@patch('deluge.ui.web.auth.JSONComponent.__init__', return_value=None)
|
||||||
|
def test_change_password(self, mock_json):
|
||||||
|
config = MockConfig(
|
||||||
|
{
|
||||||
|
'pwd_sha1': '8d8ff487626141d2b91025901d3ab57211180b48',
|
||||||
|
'pwd_salt': '7555d757710158655bd1646e207dee21a89e9226',
|
||||||
|
}
|
||||||
|
)
|
||||||
|
webauth = auth.Auth(config)
|
||||||
|
self.assertTrue(webauth.change_password('deluge', 'deluge_new'))
|
|
@ -198,7 +198,7 @@ class Auth(JSONComponent):
|
||||||
"""
|
"""
|
||||||
log.debug('Changing password')
|
log.debug('Changing password')
|
||||||
salt = hashlib.sha1(os.urandom(32)).hexdigest()
|
salt = hashlib.sha1(os.urandom(32)).hexdigest()
|
||||||
s = hashlib.sha1(salt)
|
s = hashlib.sha1(salt.encode('utf-8'))
|
||||||
s.update(new_password.encode('utf8'))
|
s.update(new_password.encode('utf8'))
|
||||||
self.config['pwd_salt'] = salt
|
self.config['pwd_salt'] = salt
|
||||||
self.config['pwd_sha1'] = s.hexdigest()
|
self.config['pwd_sha1'] = s.hexdigest()
|
||||||
|
|
Loading…
Reference in New Issue