[Checkins] SVN: z3ext.security/trunk/ Fixed permissions/roles calculation in IExtendedGrantInfo

[Nikolay Kim]

Log message for revision 97244:
  Fixed permissions/roles calculation in IExtendedGrantInfo

Changed:
  U   z3ext.security/trunk/CHANGES.txt
  U   z3ext.security/trunk/src/z3ext/security/grantinfo.py
  U   z3ext.security/trunk/src/z3ext/security/securitypolicy.py

-=-
Modified: z3ext.security/trunk/CHANGES.txt
===================================================================
--- z3ext.security/trunk/CHANGES.txt	2009-02-25 10:06:46 UTC (rev 97243)
+++ z3ext.security/trunk/CHANGES.txt	2009-02-25 10:09:22 UTC (rev 97244)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.2.4 (2009-??-??)
+------------------
+
+- Fixed permissions/roles calculation in IExtendedGrantInfo
+
+
 1.2.3 (2009-01-19)
 ------------------
 

Modified: z3ext.security/trunk/src/z3ext/security/grantinfo.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/grantinfo.py	2009-02-25 10:06:46 UTC (rev 97243)
+++ z3ext.security/trunk/src/z3ext/security/grantinfo.py	2009-02-25 10:09:22 UTC (rev 97244)
@@ -49,18 +49,15 @@
         parent = getattr(context, '__parent__', None)
         if parent is None:
             for name, setting in globalRolesForPermission(permission):
-                if name not in roles:
-                    roles[name] = setting
+                roles[name] = setting
         else:
             info = IExtendedGrantInfo(parent)
             for role, setting in info.getRolesForPermission(permission):
-                if role not in roles:
-                    roles[role] = setting
+                roles[role] = setting
 
         for name, roleperm in getAdapters((context,), IRolePermissionMap):
             for role, setting in roleperm.getRolesForPermission(permission):
-                if role not in roles:
-                    roles[role] = setting
+                roles[role] = setting
 
         return roles.items()
 
@@ -71,18 +68,15 @@
         parent = getattr(context, '__parent__', None)
         if parent is None:
             for role, setting in globalRolesForPrincipal(principal):
-                if role not in roles:
-                    roles[role] = setting
+                roles[role] = setting
         else:
             info = IExtendedGrantInfo(parent)
             for role, setting in info.getRolesForPrincipal(principal):
-                if role not in roles:
-                    roles[role] = setting
+                roles[role] = setting
 
         for name, prinrole in getAdapters((context,), IPrincipalRoleMap):
             for role, setting in prinrole.getRolesForPrincipal(principal):
-                if role not in roles:
-                    roles[role] = setting
+                roles[role] = setting
 
         return roles.items()
 
@@ -93,18 +87,15 @@
         parent = getattr(context, '__parent__', None)
         if parent is None:
             for principal, setting in globalPrincipalsForRole(role):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
         else:
             info = IExtendedGrantInfo(parent)
             for principal, setting in info.getPrincipalsForRole(role):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
 
         for name, prinrole in getAdapters((context,), IPrincipalRoleMap):
             for principal, setting in prinrole.getPrincipalsForRole(role):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
 
         return principals.items()
 
@@ -115,17 +106,14 @@
         parent = getattr(context, '__parent__', None)
         if parent is None:
             for principal, setting in globalPrincipalPermission(permission):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
         else:
             info = IExtendedGrantInfo(parent)
             for principal, setting in info.getPrincipalsForPermission(permission):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
 
         for name, prinper in getAdapters((context,), IPrincipalPermissionMap):
             for principal, setting in prinper.getPrincipalsForPermission(permission):
-                if principal not in principals:
-                    principals[principal] = setting
+                principals[principal] = setting
 
         return principals.items()

Modified: z3ext.security/trunk/src/z3ext/security/securitypolicy.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/securitypolicy.py	2009-02-25 10:06:46 UTC (rev 97243)
+++ z3ext.security/trunk/src/z3ext/security/securitypolicy.py	2009-02-25 10:09:22 UTC (rev 97244)
@@ -124,7 +124,7 @@
 
         cache_principal_roles[principal] = roles
         return roles
-        
+
     def cached_prinper(self, parent, principal, groups, permission):
         # Compute the permission, if any, for the principal.
         cache = self.cache(parent)