Changeset 3771

Timestamp:

11/26/07 20:50:18 (1 year ago)

Author:

faide

Message:

Fix for tickets: #1598, #1407 and #1022.
Applied a fix following an idea of Robert Brewer, and another one following streawkceur's report from some other guy named Adi. Thanks to the three of them!
And last but not least, added some tests to prove the fix works. Tests were supplied by simonk. I had some hard time applying this one after so long, but it was definitely worth it!

Files:

• branches/1.0/turbogears/identity/tests/test_identity.py (modified) (1 diff)
• branches/1.0/turbogears/tests/test_controllers.py (modified) (3 diffs)
• branches/1.0/turbogears/visit/api.py (modified) (4 diffs)

branches/1.0/turbogears/identity/tests/test_identity.py

@@ -441 +441 @@
-        assert 'identity_failed' in firstline, firstline
-
+    def test_decode_filter(self):
+        """Test that the decode filter doesn't break with nested
+        variables and Identity"""
+        testutil.create_request('/in_admin_group?a.b=1&a.c=2')
+        firstline = cherrypy.response.body[0]
+        assert 'identity_failed_answer' in firstline, firstline
-
-class TestTGUser(testutil.DBTest):

branches/1.0/turbogears/tests/test_controllers.py

@@ -221 +221 @@
-            "isinstance(tg_exceptions, KeyError)")(raise_all_exc)
-    raise_all_exc = turbogears.expose()(raise_all_exc)
+
+    def internal_redirect(self, **kwargs):
+        raise cherrypy.InternalRedirect('/internal_redirect_target')
+    internal_redirect = turbogears.expose()(internal_redirect)
+    
+    def internal_redirect_target(self, **kwargs):
+        return "redirected OK"
+    internal_redirect_target = turbogears.expose()(internal_redirect_target)
-
-class TestRoot(unittest.TestCase):
@@ -483 +491 @@
-        #assert "AssertionError" not in outputcap.getvalue()
-
+    def test_internal_redirect(self): 
+        '''
+        test to make sure we don't have regressions on tickets: #1598, #1407
+        and #1022
+        '''
+        testutil.createRequest("/internal_redirect") 
+        firstline = cherrypy.response.body[0] 
+        assert "redirected OK" in firstline 
+        
+    def test_internal_redirect_nested_variables(self): 
+        '''
+        test to make sure we don't have regressions on tickets: #1598, #1407
+        and #1022
+        '''
+        testutil.createRequest("/internal_redirect?a.b=1&a.c=2") 
+        firstline = cherrypy.response.body[0] 
+        print firstline 
+        assert "redirected OK" in firstline
+
-    def test_exc_value(self):
-        '''
@@ -605 +632 @@
-        turbogears.startup.startTurboGears()
-
-
-def test_index_trailing_slash():
-    "If there is no trailing slash on an index method call, redirect"

branches/1.0/turbogears/visit/api.py

@@ -49 +49 @@
-    raise RuntimeError("VisitManager plugin missing: %s" % plugin_name)
-
+def monkey_before_main(self):
+    '''
+    this function is used to monkey patch the decoding filter from cherrypy
+    '''
+    conf = cherrypy.config.get
+    
+    if not conf('decoding_filter.on', False):
+        return
+    
+    if getattr(cherrypy.request, "_decoding_attempted", False):
+        return
+    cherrypy.request._decoding_attempted = True
+
+    enc = conf('decoding_filter.encoding', None)
+    if not enc:
+        ct = cherrypy.request.headers.elements("Content-Type")
+        if ct:
+            ct = ct[0]
+            enc = ct.params.get("charset", None)
+            if (not enc) and ct.value.lower().startswith("text/"):
+                # http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1
+                # When no explicit charset parameter is provided by the
+                # sender, media subtypes of the "text" type are defined
+                # to have a default charset value of "ISO-8859-1" when
+                # received via HTTP.
+                enc = "ISO-8859-1"
+        
+        if not enc:
+            enc = conf('decoding_filter.default_encoding', "utf-8")
+    
+    try:
+        self.decode(enc)
+    except UnicodeDecodeError:
+        # IE and Firefox don't supply a charset when submitting form
+        # params with a CT of application/x-www-form-urlencoded.
+        # So after all our guessing, it could *still* be wrong.
+        # Start over with ISO-8859-1, since that seems to be preferred.
+        self.decode("ISO-8859-1")
+
-# Interface for the TurboGears extension
-def start_extension():
@@ -58 +97 @@
-    if _manager:
-        return
+
+    # Monkey patch CP Decoding filter
+    from cherrypy.filters import decodingfilter
+    decodingfilter.DecodingFilter.before_main = monkey_before_main
-
-    log.info("Visit Tracking starting")
@@ -132 +175 @@
-        an existing visit.
-        '''
+        def encode_utf8(params):
+            '''
+            will recursively encode to utf-8 all values in a dictionnary
+            '''
+            res = dict()
+            for k, v in params.items():
+                if type(v) is dict:
+                    res[k] = encode_utf8(v)
+
+                else:
+                    res[k] = v.encode('utf-8')
+
+            return res
+
-        if not turbogears.config.get("visit.on", True):
-            set_current(None)
@@ -164 +221 @@
-            cherrypy.request.object_path = e.path
-
-
-
-
-
-
-
-
-
-
+
-
-    def _generate_key(self):