Changeset 7:279473355e9b in OKFNAnnotator (for Zope)

Timestamp:

Nov 9, 2012, 5:05:11 PM (12 years ago)

Author:

root@…

Branch:

default

Message:

authentication works with hierarchy of acl_users now.

Files:

• AuthTokenGenerator.py (modified) (3 diffs)
• version.txt (modified) (1 diff)

AuthTokenGenerator.py

@@ -4 +4 @@
 from AccessControl import getSecurityManager
 from zExceptions import Unauthorized
+from Acquisition import aq_chain
 
 import logging
@@ -78 +79 @@
             self.REQUEST.RESPONSE.setStatus('Unauthorized')
             return "Please Authenticate!"
-        
 
     def _user_allowed(self, user=None, password=None):
@@ -96 +96 @@
         if password:
             logging.debug("trying password")
-            # TODO: should we care about aquisition?
-            authuser = self.acl_users.authenticate(user, password, None)
-            return authuser
+            # try all user folders in aq_chain
+            authuser = None
+            userfolder = None
+            for ctx in aq_chain(self):
+                new_uf = getattr(ctx, 'acl_users', None)
+                if new_uf != userfolder:
+                    userfolder = new_uf
+                    authuser = userfolder.authenticate(user, password, None)
+                    if authuser is not None:
+                        return authuser
             
         return None

version.txt

@@ -1 @@
-0.5
+0.6