Skip to content

Commit 2ed27ca

Browse files
authored
Keep HTTP/1.0 CONNECT tunnel sockets open (#503)
1 parent f930742 commit 2ed27ca

3 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎lib/mint/http1.ex‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,16 @@ defmodule Mint.HTTP1 do
11261126
{:ok, request}
11271127
end
11281128

1129+
# A successful CONNECT switches the connection to tunnel mode, so the
1130+
# response's HTTP version and Connection headers no longer determine the
1131+
# lifetime of the underlying socket. In particular, HTTP/1.0 responses are
1132+
# otherwise treated as non-persistent and would close the newly-established
1133+
# tunnel before the caller can use it.
1134+
defp request_done(%{request: %{method: "CONNECT", status: status}} = conn)
1135+
when status in 200..299 do
1136+
pop_request(conn)
1137+
end
1138+
11291139
defp request_done(%{request: request} = conn) do
11301140
conn = pop_request(conn)
11311141

‎test/mint/http1/conn_test.exs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,18 @@ defmodule Mint.HTTP1Test do
165165
assert conn.buffer == "XXX"
166166
end
167167

168+
test "HTTP/1.0 2xx response to CONNECT leaves the tunnel socket open", %{conn: conn} do
169+
{:ok, conn, ref} = HTTP1.request(conn, "CONNECT", "example.com:443", [], nil)
170+
171+
assert {:ok, conn, [_status, _headers, {:done, ^ref}]} =
172+
HTTP1.stream(
173+
conn,
174+
{:tcp, conn.socket, "HTTP/1.0 200 Connection established\r\n\r\n"}
175+
)
176+
177+
assert HTTP1.open?(conn)
178+
end
179+
168180
test "content-length is ignored in 2xx response to CONNECT request", %{conn: conn} do
169181
{:ok, conn, ref} = HTTP1.request(conn, "CONNECT", "example.com:443", [], nil)
170182
response = "HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n"

‎test/mint/tunnel_proxy_connect_test.exs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,26 @@ defmodule Mint.TunnelProxyConnectTest do
3737
assert merge_body(rest, request) == "hello"
3838
end
3939

40+
test "tunnels through a proxy that sends an HTTP/1.0 CONNECT response" do
41+
{origin_port, _origin_ref} = start_tls_origin()
42+
43+
{proxy_port, _proxy_ref} =
44+
start_connect_proxy(
45+
"HTTP/1.0 200 Connection established\r\nProxy-agent: tinyproxy/1.11.1\r\n\r\n"
46+
)
47+
48+
assert {:ok, conn} =
49+
HTTP.connect(:https, "localhost", origin_port,
50+
proxy: {:http, "localhost", proxy_port, []},
51+
transport_opts: [verify: :verify_none]
52+
)
53+
54+
assert {:ok, conn, request} = HTTP.request(conn, "GET", "/", [], nil)
55+
assert {:ok, _conn, responses} = receive_stream(conn)
56+
assert [{:status, ^request, 200}, {:headers, ^request, _headers} | rest] = responses
57+
assert merge_body(rest, request) == "hello"
58+
end
59+
4060
test "a proxy that stalls the CONNECT response yields a tunnel timeout error" do
4161
proxy_port = start_silent_proxy()
4262

0 commit comments

Comments
 (0)