Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: "Reject header values containing CR, LF or NUL in the pycurl HTTP client"
semver_level: patch
jira_tickets_closed:
- RUN_DEVSDK-3683
---
18 changes: 18 additions & 0 deletions stripe/_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,23 @@ def close(self):
pass


def _assert_no_header_injection(headers: Mapping[str, str]) -> None:
"""Rejects CR, LF and NUL in a header name or value.

pycurl's HTTPHEADER option takes raw "name: value" strings, assembled
here by string formatting rather than passed to a validating library
call. A CR or LF in either half would let the remainder be parsed as an
additional header line.
"""
for key, value in headers.items():
for part in (key, value):
if "\r" in part or "\n" in part or "\0" in part:
raise ValueError(
"Header names and values may not contain CR, LF or "
"NUL characters."
)


class PycurlClient(HTTPClient):
class _ParsedProxy(TypedDict, total=False):
http: Optional["ParseResult"]
Expand Down Expand Up @@ -957,6 +974,7 @@ def _request_internal(
self._curl.setopt(self.pycurl.NOSIGNAL, 1)
self._curl.setopt(self.pycurl.CONNECTTIMEOUT, 30)
self._curl.setopt(self.pycurl.TIMEOUT, 80)
_assert_no_header_injection(headers)
self._curl.setopt(
self.pycurl.HTTPHEADER,
["%s: %s" % (k, v) for k, v in dict(headers).items()],
Expand Down
17 changes: 17 additions & 0 deletions tests/test_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,23 @@ def _check_call(

return _check_call

def test_request_rejects_header_injection(
self, mocked_request_lib, make_request: MakeReqFunc, mock_response
):
mock_response(mocked_request_lib, '{"foo": "baz"}', 200)

hostile_headers = [
{"Stripe-Context": "acct_123\r\nX-Injected: 1"},
{"Stripe-Request-Trigger": "event=evt_1\nX-Injected: 1"},
{"Authorization": "Bearer sk_test_123\r\n"},
{"Authorization": "Bearer sk_test_123\0"},
{"X-Injected\r\nEvil": "value"},
]

for headers in hostile_headers:
with pytest.raises(ValueError):
make_request("get", self.valid_url, headers, None)


class TestPycurlClientHttpProxy(TestPycurlClient):
PROXY = "http://user:withPwd@slap:8888/"
Expand Down
Loading