diff options
author | Marcus Arendt <[email protected]> | 2015-01-26 13:02:40 +0100 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2015-01-26 13:02:40 +0100 |
commit | b7b36d9c0519b5c7f44a8a66cd823191a44c105d (patch) | |
tree | 43836636014191a91f77b8bcc413e405e9798559 /lib/inets/src/http_client | |
parent | ff87c52b703c1820278bbe816fc79d83f8fbf4ef (diff) | |
parent | ed104c7ad0e488d57040c96974b8d0d022a775da (diff) | |
download | otp-b7b36d9c0519b5c7f44a8a66cd823191a44c105d.tar.gz otp-b7b36d9c0519b5c7f44a8a66cd823191a44c105d.tar.bz2 otp-b7b36d9c0519b5c7f44a8a66cd823191a44c105d.zip |
Merge branch 's1n4/httpc_invalid_set_cookies/OTP-12430' into maint
* s1n4/httpc_invalid_set_cookies/OTP-12430:
httpc: Avoid parsing invalid 'Set-Cookie' headers
Diffstat (limited to 'lib/inets/src/http_client')
-rw-r--r-- | lib/inets/src/http_client/httpc_cookie.erl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_cookie.erl b/lib/inets/src/http_client/httpc_cookie.erl index 134115bdfa..5d71a0bb8f 100644 --- a/lib/inets/src/http_client/httpc_cookie.erl +++ b/lib/inets/src/http_client/httpc_cookie.erl @@ -334,9 +334,23 @@ add_domain(Str, #http_cookie{domain_default = true}) -> add_domain(Str, #http_cookie{domain = Domain}) -> Str ++ "; $Domain=" ++ Domain. +is_set_cookie_valid("") -> + %% an empty Set-Cookie header is not valid + false; +is_set_cookie_valid([$=|_]) -> + %% a Set-Cookie header without name is not valid + false; +is_set_cookie_valid(SetCookieHeader) -> + %% a Set-Cookie header without name/value is not valid + case string:chr(SetCookieHeader, $=) of + 0 -> false; + _ -> true + end. + parse_set_cookies(CookieHeaders, DefaultPathDomain) -> - %% empty Set-Cookie header is invalid according to RFC but some sites violate it - SetCookieHeaders = [Value || {"set-cookie", Value} <- CookieHeaders, Value /= ""], + %% filter invalid Set-Cookie headers + SetCookieHeaders = [Value || {"set-cookie", Value} <- CookieHeaders, + is_set_cookie_valid(Value)], Cookies = [parse_set_cookie(SetCookieHeader, DefaultPathDomain) || SetCookieHeader <- SetCookieHeaders], %% print_cookies("Parsed Cookies", Cookies), |