Anonymous avatar Anonymous committed 1bc0e7f

Added a trap for Cookies, if the name of the key is invalid. Returns an 400 Bad Request.

Also added a test for this in the test modules.
References bug #868.

Comments (0)

Files changed (2)

cherrypy/_cprequest.py

             # Handle cookies differently because on Konqueror, multiple
             # cookies come on different lines with the same key
             if name == 'Cookie':
-                self.cookie.load(value)
+                try:
+                    self.cookie.load(value)
+                except Cookie.CookieError:
+                    msg = "Illegal cookie name %s" % value.split('=')[0]
+                    raise cherrypy.HTTPError(400, msg)
         
         if not dict.__contains__(headers, 'Host'):
             # All Internet-based HTTP/1.1 servers MUST respond with a 400

cherrypy/test/test_core.py

     
     def testCookies(self):
         if sys.version_info >= (2, 5):
-            self.getPage("/cookies/single?name=First",
-                         [('Cookie', 'First=Dinsdale;')])
-            self.assertHeader('Set-Cookie', 'First=Dinsdale')
-            
-            self.getPage("/cookies/multiple?names=First&names=Last",
-                         [('Cookie', 'First=Dinsdale; Last=Piranha;'),
-                          ])
-            self.assertHeader('Set-Cookie', 'First=Dinsdale')
-            self.assertHeader('Set-Cookie', 'Last=Piranha')
+            header_value = lambda x: x
         else:
-            self.getPage("/cookies/single?name=First",
-                         [('Cookie', 'First=Dinsdale;')])
-            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-            
-            self.getPage("/cookies/multiple?names=First&names=Last",
-                         [('Cookie', 'First=Dinsdale; Last=Piranha;'),
-                          ])
-            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-            self.assertHeader('Set-Cookie', 'Last=Piranha;')
-    
+            header_value = lambda x: x+';'
+
+        self.getPage("/cookies/single?name=First",
+                     [('Cookie', 'First=Dinsdale;')])
+        self.assertHeader('Set-Cookie', header_value('First=Dinsdale'))
+
+        self.getPage("/cookies/multiple?names=First&names=Last",
+                     [('Cookie', 'First=Dinsdale; Last=Piranha;'),
+                      ])
+        self.assertHeader('Set-Cookie', header_value('First=Dinsdale'))
+        self.assertHeader('Set-Cookie', header_value('Last=Piranha'))
+
+        self.getPage("/cookies/single?name=Something-With:Colon",
+            [('Cookie', 'Something-With:Colon=some-value')])
+        self.assertStatus(400)
+
     def testMaxRequestSize(self):
         if getattr(cherrypy.server, "using_apache", False):
             print "skipped due to known Apache differences...",
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.