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

[Lennart Regebro]

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

Modified Files:
	PluggableAuthService.py 
Log Message:
Removed this challenge implementation, in expectation of the before traverse implementation discussed on #zope-dev.


=== Products/PluggableAuthService/PluggableAuthService.py 1.9 => 1.10 ===
--- Products/PluggableAuthService/PluggableAuthService.py:1.9	Tue Aug 31 07:28:15 2004
+++ Products/PluggableAuthService/PluggableAuthService.py	Tue Aug 31 13:50:56 2004
@@ -275,23 +275,7 @@
                 return user
 
         if not is_top:
-            # Try to validate with user folders higher up.
-            innerob=self.aq_parent
-            while hasattr(innerob,"aq_parent"):
-                inner = getattr(innerob, 'aq_inner', innerob)
-                parent = getattr(inner, 'aq_parent', None)
-                if parent is not None:
-                    innerob = parent
-                else:
-                    if hasattr(innerob, 'im_self'):
-                        innerob = innerob.im_self
-                        innerob = getattr(innerob, 'aq_inner', innerob)
-                if hasattr(innerob,"__allow_groups__"):
-                    userfolder=innerob.__allow_groups__
-                    if hasattr(userfolder,"validate"):
-                        user=userfolder.validate(request,auth,roles)
-                        if user is not None:
-                            return user
+            return None
                         
         #
         #   No other user folder above us can satisfy, and we have no user;
@@ -307,18 +291,6 @@
                               ):
             return anonymous
 
-        # No validation in upper user folders: Make a challenge
-        challengers = plugins.listPlugins(IChallengePlugin)
-        for challenger_id, challenger in challengers:
-            try:
-                # A successful challenge involves raising a 
-                # "Redirect", url exception.
-                challenger.challenge(request, request.RESPONSE)
-            except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
-                LOG('PluggableAuthService', WARNING, 
-                    'ChallengePlugin %s error' % challenger_id,
-                    error=sys.exc_info())
-        
         return None
 
     security.declareProtected( SearchPrincipals, 'searchUsers')