Compare commits

..

2 Commits

Author SHA1 Message Date
L. Kärkkäinen
a202435283 Skip empty cookie records. Add tests. 2023-10-14 20:03:43 +01:00
L. Kärkkäinen
6d433af406 Accept bare cookies 2023-10-14 18:27:26 +00:00
3 changed files with 35 additions and 14 deletions

View File

@@ -73,12 +73,16 @@ def parse_cookie(raw: str) -> Dict[str, List[str]]:
cookies: Dict[str, List[str]] = {}
for token in raw.split(";"):
name, __, value = token.partition("=")
name, sep, value = token.partition("=")
name = name.strip()
value = value.strip()
if not name:
continue
# Support cookies =value or plain value with no name
# https://github.com/httpwg/http-extensions/issues/159
if not sep:
if not name:
continue # Empty value like ;; or a cookie header with no value
name, value = "", name
if COOKIE_NAME_RESERVED_CHARS.search(name): # no cov
continue
@@ -149,11 +153,13 @@ class CookieRequestParameters(RequestParameters):
except KeyError:
return super().get(name, default)
def getlist(self, name: str) -> list[Any]:
def getlist(
self, name: str, default: Optional[Any] = None
) -> Optional[Any]:
try:
return self._get_prefixed_cookie(name)
except KeyError:
return super().getlist(name)
return super().getlist(name, default)
def _get_prefixed_cookie(self, name: str) -> Any:
getitem = super().__getitem__

View File

@@ -19,14 +19,15 @@ class RequestParameters(dict):
return super().get(name, [default])[0]
def getlist(
self, name: str
) -> list[Any]:
self, name: str, default: Optional[Any] = None
) -> Optional[Any]:
"""Return the entire list
Args:
name (str): The name of the parameter
default (Optional[Any], optional): The default value. Defaults to None.
Returns:
list[Any]: The entire list of values or [] if not found
Optional[Any]: The entire list
""" # noqa: E501
return super().get(name) or []
return super().get(name, default)

View File

@@ -11,6 +11,20 @@ from sanic.cookies.request import CookieRequestParameters
from sanic.exceptions import ServerError
from sanic.response import text
from sanic.response.convenience import json
from sanic.cookies.request import parse_cookie
def test_request_cookies():
cdict = parse_cookie("foo=one; foo=two; abc = xyz;;bare;=bare2")
assert cdict == {
"foo": ["one", "two"],
"abc": ["xyz"],
"": ["bare", "bare2"],
}
c = CookieRequestParameters(cdict)
assert c.getlist("foo") == ["one", "two"]
assert c.getlist("abc") == ["xyz"]
assert c.getlist("") == ["bare", "bare2"]
assert c.getlist("bare") == None # [] might be sensible but we got None for now
# ------------------------------------------------------------ #
@@ -445,10 +459,10 @@ def test_cookie_accessors(app: Sanic):
"four": request.cookies.get("four", "fallback"),
},
"getlist": {
"one": request.cookies.getlist("one"),
"two": request.cookies.getlist("two"),
"three": request.cookies.getlist("three"),
"four": request.cookies.getlist("four"),
"one": request.cookies.getlist("one", ["fallback"]),
"two": request.cookies.getlist("two", ["fallback"]),
"three": request.cookies.getlist("three", ["fallback"]),
"four": request.cookies.getlist("four", ["fallback"]),
},
"getattr": {
"one": request.cookies.one,
@@ -484,7 +498,7 @@ def test_cookie_accessors(app: Sanic):
"one": ["1"],
"two": ["2"],
"three": ["3"],
"four": [],
"four": ["fallback"],
},
"getattr": {
"one": "1",