Changeset 1303

Timestamp:

08/30/06 19:02:25

Author:

fumanchu

Message:

Fix for #433 (mapPathToObject should remove a trailing /, not just add it). CP 3 only. Configurable now via request.redirect_on_extra_slash and request.redirect_on_missing_slash. Also broke the slash logic out of find_handler, so it's more reusable.

Files:

• trunk/cherrypy/_cprequest.py (modified) (4 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_objectmapping.py (modified) (3 diffs)

trunk/cherrypy/_cprequest.py

@@ -186 +186 @@
-        
-        # Try successive objects (reverse order)
-
+
+
-            
-            name, candidate, nodeconf, curpath = object_trail[i]
@@ -203 +204 @@
-            
-            # Uncomment the next line to restrict positional params to "default".
-len(object_trail)
+num_candidates
-            
-            # Try the current leaf.
-            if getattr(candidate, 'exposed', False):
-                request.config = set_conf()
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                return candidate, names[i:-1]
-        
@@ -222 +222 @@
-        request.config = set_conf()
-        return None, []
+    
+    def check_missing_slash(self):
+        """Redirect if path_info has no trailing slash (if configured)."""
+        request = cherrypy.request
+        pi = request.path_info
+        
+        # Must use config here because tool_up probably hasn't run yet.
+        if request.config.get("request.redirect_on_missing_slash",
+                              request.redirect_on_missing_slash):
+            if pi[-1:] != '/':
+                atoms = request.browser_url.split("?", 1)
+                new_url = atoms.pop(0) + '/'
+                if atoms:
+                    new_url += "?" + atoms[0]
+                raise cherrypy.HTTPRedirect(new_url)
+    
+    def check_extra_slash(self):
+        """Redirect if path_info has trailing slash (if configured)."""
+        request = cherrypy.request
+        pi = request.path_info
+        
+        # Must use config here because tool_up hasn't run yet.
+        if request.config.get("request.redirect_on_extra_slash",
+                              request.redirect_on_extra_slash):
+            # If pi == '/', don't redirect to ''!
+            if pi[-1:] == '/' and pi != '/':
+                atoms = request.browser_url.split("?", 1)
+                new_url = atoms.pop(0)[:-1]
+                if atoms:
+                    new_url += "?" + atoms[0]
+                raise cherrypy.HTTPRedirect(new_url)
-
-
@@ -300 +331 @@
-    config = None
-    recursive_redirect = False
+    redirect_on_extra_slash = False
+    redirect_on_missing_slash = True
-    
-    hookpoints = ['on_start_resource', 'before_request_body',

trunk/cherrypy/lib/cptools.py

@@ -220 +220 @@
-    request = cherrypy.request
-    
+    # Guard against running twice.
-    if hasattr(request, "virtual_prefix"):
-        return

trunk/cherrypy/test/test_objectmapping.py

@@ -65 +65 @@
-            return "myMethod from dir1, path_info is:" + repr(cherrypy.request.path_info)
-        myMethod.exposed = True
+        myMethod._cp_config = {'request.redirect_on_extra_slash': True}
-        
-        def default(self, *params):
@@ -92 +93 @@
-        def default(self):
-            return "default for dir3, not exposed"
-    
-    
-    class Dir4:
@@ -179 +179 @@
-            self.assertBody('index for dir2, path is:%s/dir1/dir2/' % prefix)
-            
+            # Test omitted trailing slash (should be redirected by default).
-            self.getPage("/dir1/dir2")
-_(self.status in ('302 Found', '303 See Other'
+Status((302, 303
-            self.assertHeader('Location', 'http://%s:%s%s/dir1/dir2/'
-                              % (self.HOST, self.PORT, prefix))
-            
+            # Test extra trailing slash (should be redirected if configured).
+            self.getPage("/dir1/myMethod/")
+            self.assertStatus((302, 303))
+            self.assertHeader('Location', 'http://%s:%s%s/dir1/myMethod'
+                              % (self.HOST, self.PORT, prefix))
+            
+            # Test that default method must be exposed in order to match.
-            self.getPage("/dir1/dir2/dir3/dir4/index")
-            self.assertBody("default for dir1, param is:('dir2', 'dir3', 'dir4', 'index')")