Ticket #4245: groupprovider_fix.diff_against_prev_impl.patch

trac/perm.py

@@ -155 +155 @@
         cursor = db.cursor()
         groups = permissions
         users = set([u[0] for u in self.env.get_known_users()])
+        
+        # Collect the implicit groups and their members. This too could use a
+        # more efficient API
+        implicit_groups = {}
+        for provider in self.group_providers:
+            for username in users:
+                for groupname in provider.get_permission_groups(username):
+                    try:
+                        implicit_groups[groupname].add(username)
+                    except KeyError:
+                        implicit_groups[groupname] = set(username)
+            
         result = set()
 
         # First iteration finds all users and groups that have any of the
@@ -168 +180 @@
                            % (', '.join(['%s'] * len(groups))), groups)
             groups = []
             for username, nummembers in cursor:
+                if username in implicit_groups:
+                    # A group with members provided by group_providers has
+                    # the necessary permissions set so add all its members.
+                    result.update(implicit_groups[username])
                 if username in users:
                     result.add(username)
                 elif nummembers: