Changeset 128

Timestamp:

10/31/09 11:13:43 (3 years ago)

Author:

roosit

Message:

TracAbricosAuth?: исправлена ошибка авторизации пользователей с русскими символами в логине и пароле

File:

• trac-plugins/abricosauthplugin/0.11/abricosauth/main.py (modified) (4 diffs)

trac-plugins/abricosauthplugin/0.11/abricosauth/main.py

@@ -21 +21 @@
 import simplejson
 
-from trac.core import Component, implements
+from trac.core import *
 from trac.db.api import DatabaseManager
 from trac.config import Option
@@ -34 +34 @@
     mode = Option('account-manager', 'abricos_dbtype', 'jsondb', 'Mode')
 
-    database = Option('account-manager', 'abricos_database', None, 
+    database = Option('account-manager', 'abricos_database', 'http://localhost', 
                       'Database URI for the Abricos database to auth '
                       'against')
 
-    jsondb_password = Option('account-manager', 'abricos_jsondb_pass', None, 
-                      'Database URI for the Abricos database to auth '
-                      'against')
+    jsondb_password = Option('account-manager', 'abricos_jsondb_pass', '', 
+                      'Password for the Abricos database')
 
     table_prefix = Option('account-manager', 'abricos_table_prefix', 'cms_',
@@ -95 +94 @@
     def check_password(self, user, password):
         """ Checks the password for the user against Abricos """
+        
+        user = user.encode('utf-8')
+        password = password.encode('utf-8')
+        
         if self.mode == 'jsondb':
             postdata = {'do': 'login', 'username':user, 'password': password}
@@ -124 +127 @@
         req = urllib2.Request(url, data)
         response = urllib2.urlopen(req)
+        
         page = response.read()
         
-        retdata = simplejson.loads(page) 
+        retdata = simplejson.loads(page)
         
         return retdata