Tue, 9 Apr 2002 12:37:14 -0400

Update of /cvs-repository/Zope3/lib/python/Zope/App/Security
In directory cvs.zope.org:/tmp/cvs-serv11768/Zope/App/Security

Modified Files:
      Tag: casey-security-reorg-branch
	ZopeSecurityPolicy.py metaConfigure.py security.zcml 
Removed Files:
      Tag: casey-security-reorg-branch
	AttributePrincipalPermissionManager.py 
	AttributePrincipalRoleManager.py 
	AttributeRolePermissionManager.py 
	IPrincipalPermissionManager.py IPrincipalPermissionMap.py 
	IPrincipalRoleManager.py IPrincipalRoleMap.py 
	IRolePermissionManager.py IRolePermissionMap.py 
	PrincipalPermissionManager.py PrincipalPermissionView.py 
	PrincipalRoleManager.py PrincipalRoleView.py 
	RolePermissionManager.py RolePermissionView.py Settings.py 
Log Message:
Mass checkin for security reorganization branch. I will retest this and merge
upon BDFL approval...


=== Zope3/lib/python/Zope/App/Security/ZopeSecurityPolicy.py 1.1.2.22 => 1.1.2.22.4.1 ===
 from Zope.Exceptions import Unauthorized, Forbidden
 
-from Zope.App.Security.IRolePermissionManager import IRolePermissionManager
-from Zope.App.Security.IPrincipalPermissionManager \
-    import IPrincipalPermissionManager
-from Zope.App.Security.IPrincipalRoleManager \
-    import IPrincipalRoleManager
-from Zope.App.Security.IRolePermissionManager import IRolePermissionManager
+from Zope.App.Security.Management.IRolePermissions \
+     import IRolePermissionsManager
+from Zope.App.Security.Management.IPrincipalPermissions \
+     import IPrincipalPermissionsManager
+from Zope.App.Security.Management.IPrincipalRoles \
+     import IPrincipalRolesManager
+from Zope.App.Security.Management.IRolePermissions \
+     import IRolePermissionsManager
 from Zope.App.Security.PermissionRegistry import permissionRegistry 
 from Zope.App.Security.PrincipalRegistry import principalRegistry 
 from Zope.App.Security.RoleRegistry import roleRegistry
-from Zope.App.Security.PrincipalPermissionManager \
-     import principalPermissionManager 
-from Zope.App.Security.RolePermissionManager import rolePermissionManager 
-from Zope.App.Security.PrincipalRoleManager import principalRoleManager
-from Zope.App.Security.Settings import Allow, Deny, Assign, Remove, Unset
+from Zope.App.Security.Management.GlobalPrincipalPermissions \
+     import principalPermissionsManager 
+from Zope.App.Security.Management.GlobalRolePermissions \
+     import rolePermissionsManager 
+from Zope.App.Security.Management.GlobalPrincipalRoles \
+     import principalRolesManager
+from Zope.App.Security.Management.Settings \
+     import Allow, Deny, Assign, Remove, Unset
 
 from types import StringTypes, ListType, IntType, MethodType, NoneType
 
@@ -43,9 +48,9 @@
 from Zope.ContextWrapper import getbaseobject
 
 getPermissionsForPrincipal = \
-                principalPermissionManager.getPermissionsForPrincipal
-getPermissionsForRole      = rolePermissionManager.getPermissionsForRole
-getRolesForPrincipal       = principalRoleManager.getRolesForPrincipal
+                principalPermissionsManager.getPermissionsForPrincipal
+getPermissionsForRole      = rolePermissionsManager.getPermissionsForRole
+getRolesForPrincipal       = principalRolesManager.getRolesForPrincipal
 
 class ZopeSecurityPolicy:
 
@@ -128,7 +133,7 @@
         # Check the placeful principal permissions and aggregate the
         # Roles in this context
         for c in ContainmentIterator(object):
-            ppm = getAdapter(c, IPrincipalPermissionManager, None)
+            ppm = getAdapter(c, IPrincipalPermissionsManager, None)
             if ppm is not None: 
                 for principal in principals.keys():
                     setting = ppm.getSetting(permission, principal)
@@ -137,7 +142,7 @@
                     elif setting is Allow:
                         return 1 # Explicit allow on principal
                     
-            prm = getAdapter(c, IPrincipalRoleManager, None)
+            prm = getAdapter(c, IPrincipalRolesManager, None)
             if prm is not None:
                 for principal in principals.keys():
                     for role, setting in prm.getRolesForPrincipal(principal):
@@ -147,7 +152,7 @@
                                 assigned_roles[role] = 1
         
         # now check the global principal permissions
-        getSetting = principalPermissionManager.getSetting
+        getSetting = principalPermissionsManager.getSetting
         for principal in principals.keys():
             setting = getSetting(permission, principal)
             if setting is Allow:
@@ -156,7 +161,7 @@
                 return 0 # Explicit deny on global principal
                                     
         # aggregate global roles
-        global_roles = principalRoleManager.getRolesForPrincipal(principal)
+        global_roles = principalRolesManager.getRolesForPrincipal(principal)
         for principal in principals.keys():
             for role, setting in global_roles:
                 if not roles.has_key(role):
