Fix "Web Access" permission check to allow serving of static files to Anonymous again

Author: Richard Jones

CHANGES.txt

@@ -15,6 +15,10 @@ Fixes:
   intevation for funding the fix.
 - Fix documentation on user required to run the tests, fixes 
   issue2550618, thanks to Chris aka 'radioking'
+- Add simple doc about translating customised tracker content
+- Add "flup" setup documentation, thanks Christian Glass
+- Fix "Web Access" permission check to allow serving of static files to
+  Anonymous again
 
 
 2009-12-21 1.4.11 (r4413)

roundup/cgi/client.py

@@ -380,6 +380,7 @@ def handle_xmlrpc(self):
         self.determine_language()
         # Open the database as the correct user.
         self.determine_user()
+        self.check_web_access()
 
         # Call the appropriate XML-RPC method.
         handler = xmlrpc.RoundupDispatcher(self.db,
@@ -437,6 +438,11 @@ def inner_main(self):
                 # figure out the context and desired content template
                 self.determine_context()
 
+                # if we've made it this far the context is to a bit of
+                # Roundup's real web interface (not a file being served up)
+                # so do the Anonymous Web Acess check now
+                self.check_web_access()
+
                 # possibly handle a form submit action (may change self.classname
                 # and self.template, and may also append error/ok_messages)
                 html = self.handle_action()
@@ -711,15 +717,21 @@ def determine_user(self):
         # make sure the anonymous user is valid if we're using it
         if user == 'anonymous':
             self.make_user_anonymous()
-            if not self.db.security.hasPermission('Web Access', self.userid):
-                raise Unauthorised, self._("Anonymous users are not "
-                    "allowed to use the web interface")
         else:
             self.user = user
 
         # reopen the database as the correct user
         self.opendb(self.user)
 
+    def check_web_access(self):
+        """Check that the Anonymous user is actually allowed to use the web
+        interface and short-circuit all further processing if they're not.
+        """
+        if self.user == 'anonymous':
+            if not self.db.security.hasPermission('Web Access', self.userid):
+                raise Unauthorised, self._("Anonymous users are not "
+                    "allowed to use the web interface")
+
     def opendb(self, username):
         """Open the database and set the current user.
 
@@ -865,6 +877,8 @@ def serve_file(self, designator, dre=re.compile(r'([^\d]+)(\d+)')):
             # The classname was not valid.
             raise NotFound, str(designator)
 
+        # perform the Anonymous user access check
+        self.check_web_access()
 
         # make sure we have the appropriate properties
         props = klass.getprops()