Changeset 1052

Timestamp:

04/21/06 17:43:44

Author:

fumanchu

Message:

Reorganized static tools again. staticdir still needs a way to get the config section as an arg.

Files:

• trunk/cherrypy/lib/static.py (modified) (2 diffs)
• trunk/cherrypy/lib/staticdir.py (deleted)
• trunk/cherrypy/lib/staticfile.py (deleted)
• trunk/cherrypy/test/test_static_filter.py (modified) (1 diff)
• trunk/cherrypy/tools.py (modified) (2 diffs)

trunk/cherrypy/lib/static.py

@@ -6 +6 @@
-
-import os
+import re
+import urllib
-
-import cherrypy
@@ -145 +147 @@
-    return response.body
-
+
+def get_dir(root, dir, match="", content_types=None, index=""):
+    request = cherrypy.request
+    path = request.object_path
+    
+    if match and not re.search(match, path):
+        return False
+    
+    if root == 'global':
+        root = "/"
+    root = root.rstrip(r"\/")
+    
+    branch = urllib.unquote(path[len(root) + 1:].lstrip(r"\/"))
+    
+    # If branch is "", file will end in a slash
+    file = os.path.join(dir, branch)
+    
+    # There's a chance that the branch pulled from the URL might
+    # have ".." or similar uplevel attacks in it. Check that the final
+    # file is a child of dir.
+    if not os.path.normpath(file).startswith(os.path.normpath(dir)):
+        raise cherrypy.HTTPError(403) # Forbidden
+    
+    if not os.path.isabs(file):
+        msg = "static directory requires an absolute path (got '%s')." % file
+        raise cherrypy.WrongConfigValue(msg)
+    
+    def attempt(fname):
+        # you can set the content types for a
+        # complete directory per extension
+        content_type = None
+        if content_types:
+            r, ext = os.path.splitext(fname)
+            content_type = content_types.get(ext[1:], None)
+        serve_file(fname, contentType=content_type)
+    
+    try:
+        attempt(file)
+        return True
+    except cherrypy.NotFound:
+        # If we didn't find the static file, continue handling the
+        # request. We might find a dynamic handler instead.
+        
+        # But first check for an index file if a folder was requested.
+        if index and file[-1] in (r"\/"):
+            try:
+                attempt(os.path.join(file, index))
+                return True
+            except cherrypy.NotFound:
+                pass
+    return False
+
+
+def get_file(filename, match="", content_types=None):
+    if not os.path.isabs(filename):
+        msg = "static file requires an absolute path."
+        raise cherrypy.WrongConfigValue(msg)
+    
+    request = cherrypy.request
+    path = request.object_path
+    
+    if match and not re.search(match, path):
+        return False
+    
+    try:
+        # you can set the content types for a complete directory per extension
+        content_type = None
+        if content_types:
+            root, ext = os.path.splitext(filename)
+            content_type = content_types.get(ext[1:], None)
+        serve_file(filename, contentType=content_type)
+        return True
+    except cherrypy.NotFound:
+        # If we didn't find the static file, continue handling the
+        # request. We might find a dynamic handler instead.
+        return False

trunk/cherrypy/test/test_static_filter.py

@@ -30 +30 @@
-    cherrypy.config.update({
-        'global': {
-
-
+
-            'server.environment': 'production',
-        },
-        '/static': {
-static_filte
-static_filte
-static_filte
+tools.staticdi
+tools.staticdi
+tools.staticdi
-        },
-        '/style.css': {
-
-
-
+
+
-        },
-        '/docroot': {
-static_filte
-static_filte
-static_filte
-static_filte
+tools.staticdi
+tools.staticdi
+tools.staticdi
+tools.staticdi
-        },
-        '/error': {
-static_filte
+tools.staticdi
-            'server.show_tracebacks': True,
-        },

trunk/cherrypy/tools.py

@@ -26 +26 @@
-
-import cherrypy
-
+, static
-
-# These modules are themselves Tools
-, staticfile, staticdir
+
-
-
@@ -97 +97 @@
-response_headers = Tool('before_finalize', cptools.response_headers)
-virtual_host = Tool('before_request_body', cptools.virtual_host)
+staticdir = MainTool(static.get_dir)
+staticfile = MainTool(static.get_file)
-