[Zope-CVS] CVS: Products/PluggableAuthService - PluggableAuthService.py:1.19.2.9

[Jens Vagelpohl]

Update of /cvs-repository/Products/PluggableAuthService
In directory cvs.zope.org:/tmp/cvs-serv15362

Modified Files:
      Tag: jens-implement_caching_branch
	PluggableAuthService.py 
Log Message:
- merge Chris' changes from HEAD


=== Products/PluggableAuthService/PluggableAuthService.py 1.19.2.8 => 1.19.2.9 ===
--- Products/PluggableAuthService/PluggableAuthService.py:1.19.2.8	Mon Nov  8 04:24:32 2004
+++ Products/PluggableAuthService/PluggableAuthService.py	Mon Nov  8 04:36:51 2004
@@ -303,7 +303,8 @@
                         info[ 'userid' ] = principal_id
                         info[ 'id' ] = self._computeMangledId( user_info )
                         info[ 'principal_type' ] = 'user'
-                        info[ 'title' ] = info[ 'login' ]
+                        if not info.has_key('title'):
+                            info[ 'title' ] = info[ 'login' ]
                         return ( info, )
                     else:
                         return ()
@@ -340,7 +341,8 @@
                     info[ 'userid' ] = info[ 'id' ]
                     info[ 'id' ] = self._computeMangledId( info )
                     info[ 'principal_type' ] = 'user'
-                    info[ 'title' ] = info[ 'login' ]
+                    if not info.has_key('title'):
+                        info[ 'title' ] = info[ 'login' ]
                     result.append(info)
 
             except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
@@ -385,7 +387,8 @@
                         info[ 'groupid' ] = principal_id
                         info[ 'id' ] = self._computeMangledId( group_info )
                         info[ 'principal_type' ] = 'group'
-                        info[ 'title' ] = "(Group) %s" % principal_id
+                        if not info.has_key('title'):
+                            info[ 'title' ] = "(Group) %s" % principal_id
                         return ( info, )
                     else:
                         return ()
@@ -408,7 +411,8 @@
         if search_name:
             if kw.get('id') is not None:
                 del kw['id']
-            kw['title'] = kw['name']
+            if not kw.has_key('title'):
+                kw['title'] = kw['name']
 
         plugins = self._getOb( 'plugins' )
         enumerators = plugins.listPlugins( IGroupEnumerationPlugin )
@@ -422,7 +426,8 @@
                     info[ 'groupid' ] = info[ 'id' ]
                     info[ 'id' ] = self._computeMangledId( info )
                     info[ 'principal_type' ] = 'group'
-                    info[ 'title' ] = "(Group) %s" % info[ 'groupid' ]
+                    if not info.has_key('title'):
+                        info[ 'title' ] = "(Group) %s" % info[ 'groupid' ]
                     result.append(info)
             except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
                 LOG('PluggableAuthService', WARNING,
@@ -453,7 +458,8 @@
         search_id = kw.get( 'id', None )
         search_name = kw.get( 'name', None )
         if search_name:
-            kw['title'] = search_name
+            if not kw.has_key('title'):
+                kw['title'] = search_name
             kw['login'] = search_name
 
         if exact_match and search_id:
@@ -468,7 +474,10 @@
                     if user_info:
                         local_key = 'userid'
                         principal_type = 'user'
-                        title_key = 'login'
+                        if kw.has_key('title'):
+                            title_key = 'title'
+                        else:
+                            title_key = 'login'
                         title_pattern = "%s"
                 if getattr( aq_base( plugin ), 'enumerateGroups', None ):
                     group_info = plugin.enumerateGroups( id=principal_id
@@ -476,8 +485,12 @@
                     if group_info:
                         local_key = 'groupid'
                         principal_type = 'group'
-                        title_key = 'groupid'
-                        title_pattern = "(Group) %s"
+                        if kw.has_key('title'):
+                            title_key = 'title'
+                            title_pattern = "%s"
+                        else:
+                            title_key = 'groupid'
+                            title_pattern = "(Group) %s"
                 try:
                     principal_info = filter(None, (user_info + group_info))
                     assert( len( principal_info ) in [ 0, 1 ] )
@@ -488,7 +501,8 @@
                         info[ local_key ] = principal_id
                         info[ 'id' ] = self._computeMangledId( principal_info )
                         info[ 'principal_type' ] = principal_type
-                        info[ 'title' ] = title_pattern % info[ title_key ]
+                        if not info.has_key('title'):
+                            info[ 'title' ] = title_pattern % info[ title_key ]
                         return ( info, )
                     else:
                         return ()
@@ -543,6 +557,7 @@
     #
     # ZMI stuff
     #
+    
     arrow_right_gif = ImageFile( 'www/arrow-right.gif', globals() )
     arrow_left_gif = ImageFile( 'www/arrow-left.gif', globals() )
     arrow_up_gif = ImageFile( 'www/arrow-up.gif', globals() )
@@ -690,8 +705,14 @@
                     for authenticator_id, auth in authenticators:
 
                         try:
-                            user_id, name = auth.authenticateCredentials(
-                                                                credentials )
+                            uid_and_name = auth.authenticateCredentials(
+                                credentials )
+
+                            if uid_and_name is None:
+                                continue
+
+                            user_id, name = uid_and_name
+                            
                         except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
                             LOG('PluggableAuthService', WARNING,
                                 'AuthenticationPlugin %s error' %