Changeset 1171

Timestamp:

06/28/06 18:06:42

Author:

fumanchu

Message:

Expanded baseurl tool into a new proxy tool.

Files:

• trunk/cherrypy/_cptools.py (modified) (2 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (3 diffs)
• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/test_proxy.py (moved) (moved from trunk/cherrypy/test/test_baseurl.py) (3 diffs)

trunk/cherrypy/_cptools.py

@@ -63 +63 @@
-        For example:
-        
-base_url
+proxy
-            def whats_my_base(self):
-                return cherrypy.request.base
@@ -285 +285 @@
-default_toolbox = Toolbox()
-default_toolbox.session_auth = MainTool(cptools.session_auth)
-base_url = Tool('before_request_body', cptools.base_url
+proxy = Tool('before_request_body', cptools.proxy
-default_toolbox.response_headers = Tool('before_finalize', cptools.response_headers)
-# We can't call virtual_host in on_start_resource,

trunk/cherrypy/lib/cptools.py

@@ -62 +62 @@
-#                                Tool code                                #
-
-base_url(base=None, use_x_forwarded_host=True
+proxy(base=None, local='X-Forwarded-Host', remote='X-Forwarded-For'
-    """Change the base URL (scheme://host[:port]).
-    
@@ -77 +77 @@
-            base = 'http://localhost:%s' % port
-    
-use_x_forwarded_host
-"X-Forwarded-Host"
+local
+local
-    
-    if base.find("://") == -1:
@@ -85 +85 @@
-    
-    request.base = base
+    
+    if remote:
+        xff = request.headers.get(remote)
+        if xff:
+            if remote == 'X-Forwarded-For':
+                # See http://bob.pythonmac.org/archives/2005/09/23/apache-x-forwarded-for-caveat/
+                xff = xff.split(',')[-1].strip()
+            request.remote_host = xff
-
-

trunk/cherrypy/test/test.py

@@ -305 +305 @@
-    
-    testList = [
-baseurl
+proxy
-        'test_caching',
-        'test_config',

trunk/cherrypy/test/test_proxy.py

@@ -10 +10 @@
-            raise cherrypy.HTTPRedirect('dummy')
-        index.exposed = True
+        
+        def remotehost(self):
+            return cherrypy.request.remote_host
+        remotehost.exposed = True
+        
+        def xhost(self):
+            raise cherrypy.HTTPRedirect('blah')
+        xhost.exposed = True
+        xhost._cp_config = {'tools.proxy.local': 'X-Host'}
-    
-    cherrypy.tree.mount(Root())
@@ -15 +24 @@
-            'environment': 'production',
-            'log_to_screen': False,
-base_url
-base_url
+proxy
+proxy
-    })
-
@@ -22 +31 @@
-import helper
-
-BaseUrl
+Proxy
-    
-BaseUrl
+Proxy
-        self.getPage("/")
-        self.assertHeader('Location',
-                          "http://www.mydomain.com%s/dummy" % self.prefix())
+        
+        # Test X-Forwarded-Host (Apache 1.3.33+ and Apache 2)
+        self.getPage("/", headers=[('X-Forwarded-Host', 'http://www.yetanother.com')])
+        self.assertHeader('Location', "http://www.yetanother.com/dummy")
+        self.getPage("/", headers=[('X-Forwarded-Host', 'www.yetanother.com')])
+        self.assertHeader('Location', "http://www.yetanother.com/dummy")
+        
+        # Test X-Forwarded-For (Apache2)
+        self.getPage("/remotehost",
+                     headers=[('X-Forwarded-For', '192.168.0.20')])
+        self.assertBody("192.168.0.20")
+        self.getPage("/remotehost",
+                     headers=[('X-Forwarded-For', '67.15.36.43, 192.168.0.20')])
+        self.assertBody("192.168.0.20")
+        
+        # Test X-Host (lighttpd; see https://trac.lighttpd.net/trac/ticket/418)
+        self.getPage("/xhost", headers=[('X-Host', 'http://www.yetanother.com')])
+        self.assertHeader('Location', "http://www.yetanother.com/blah")
-
-