Scrapy, a fast high-level web crawling & scraping framework for Python.
Improve check for invalid cookie in CookiesMiddleware (#4772)
Eugenio Lacuesta307e35c6641c
diff --git a/scrapy/downloadermiddlewares/cookies.py b/scrapy/downloadermiddlewares/cookies.pyindex e2b7dd901..87f8152a4 100644--- a/scrapy/downloadermiddlewares/cookies.py+++ b/scrapy/downloadermiddlewares/cookies.py@@ -74,7 +74,7 @@ class CookiesMiddleware:"""decoded = {}for key in ("name", "value", "path", "domain"):- if not cookie.get(key):+ if cookie.get(key) is None:if key in ("name", "value"):msg = "Invalid cookie found in request {}: {} ('{}' is missing)"logger.warning(msg.format(request, cookie, key))diff --git a/tests/test_downloadermiddleware_cookies.py b/tests/test_downloadermiddleware_cookies.pyindex 010577415..a3de307ee 100644--- a/tests/test_downloadermiddleware_cookies.py+++ b/tests/test_downloadermiddleware_cookies.py@@ -322,6 +322,9 @@ class CookiesMiddlewareTest(TestCase):cookies2 = [{'name': 'foo'}, {'name': 'key', 'value': 'value2'}]req2 = Request('http://example.org/2', cookies=cookies2)assert self.mw.process_request(req2, self.spider) is None+ cookies3 = [{'name': 'foo', 'value': None}, {'name': 'key', 'value': ''}]+ req3 = Request('http://example.org/3', cookies=cookies3)+ assert self.mw.process_request(req3, self.spider) is Nonelc.check(("scrapy.downloadermiddlewares.cookies","WARNING",@@ -331,6 +334,11 @@ class CookiesMiddlewareTest(TestCase):"WARNING","Invalid cookie found in request <GET http://example.org/2>:"" {'name': 'foo'} ('value' is missing)"),+ ("scrapy.downloadermiddlewares.cookies",+ "WARNING",+ "Invalid cookie found in request <GET http://example.org/3>:"+ " {'name': 'foo', 'value': None} ('value' is missing)"),)self.assertCookieValEqual(req1.headers['Cookie'], 'key=value1')self.assertCookieValEqual(req2.headers['Cookie'], 'key=value2')+ self.assertCookieValEqual(req3.headers['Cookie'], 'key=')