Changeset 2826

Timestamp:

04/05/07 16:23:13 (2 years ago)

Author:

alberto

Message:

Applied #1281 and updated CONTRIBUTORS.txt and CHANGELOG. Thanks Felix and Patrick

Files:

• branches/1.0/CHANGELOG.txt (modified) (3 diffs)
• branches/1.0/CONTRIBUTORS.txt (modified) (1 diff)
• branches/1.0/turbogears/identity/__init__.py (modified) (2 diffs)
• branches/1.0/turbogears/identity/saprovider.py (modified) (2 diffs)
• branches/1.0/turbogears/identity/soprovider.py (modified) (2 diffs)
• branches/1.0/turbogears/identity/tests/test_identity.py (modified) (6 diffs)

branches/1.0/CHANGELOG.txt

@@ -20 +20 @@
-
-*Fixes*
+
+* Identity now supports encrypted passwords with unicode characters. Thanks to Felix Schwarz and
+  Patrick Lewis #1281 
-* minor changes to template so they work properly when server.webpath != / thanks to "nludban" #1213
-* fix quickstart project tests, thanks to Christoph Zwerschke #1289, Jeff Kowalczyk #1219
@@ -30 +33 @@
-
-*Project Updates*
+
-* ez_setup.py version to 0.6c5
-* Not require cElementTree, pysqlite in Python 2.5 install
@@ -35 +39 @@
-*Contributors*
-
-
+, Felix Schwartz, Patrcik Lewis
-
-

branches/1.0/CONTRIBUTORS.txt

@@ -21 +21 @@
-* Ondrej Zara (author of WWW SQL Designer)
-* Irmen de Jong (author of Kronos)
+* Florent Aide
+* Travis Bradshaw
+* Mark Ramm
-
-Contributor Statement:

branches/1.0/turbogears/identity/__init__.py

@@ -4 +4 @@
-    * Also want to support Atom authentication (similar to digest)
-'''
+import md5
+import sha
-import threading
+
-import cherrypy
-import pkg_resources
@@ -113 +116 @@
-from turbogears.identity.conditions import *
-
+def _encrypt_password(algorithm, password):
+    """Hash the given password with the specified algorithm. Valid values
+    for algorithm are 'md5' and 'sha1'. All other algorithm values will
+    be essentially a no-op."""
+    if isinstance(password, unicode):
+        password_8bit = password.encode('UTF-8')
+    else:
+        password_8bit = password
+    if "md5" == algorithm:
+        hashed_password =  md5.new(password_8bit).hexdigest()
+    elif "sha1" == algorithm:
+        hashed_password = sha.new(password_8bit).hexdigest()
+    else:
+        hashed_password = password
+    return hashed_password   
+
-def encrypt_password(cleartext):
-    # this next one ultimately needs to change to support SQLAlchemy

branches/1.0/turbogears/identity/saprovider.py

@@ -1 +1 @@
-import cherrypy
-import sha
-import md5
-import random
-from datetime import *
@@ -130 +128 @@
-        # Default encryption algorithm is to use plain text passwords
-        algorithm = get("identity.saprovider.encryption_algorithm", None)
-
-
-
-
-
-
+
+
-
-    def create_provider_model(self):

branches/1.0/turbogears/identity/soprovider.py

@@ -1 @@
-import sha
-import md5
-import random
-
@@ -185 +183 @@
-            
-        # Default encryption algorithm is to use plain text passwords
-
-
-
-
-
-
-
-
+
+
+
+
-    def create_provider_model( self ):
-        # create the database tables

branches/1.0/turbogears/identity/tests/test_identity.py

@@ +1 @@
+# coding=UTF-8
-import re
-import unittest
@@ -154 +155 @@
-
-    def test_user_password(self):
-
+.
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
@@ -160 +161 @@
-        u.sync()
-        assert u.password=='password'
+        hub.rollback()
+        hub.end()
+        
+    def test_user_password_unicode(self):
+        """Test if we can set a user password which is encoded as unicode (no 
+        encryption algorithm)."""
+        config.update({'identity.soprovider.encryption_algorithm':None})
+        # force new config values to load
+        startup.startTurboGears()
+        testutil.create_request('/')
+        hub.begin()
+        u = TG_User.by_user_name('samIam')
+        u.password = u'garçon'
+        u.sync()
+        self.assertEqual(u.password, u'garçon')
-        hub.rollback()
-        hub.end()
@@ -171 +187 @@
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-=
+ = 
-        u.sync()
-        assert u.password =='5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'
-        hub.rollback()
-        hub.end()
+        
+    def test_user_password_hashed_sha_unicode(self):
+        """Test if a sha hashed password with unicode characters is stored in 
+        the database."""
+        config.update({'identity.soprovider.encryption_algorithm':'sha1'})
+        # force new config values to load
+        startup.startTurboGears()
+        testutil.create_request('/')
+        hub.begin()
+        u = TG_User.by_user_name('samIam')
+        u.password = u'garçon'
+        u.sync()
+        self.failUnlessEqual(u.password, '442edb21c491a6e6f502eb79e98614f3c7edf43e')
+        hub.rollback()
+        hub.end()
-
-    def test_user_password_hashed_md5(self):
-sha
+md5
-        config.update({'identity.soprovider.encryption_algorithm':'md5'})
-        # force new config values to load
@@ -185 +216 @@
-        hub.begin()
-        u = TG_User.by_user_name('samIam')
-=
+ = 
-        u.sync()
-        assert u.password =='5f4dcc3b5aa765d61d8327deb882cf99'
+        hub.rollback()
+        hub.end()
+        
+    def test_user_password_hashed_md5_unicode(self):
+        """Test if a md5 hashed password with unicode characters is stored in 
+        the database."""
+        config.update({'identity.soprovider.encryption_algorithm':'md5'})
+        # force new config values to load
+        startup.startTurboGears()
+        testutil.create_request('/')
+        hub.begin()
+        u = TG_User.by_user_name('samIam')
+        u.password = u'garçon'
+        u.sync()
+        self.assertEqual(u.password, 'c295c4bb2672ca8c432effc53b40bb1e')
+        hub.rollback()
+        hub.end()
+
+    def test_user_password_hashed_md5_utf8string(self):
+        """Test if a md5 hashed password with unicode characters is stored in 
+        the database if the password is entered as str (encoded in UTF-8). This
+        test ensures that the encryption algorithm does handle non-unicode
+        parameters gracefully."""
+        config.update({'identity.soprovider.encryption_algorithm':'md5'})
+        # force new config values to load
+        startup.startTurboGears()
+        testutil.create_request('/')
+        hub.begin()
+        u = TG_User.by_user_name('samIam')
+        u.password = u'garçon'.encode('UTF-8')
+        u.sync()
+        self.assertEqual(u.password, 'c295c4bb2672ca8c432effc53b40bb1e')
-        hub.rollback()
-        hub.end()
@@ -204 +267 @@
-        hub.rollback()
-        hub.end()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def test_anonymous_browsing(self):
-        "Test if we can show up anonymously."