Changeset 6673 for main/waeup.sirp/trunk/src

Timestamp:

3 Sep 2011, 23:38:21 (13 years ago)

Author:

uli

Message:

Factor out get_principal_role_manager from w.s.authentication.Account.
This method had nothing specific for class and we have use for it in
students authentication.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• authentication.py (modified) (4 diffs)
• tests/test_authentication.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

@@ -26 +26 @@
     for name, util in auth_plugin_utilities:
         util.register(pau)
+
+def get_principal_role_manager():
+    """Get a role manager for principals.
+
+    If we are currently 'in a site', return the role manager for the
+    portal or the global rolemanager else.
+    """
+    portal = grok.getSite()
+    if portal is not None:
+        return IPrincipalRoleManager(portal)
+    return principalRoleManager
 
 class WAeUPSessionCredentialsPlugin(grok.GlobalUtility,
@@ -74 +85 @@
 
     def getRoles(self):
-        prm = self._getPrincipalRoleManager()
+        prm = get_principal_role_manager()
         roles = [x[0] for x in prm.getRolesForPrincipal(self.name)
                  if x[0].startswith('waeup.')]
@@ -80 +91 @@
 
     def setRoles(self, roles):
-        prm = self._getPrincipalRoleManager()
+        prm = get_principal_role_manager()
 
         old_roles = self.getRoles()
@@ -107 +118 @@
         self._p_changed = True
         return
-
-    def _getPrincipalRoleManager(self):
-        portal = grok.getSite()
-        if portal is not None:
-            return IPrincipalRoleManager(portal)
-        return principalRoleManager
 
 class UserAuthenticatorPlugin(grok.GlobalUtility):

main/waeup.sirp/trunk/src/waeup/sirp/tests/test_authentication.py

@@ -4 +4 @@
 from zope.interface.verify import verifyClass, verifyObject
 from zope.pluggableauth.interfaces import IAuthenticatorPlugin
+from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
 from waeup.sirp.authentication import (
-    UserAuthenticatorPlugin, Account, PrincipalInfo)
+    UserAuthenticatorPlugin, Account, PrincipalInfo, get_principal_role_manager)
 
 class FakeSite(grok.Site, grok.Container):
@@ -57 +58 @@
         self.assertTrue(result2 is None)
         return
+
+    def test_get_principal_role_manager(self):
+        # make sure we get different role managers for different situations
+        prm1 = get_principal_role_manager()
+        clearSite(None)
+        prm2 = get_principal_role_manager()
+        self.assertTrue(IPrincipalRoleManager.providedBy(prm1))
+        self.assertTrue(IPrincipalRoleManager.providedBy(prm2))
+        self.assertTrue(prm1._context is self.site)
+        self.assertTrue(hasattr(prm2, '_context') is False)
+        return