Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2025-03-06 20:58:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of multiple Cookie headers when proxying HTTP/2 to HTTP/1 (#5342)

Browse Source 
* Fix handling of multiple Cookie headers when proxying HTTP/2 to HTTP/1

fix #5337

* Add Tests about converts multiple Cookie headers to HTTP/1 from HTTP/2

* Adjust order

* minor code style nits

* Update CHANGELOG.md

* Update _http1.py

Co-authored-by: Maximilian Hils <github@maximilianhils.com>
This commit is contained in:
rinsuki 2022-05-13 04:04:36 +09:00 committed by GitHub
parent 362c190562
commit 400eb3a285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -41,6 +41,8 @@
([#5332](https://github.com/mitmproxy/mitmproxy/issues/5332), @mhils)
* Improve performance and memory usage by reusing OpenSSL contexts.
([#5339](https://github.com/mitmproxy/mitmproxy/issues/5339), @mhils)
* Fix handling of multiple Cookie headers when proxying HTTP/2 to HTTP/1
([#5337](https://github.com/mitmproxy/mitmproxy/issues/5337), @rinsuki)
## 19 March 2022: mitmproxy 8.0.0

6
mitmproxy/proxy/layers/http/_http1.py
View File

@ -348,6 +348,12 @@ class Http1Client(Http1Connection):
if "Host" not in request.headers and request.authority:
request.headers.insert(0, "Host", request.authority)
request.authority = ""
cookie_headers = request.headers.get_all("Cookie")
if len(cookie_headers) > 1:
# Only HTTP/2 supports multiple cookie headers, HTTP/1.x does not.
# see: https://www.rfc-editor.org/rfc/rfc6265#section-5.4
# https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2.5
request.headers["Cookie"] = "; ".join(cookie_headers)
raw = http1.assemble_request_head(request)
yield commands.SendData(self.conn, raw)
elif isinstance(event, RequestData):

12
test/mitmproxy/proxy/layers/http/test_http_version_interop.py
View File

@ -11,12 +11,20 @@ from mitmproxy.proxy.events import DataReceived
from mitmproxy.proxy.layers import http
from test.mitmproxy.proxy.layers.http.hyper_h2_test_helpers import FrameFactory
from test.mitmproxy.proxy.layers.http.test_http2 import (
example_request_headers,
example_response_headers,
make_h2,
)
from test.mitmproxy.proxy.tutils import Placeholder, Playbook, reply
example_request_headers = (
(b":method", b"GET"),
(b":scheme", b"http"),
(b":path", b"/"),
(b":authority", b"example.com"),
(b"cookie", "a=1"),
(b"cookie", "b=2"),
)
h2f = FrameFactory()
@ -69,7 +77,7 @@ def test_h2_to_h1(tctx):
>> reply()
<< OpenConnection(server)
>> reply(None)
<< SendData(server, b"GET / HTTP/1.1\r\nHost: example.com\r\n\r\n")
<< SendData(server, b"GET / HTTP/1.1\r\nHost: example.com\r\ncookie: a=1; b=2\r\n\r\n")
>> DataReceived(server, b"HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\n")
<< http.HttpResponseHeadersHook(flow)
>> reply()