Ticket #2456: userdir-for-r4673-0.10-stable.diff

trac/env.py

@@ -21 +21 @@
 from trac.core import Component, ComponentManager, implements, Interface, \
                       ExtensionPoint, TracError
 from trac.db import DatabaseManager
+from trac.userdir import *
 from trac.versioncontrol import RepositoryManager
 
 __all__ = ['Environment', 'IEnvironmentSetupParticipant', 'open_environment']
@@ -61 +62 @@
      * wiki and ticket attachments.
     """   
     setup_participants = ExtensionPoint(IEnvironmentSetupParticipant)
+    userdirs = ExtensionPoint(IUserDirectory)
 
     base_url = Option('trac', 'base_url', '',
         """Base URL of the Trac deployment.
@@ -296 +298 @@
         self.log = logger_factory(logtype, logfile, self.log_level, self.path,
                                   format=format)
 
-    def get_known_users(self, cnx=None):
-        """Generator that yields information about all known users, i.e. users
-        that have logged in to this Trac environment and possibly set their name
-        and email.
+    def get_known_user_info(self, limit=None):
+        cnx = self.get_db_cnx()
+        
+        # should accumulate user_info from all IUserDirectory providers - desirable?
+        for userdir in self.userdirs:
+            for username, name, email in userdir.get_known_user_info(limit):
+                yield username, name, email
 
-        This function generates one tuple for every user, of the form
-        (username, name, email) ordered alpha-numerically by username.
+    def get_known_users(self, limit=None):
+        cnx = self.get_db_cnx()
+        
+        # should accumulate users from all IUserDirectory providers - desirable?
+        for userdir in self.userdirs:
+            for username in userdir.get_known_users(limit):
+                yield username
 
-        @param cnx: the database connection; if ommitted, a new connection is
-                    retrieved
-        """
-        if not cnx:
-            cnx = self.get_db_cnx()
-        cursor = cnx.cursor()
-        cursor.execute("SELECT DISTINCT s.sid, n.value, e.value "
-                       "FROM session AS s "
-                       " LEFT JOIN session_attribute AS n ON (n.sid=s.sid "
-                       "  and n.authenticated=1 AND n.name = 'name') "
-                       " LEFT JOIN session_attribute AS e ON (e.sid=s.sid "
-                       "  AND e.authenticated=1 AND e.name = 'email') "
-                       "WHERE s.authenticated=1 ORDER BY s.sid")
-        for username,name,email in cursor:
-            yield username, name, email
-
     def backup(self, dest=None):
         """Simple SQLite-specific backup of the database.
 

trac/ticket/api.py

@@ -100 +100 @@
         if self.restrict_owner:
             field['type'] = 'select'
             users = []
+
             perm = PermissionSystem(self.env)
-            for username, name, email in self.env.get_known_users(db):
+            for username in self.env.get_known_users():
                 if perm.get_user_permissions(username).get('TICKET_MODIFY'):
                     users.append(username)
             field['options'] = users

trac/versioncontrol/web_ui/log.py

@@ -164 +164 @@
         if format == 'rss':
             # Get the email addresses of all known users
             email_map = {}
-            for username,name,email in self.env.get_known_users():
+            for username,name,email in self.env.get_known_user_info():
                 if email:
                     email_map[username] = email
             for cs in changes.values():

trac/Timeline.py

@@ -155 +155 @@
 
         # Get the email addresses of all known users
         email_map = {}
-        for username, name, email in self.env.get_known_users():
+        for username, name, email in self.env.get_known_user_info():
             if email:
                 email_map[username] = email
 

trac/tests/env.py

@@ -23 +23 @@
         """Testing env.get_version"""
         assert self.env.get_version() == db_default.db_version
 
-    def test_get_known_users(self):
-        """Testing env.get_known_users"""
+    def test_get_known_user_info(self):
+        """Testing env.get_known_user_info"""
         cursor = self.db.cursor()
         cursor.executemany("INSERT INTO session VALUES (%s,%s,0)",
                            [('123', 0),('tom', 1), ('joe', 1), ('jane', 1)])
@@ -35 +35 @@
                             ('joe', 1, 'email', 'joe@example.com'),
                             ('jane', 1, 'name', 'Jane')])
         users = {}
-        for username,name,email in self.env.get_known_users(self.db):
+        for username,name,email in self.env.get_known_user_info():
             users[username] = (name, email)
 
         assert not users.has_key('anonymous')