Fix encoding error with non-ascii passwords.

disko · Jun 7, 2012 · 1fa5d28 · 1fa5d28
1 parent 9bd0c76
commit 1fa5d28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ Change History
 0.7a3 - Unreleased
 ------------------
 
+- Fix encoding error with non-ascii passwords.
+
 0.7a2 - 2012-06-07
 ------------------
 

diff --git a/kotti/security.py b/kotti/security.py
@@ -464,7 +464,8 @@ def search(self, **kwargs):
     def hash_password(self, password, hashed=None):
         if hashed is None:
             hashed = bcrypt.gensalt(self.log_rounds)
-        return unicode(bcrypt.hashpw(password, hashed))
+        return unicode(
+            bcrypt.hashpw(password.encode('utf-8'), hashed.encode('utf-8')))
 
     def validate_password(self, clear, hashed):
         try:

diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
@@ -418,6 +418,9 @@ def _assert_is_bob(self, bob):
         self.assertEqual(bob.title, u'Bob Dabolina')
         self.assertEqual(bob.groups, [u'group:bobsgroup'])
 
+    def test_hash_password_non_ascii(self):
+        self.get_principals().hash_password(u'\xd6TEst')
+
     def test_default_admin(self):
         admin = self.get_principals()[u'admin']
         self.assertTrue(