Fixed CP3FilterChainProxy to work correctly.

Greg Turnquist · Greg Turnquist · commit bd39b8e3454d · 2010-08-25T17:30:42.000-05:00
diff --git a/src/plugins/gen-cherrypy-app/cherrypy-app.py b/src/plugins/gen-cherrypy-app/cherrypy-app.py
@@ -45,7 +45,7 @@
     
     conf = {'/': 	{"tools.staticdir.root": os.getcwd(),
                          "tools.sessions.on": True,
-                         "tools.filterChainProxy.on": True},
+                         "tools.securityFilterChain.on": True},
             "/images": 	{"tools.staticdir.on": True,
                          "tools.staticdir.dir": "images"}
             }
diff --git a/src/springpython/security/cherrypy3.py b/src/springpython/security/cherrypy3.py
@@ -26,28 +26,23 @@
 class CP3FilterChainProxy(FilterChainProxy):
     def __init__(self, filterInvocationDefinitionSource=None):
         FilterChainProxy.__init__(self, filterInvocationDefinitionSource)
-        self.logger = logging.getLogger("springpython.security.cherrypy3.CP3FilterChainProxy")
-        cherrypy.tools.filterChainProxy = cherrypy._cptools.HandlerTool(self)
+        self.logger = logging.getLogger("springpython.security.cherrypy3.Another")
+        cherrypy.tools.securityFilterChain = cherrypy._cptools.HandlerTool(self)
 
     def __call__(self, environ=None, start_response=None):
-        innerfunc = cherrypy.request.handler
-        def mini_app(*args, **kwargs):
-            def cherrypy_wrapper(nexthandler, *args, **kwargs):
-                results = nexthandler(*args, **kwargs)
-                self.logger.debug("Results = %s" % results)
-                return results
-            return cherrypy_wrapper(innerfunc, *args, **kwargs)
+        if cherrypy.request.handler is None:
+            return False
 
-        self.application = (self.invoke, (mini_app,))
+        def cherrypy_handler(*args, **kwargs):
+            return cherrypy.request.handler(*args, **kwargs)
 
-        # Store the final results...
+        def func(args):
+           return args[0]() 
+
+        self.application = (func, (cherrypy_handler,))
         cherrypy.response.body = FilterChainProxy.__call__(self, cherrypy.request.wsgi_environ, None)
-        #...and then signal there is no more handling for CherryPy to do.
         return True
 
-    def invoke(self, args):
-        return args[0]()
-
 class CP3SessionStrategy(SessionStrategy):
     def __init__(self):
         SessionStrategy.__init__(self)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`conf = {'/': {"tools.staticdir.root": os.getcwd(),`
`47`	`47`	`"tools.sessions.on": True,`
`48`		`- "tools.filterChainProxy.on": True},`
	`48`	`+ "tools.securityFilterChain.on": True},`
`49`	`49`	`"/images": {"tools.staticdir.on": True,`
`50`	`50`	`"tools.staticdir.dir": "images"}`
`51`	`51`	`}`