From 3b273ff51782a7ecda16ab285e9146e5baa0be0c Mon Sep 17 00:00:00 2001 From: spez Date: Wed, 29 Oct 2008 14:14:44 -0700 Subject: [PATCH] ignore malformed cookies --- r2/r2/controllers/reddit_base.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index e8ec02acc..f3086169e 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -39,6 +39,7 @@ from r2.lib.template_helpers import add_sr from r2.lib.jsontemplates import api_type from copy import copy +from Cookie import CookieError from datetime import datetime import sha, inspect, simplejson from urllib import quote, unquote @@ -442,8 +443,13 @@ class RedditController(BaseController): # populate c.cookies c.cookies = Cookies() - for k,v in request.cookies.iteritems(): - c.cookies[k] = Cookie(value=unquote(v), dirty=False) + try: + for k,v in request.cookies.iteritems(): + c.cookies[k] = Cookie(value=unquote(v), dirty=False) + except CookieError: + #pylons or one of the associated retarded libraries can't + #handle broken cookies + request.environ['HTTP_COOKIE'] = '' c.response_wrappers = [] c.errors = ErrorSet()