Changeset 2043

Timestamp:

06/18/09 08:26:39 (9 months ago)

Author:

JensDiemer

Message:

• bugfix in page_admin.check_permissions
• update unittests
• some code cleanup

Location:

branches/0.9/pylucid_project

Files:

• pylucid_plugins/page_admin/views.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• tests/test_Design.py (modified) (2 diffs)
• tests/test_PluginEditPage.py (modified) (4 diffs)
• tests/test_tools/test_runner.py (modified) (5 diffs)

branches/0.9/pylucid_project/pylucid_plugins/page_admin/views.py

@@ -16 +16 @@
 
 EDIT_PERMISSIONS = (
-    "pylucid.can_edit_page",
-    "pylucid.can_edit_pagemeta",
+    u'pylucid.change_pagecontent',
+    u'pylucid.change_pagemeta'
 )
 
 
 def check_permissions(request, permissions):
+    """
+    TODO: Add a log entry, if user has not all permissions.
+    """
+    assert isinstance(permissions, (list, tuple))
     user = request.user
-    if user.has_perms(permissions):
-        return
     
-    if settings.DEBUG: # Usefull??
-        for permission in permissions:
-            if not user.has_perm(permission):
-                warnings.warn("User %r has not the permission: %r" % (user, permission))
+    if not user.is_authenticated():
+        if settings.DEBUG: # Usefull??
+            warnings.warn("Anonymous can't edit page.")
+        raise PermissionDenied
+        
+    if not user.has_perms(permissions):
+        if settings.DEBUG: # Usefull??
+            msg = "User %r has not all permissions: %r (existing permissions: %r)" % (
+                user, permissions, user.get_all_permissions()
+            )
+            warnings.warn(msg)
+        raise PermissionDenied()
     
-    raise PermissionDenied
 
 

branches/0.9/pylucid_project/settings.py

@@ -77 +77 @@
 
 MIDDLEWARE_CLASSES = (
+    # From http://code.google.com/p/django-tools/
     'django_tools.middlewares.ThreadLocal.ThreadLocalMiddleware',
     

branches/0.9/pylucid_project/tests/test_Design.py

@@ -25 +25 @@
         self.test_css = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_CSS_FILEPATH)
         self.test_js = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_JS_FILEPATH)
-        
-        # fake django HttpRequest object, needed in UpdateInfoBaseModel save() method
-        self.fake_request = pylucid_test_data.get_fake_request(usertype="superuser")
 
     def _assert_headfiles(self, test_css_url, test_js_url):
@@ -59 +56 @@
             if not os.path.isfile(cachepath):
                 os.makedirs(os.path.dirname(cachepath)) # Cache dir doesn't exist?
-                headfile.save(self.fake_request) # The save method should create the cache file
+                headfile.save() # The save method should create the cache file
             # Check if file exist
             self.failUnless(os.path.isfile(cachepath), "Can't create cache file???")

branches/0.9/pylucid_project/tests/test_PluginEditPage.py

@@ -8 +8 @@
 from django.conf import settings
 from django.contrib.sites.models import Site
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
 
 from django_tools.unittest import unittest_base
@@ -13 +15 @@
 from pylucid_project.tests.test_tools import pylucid_test_data
 from pylucid_project.tests.test_tools import basetest
-from pylucid.models import EditableHtmlHeadFile
-
+from pylucid.models import EditableHtmlHeadFile, PageMeta, PageContent
 
 EDIT_PAGE_URL = "/?page_admin=inline_edit"
@@ -53 +54 @@
         
     def test_permissions_normal(self):
-        """
-        A normal user must have explicit permissions to edit a page.
+        """ A normal user must have explicit permissions to edit a page. """
         
-        FIXME: Why can't i add permissions here??? They allways empty?!?!
-        """
-        user = self.login(usertype="normal")
-        response = self.client.get(EDIT_PAGE_URL)
-        self.assertCanNotEdit(response)
+        def check_permissions(permissions, assertion):
+            user = self.login(usertype="normal")
+            user.user_permissions.clear() # Delete all existing permissions
+            for permission, model in permissions:
+                # Give the test user the permissions:
+                content_type=ContentType.objects.get_for_model(model)
+                perm = Permission.objects.get(content_type=content_type, codename=permission)
+                user.user_permissions.add(perm)
+            
+            user = self.login(usertype="normal") # "reloading" user to purge user._perm_cache 
+            
+            # low level check permissions:
+            codenames = [u"pylucid.%s" % permission for permission,model in permissions]
+            self.failUnless(user.has_perms(codenames),
+                "Low level error, user has not permissions: %r, he has: %r" % (
+                    codenames, user.get_all_permissions()
+                )
+            )
+            # Check if he can now edit the page:
+            response = self.client.get(EDIT_PAGE_URL)
+            assertion(response)
         
-        # Give the test user the permissions:
-        from django.contrib.auth.models import Permission
-        for i in Permission.objects.all():
-            print i.pk, i
+        # normal user has no permissions
+        check_permissions(permissions=[], assertion=self.assertCanNotEdit)
         
-        print user
-        print user.get_all_permissions()
-        print user._perm_cache
-        user.user_permissions.add("pylucid.can_edit_pagecontent")
-        user.user_permissions.add("pylucid.can_edit_pagemeta")
-        user.save()
-        user = self.login(usertype="normal")
-        print user.get_all_permissions()
-        print user._perm_cache
+        # normal user has only one permission
+        check_permissions(
+            permissions=[("change_pagecontent", PageContent)],
+            assertion=self.assertCanNotEdit
+        )
+        check_permissions(
+            permissions=[("change_pagemeta", PageMeta)],
+            assertion=self.assertCanNotEdit
+        )
         
-        self.failUnless(user.has_perms(["pylucid.can_edit_page", "pylucid.can_edit_pagemeta"]), "FIXME!!!")
-        
-        settings.DEBUG = True
-        # Check if he can now edit the page:
-        response = self.client.get(EDIT_PAGE_URL)
-        self.assertCanEdit(response)
+        # normal user has all permission -> he can edit the page
+        check_permissions(
+            permissions=[("change_pagecontent", PageContent), ("change_pagemeta", PageMeta)],
+            assertion=self.assertCanEdit
+        )
+
 
 
@@ -88 +102 @@
 if __name__ == "__main__":
     # Run this unitest directly
+#    from django_tools.utils import info_print; info_print.redirect_stdout()
     unittest_base.direct_run(__file__)

branches/0.9/pylucid_project/tests/test_tools/test_runner.py

@@ -61 +61 @@
         except TypeError:
             raise TypeError("Test label '%s' wrong!" % module_name)
+
 
 def get_all_tests(verbosity=False):
@@ -96 +97 @@
     return test_suite
 
+
 def get_tests(test_labels, verbosity=False):
     """
@@ -118 +120 @@
         return get_all_tests(verbosity)
 
+
 def setup_unittest_plugin(verbosity):
     if verbosity:
@@ -133 +136 @@
     # Add unittest template dir
     settings.TEMPLATE_DIRS += (os.path.join(UNITTEST_PLUGIN_DST_PATH, "templates"),)
-    
+
+
 def teardown_unittest_plugin(verbosity):
     if verbosity:
         print "remove unittest plugin symlink"
     os.remove(UNITTEST_PLUGIN_DST_PATH)
-        
+
+
 def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
     """
@@ -189 +194 @@
     return len(result.failures) + len(result.errors)
 
+
 if __name__ == "__main__":
     # Run all unitest directly