Commits

Anonymous committed e86fc65

User can now change cpg.request.objectPath
Implemented InternalRedirect
Added a VirtualHostFilter and a test for it

Comments (0)

Files changed (6)

cherrypy/_cphttptools.py

 
 import cpg, urllib, sys, time, traceback, types, StringIO, cgi, os
 import mimetypes, sha, random, string, _cputil, cperror, Cookie
+from lib.filter import basefilter
 
 """
 Common Service Code for CherryPy
             cpg.request.fileTypeMap[key] = valueList.type
 
 def applyFilterList(methodName):
-    filterList = _cputil.getSpecialFunction('_cpFilterList')
-    for filter in filterList:
-        method = getattr(filter, methodName, None)
-        if method:
-            method()
+    try:
+        filterList = _cputil.getSpecialFunction('_cpFilterList')
+        for filter in filterList:
+            method = getattr(filter, methodName, None)
+            if method:
+                method()
+    except basefilter.InternalRedirect:
+        # If we get an InternalRedirect, we start the filter list  
+        #   from scratch. Is cpg.request.path or cpg.request.objectPath
+        #   has been modified by the hook, then a new filter list
+        #   will be applied.  
+        # We use recursion so if there is an infinite loop, we'll  
+        #   get the regular python "recursion limit exceeded" exception.  
+        applyFilterList(methodName) 
+
 
 def insertIntoHeaderMap(key,value):
     normalizedKey = '-'.join([s.capitalize() for s in key.split('-')])
     cpg.request.parsePostData = True
     cpg.request.rfile = rfile
 
+    # Change objectPath in filters to change the object that will get rendered
+    cpg.request.objectPath = None 
+
     applyFilterList('afterRequestHeader')
 
     if cpg.request.method == 'POST' and cpg.request.parsePostData:
         wfile.write('\r\n')
         return
          
-    cpg.request.objectPath = '/' + '/'.join(objectPathList)
+    # Remove "root" from objectPathList and join it to get objectPath
+    cpg.request.objectPath = '/' + '/'.join(objectPathList[1:])
     cpg.response.body = func(*(virtualPathList + cpg.request.paramList), **(cpg.request.paramMap))
 
     if cpg.response.sendResponse:
     # Return the last cached object (even if its None)
     return objCache[cacheKey]
 
-def mapPathToObject():
+def mapPathToObject(path = None):
     # Traverse path:
     # for /a/b?arg=val, we'll try:
     #   root.a.b.index -> redirect to /a/b/?arg=val
     # Also, we ignore trailing slashes
     # Also, a method has to have ".exposed = True" in order to be exposed
 
-    path = cpg.request.path
+    if path is None:
+        path = cpg.request.objectPath or cpg.request.path
     if path.startswith('/'): path = path[1:] # Remove leading slash
     if path.endswith('/'): path = path[:-1] # Remove trailing slash
 

cherrypy/_cputil.py

         moduleList.append(root)
         # Try object path
         try:
-            path = cpg.request.path
+            path = cpg.request.objectPath or cpg.request.path
         except:
             path = '/'
         if path:

cherrypy/lib/filter/basefilter.py

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
+class InternalRedirect(Exception): pass
+
 class BaseInputFilter(object):
     """
     Base class for input filters. Derive new filter classes from this, then

cherrypy/test/test.py

 testList = [
     'testObjectMapping',
     'testFilter1',
+    'testVirtualHostFilter',
 ]
 
 if len(sys.argv) > 1:

cherrypy/test/testObjectMapping.py

 
 testList = [
     ("/", "cpg.response.body == 'world'"),
-    ("/dir1/myMethod", '''cpg.response.body == "myMethod from dir1, object Path is:'/root/dir1/myMethod'"'''),
+    ("/dir1/myMethod", '''cpg.response.body == "myMethod from dir1, object Path is:'/dir1/myMethod'"'''),
     ("/this/method/does/not/exist", '''cpg.response.body == "default:('this', 'method', 'does', 'not', 'exist')"'''),
     ("/other", "cpg.response.body == 'other'"),
     ("/notExposed", '''cpg.response.body == "default:('notExposed',)"'''),

cherrypy/test/testVirtualHostFilter.py

+"""
+Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the CherryPy Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+import helper, gzip, StringIO
+
+code = r"""
+from cherrypy import cpg
+from cherrypy.lib.filter import basefilter, virtualhostfilter
+
+siteMap = {
+    'site1': '/site1',
+    'site2': '/site2'
+}
+
+class Site1Filter(basefilter.BaseOutputFilter):
+    def beforeResponse(self):
+        cpg.response.body += 'Site1Filter'
+class Site2Filter(basefilter.BaseOutputFilter):
+    def beforeResponse(self):
+        cpg.response.body += 'Site2Filter'
+
+class Root:
+    _cpFilterList = [virtualhostfilter.VirtualHostFilter(siteMap)]
+
+class Site1:
+    _cpFilterList = [Site1Filter()]
+    def index(self):
+        return "SITE1"
+    index.exposed = True
+class Site2:
+    _cpFilterList = [Site2Filter()]
+    def index(self):
+        return "SITE2"
+    index.exposed = True
+
+cpg.root = Root()
+cpg.root.site1 = Site1()
+cpg.root.site2 = Site2()
+cpg.server.start(configFile = 'testsite.cfg')
+"""
+
+test1List = [
+    ('/', "cpg.response.body == 'SITE1Site1Filter'"),
+]
+test2List = [
+    ('/', "cpg.response.body == 'SITE2Site2Filter'"),
+]
+
+def test(infoMap, failedList, skippedList):
+    print "    Testing VirtualHostFilter (1) ...",
+    helper.checkPageResult('VirtualHostFilter', infoMap, code, test1List,
+        failedList, extraRequestHeader = [("X-Forwarded-Host", "site1")])
+    print "    Testing VirtualHostFilter (2) ...",
+    helper.checkPageResult('VirtualHostFilter', infoMap, code, test2List,
+        failedList, extraRequestHeader = [("X-Forwarded-Host", "site2")])
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.