@@ -166,7 +171,7 @@
                         
         # Check the placeful role permissions, checking anonymous first
         for c in ContainmentIterator(object):
-            rpm = getAdapter(c, IRolePermissionManager, None)
+            rpm = getAdapter(c, IRolePermissionsManager, None)
             if rpm is not None:
                 for role in ['Anonymous'] + assigned_roles.keys():
                     setting = rpm.getSetting(permission, role)
@@ -178,7 +183,7 @@
                     return 1 # Allow on placeful role permission
             
         # Last, check if there are any global role settings
-        getSetting = rolePermissionManager.getSetting
+        getSetting = rolePermissionsManager.getSetting
         for principal in principals.keys():
             for role, role_setting in [('Anonymous', Assign)] + global_roles:
                 if role_setting is Assign:


=== Zope3/lib/python/Zope/App/Security/metaConfigure.py 1.1.2.24 => 1.1.2.24.2.1 ===
 from SecurityManager import setSecurityPolicy
 from PrincipalRegistry import principalRegistry
-from RolePermissionManager import rolePermissionManager as role_perm_mgr
-from PrincipalPermissionManager import principalPermissionManager \
-        as principal_perm_mgr
-from PrincipalRoleManager import principalRoleManager as principal_role_mgr
+from Management.GlobalRolePermissions \
+     import rolePermissionsManager as role_perm_mgr
+from Management.GlobalPrincipalPermissions \
+     import principalPermissionsManager as principal_perm_mgr
+from Management.GlobalPrincipalRoles \
+     import principalRolesManager as principal_role_mgr
 from Zope.Configuration.Action import Action
 
 def defaultPolicy(_context, name):


=== Zope3/lib/python/Zope/App/Security/security.zcml 1.1.2.3 => 1.1.2.3.2.1 ===
    xmlns:browser='http://namespaces.zope.org/browser'
 >
+
   <serviceType name="RoleService" 
                interface="Zope.App.Security.IRoleService." />
   <service name="RoleService" 
            component="Zope.App.Security.RoleRegistry.roleRegistry" />
 
-
   <serviceType name="PermissionService" 
                interface="Zope.App.Security.IPermissionService." />
   <service name="PermissionService" 
@@ -20,53 +20,19 @@
   <service name="AuthenticationService" 
            component="Zope.App.Security.PrincipalRegistry.principalRegistry" />
 
-<security:defaultPolicy 
-  name="Zope.App.Security.ZopeSecurityPolicy.zopeSecurityPolicy" />
-
-
-<adapter factory="Zope.App.Security.BasicAuthAdapter."
-         provides="Zope.App.Security.ILoginPassword."
-         for="Zope.Publisher.HTTP.IHTTPCredentials." />
-
-
-<!-- Role-Permission management view -->
-  
-<security:protectClass name="Zope.App.Security.RolePermissionView."
-   permission_id="Zope.Security"
-   methods="index, roles, permissions, permissionRoles, action,
-   manage_permissionForm, update_permission,
-   manage_roleForm, update_role, permissionForID" />
-
-<security:protectClass
-   name="Zope.App.Security.RolePermissionView.PermissionRoles."
-   permission_id="Zope.Security"
-   methods="roles, rolesInfo"
-   interface="Zope.App.Security.IRegisteredObject." />
-
-
-<browser:view name="RolePermissionsManagement"
-              for="Zope.App.OFS.Memento.IAttributeMementoStorable."
-              factory="Zope.App.Security.RolePermissionView." />
-
-<!-- Principal-Permission management view -->
-  
-<security:protectClass name="Zope.App.Security.PrincipalPermissionView."
-   permission_id="Zope.Security"
-   methods="index, get_principal, unsetPermissions, denyPermissions,
-   grantPermissions, getUnsetPermissionsForPrincipal,
-   getPermissionsForPrincipal" />
-
-
-<browser:view name="PrincipalPermissionsManagement"
-              for="Zope.App.OFS.Memento.IAttributeMementoStorable."
-              factory="Zope.App.Security.PrincipalPermissionView." />
-
-<!-- protect Roles and Permissions -->
-<security:protectClass name="Zope.App.Security.RoleRegistry.Role"
-                       interface="Zope.App.Security.IRegisteredObject."
-                       permission_id="Zope.Public"/>
+  <security:defaultPolicy 
+    name="Zope.App.Security.ZopeSecurityPolicy.zopeSecurityPolicy" />
 
+  <adapter factory="Zope.App.Security.BasicAuthAdapter."
+           provides="Zope.App.Security.ILoginPassword."
+           for="Zope.Publisher.HTTP.IHTTPCredentials." />
+
+  <!-- protect Roles and Permissions -->
+  <security:protectClass name="Zope.App.Security.RoleRegistry.Role"
+                         interface="Zope.App.Security.IRegisteredObject."
+                         permission_id="Zope.Public" />
 
+  <include package=".Management" file="management.zcml" />
 
 </zopeConfigure>
 

=== Removed File Zope3/lib/python/Zope/App/Security/AttributePrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/AttributePrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/AttributeRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IPrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IPrincipalPermissionMap.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IPrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IPrincipalRoleMap.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/IRolePermissionMap.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/PrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/PrincipalPermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/PrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/PrincipalRoleView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/RolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/RolePermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/Settings.py ===




