Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tcp_proxy: ignore transfer encoding in HTTP/1.1 CONNECT responses #14623

Merged
merged 8 commits into from
Jan 12, 2021
Merged

tcp_proxy: ignore transfer encoding in HTTP/1.1 CONNECT responses #14623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35c0ef8
Ignore transfer encoding in response to CONNECT request
irozzo-1A Jan 10, 2021
87b4c33
Fix format
irozzo-1A Jan 10, 2021
abeff7f
Fix failing integration test
irozzo-1A Jan 10, 2021
7262f30
Add release notes
irozzo-1A Jan 11, 2021
64b8c7a
Add docs label and remove TODO
irozzo-1A Jan 11, 2021
2459abb
Remove trace log for CONNECT responses with transfer encoding header
irozzo-1A Jan 11, 2021
b952e08
Merge branch 'master' of https://github.com/envoyproxy/envoy into ign…
irozzo-1A Jan 11, 2021
d38df02
Clean-up release notes
irozzo-1A Jan 11, 2021
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
2 changes: 2 additions & 0 deletions docs/root/intro/arch_overview/http/upgrades.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ will synthesize 200 response headers, and then forward the TCP data as the HTTP
For an example of proxying connect, please see :repo:`configs/proxy_connect.yaml <configs/proxy_connect.yaml>`
For an example of terminating connect, please see :repo:`configs/terminate_connect.yaml <configs/terminate_connect.yaml>`

.. _tunneling-tcp-over-http:

Tunneling TCP over HTTP
^^^^^^^^^^^^^^^^^^^^^^^
Envoy also has support for tunneling raw TCP over HTTP CONNECT requests. Find
Expand Down
3 changes: 2 additions & 1 deletion docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Removed Config or Runtime

New Features
------------
* tcp_proxy: add support for converting raw TCP streams into HTTP/1.1 CONNECT requests. See :ref:`upgrade documentation <tunneling-tcp-over-http>` for details.
mattklein123 marked this conversation as resolved.
Show resolved Hide resolved

Deprecated
----------
----------
9 changes: 0 additions & 9 deletions source/common/http/http1/codec_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,15 +1212,6 @@ Envoy::StatusOr<int> ClientConnectionImpl::onHeadersComplete() {
pending_response_.value().encoder_.connectRequest()) {
ENVOY_CONN_LOG(trace, "codec entering upgrade mode for CONNECT response.", connection_);
handling_upgrade_ = true;

// For responses to connect requests, do not accept the chunked
// encoding header: https://tools.ietf.org/html/rfc7231#section-4.3.6
if (headers->TransferEncoding() &&
absl::EqualsIgnoreCase(headers->TransferEncoding()->value().getStringView(),
Headers::get().TransferEncodingValues.Chunked)) {
RETURN_IF_ERROR(sendProtocolError(Http1ResponseCodeDetails::get().InvalidTransferEncoding));
return codecProtocolError("http/1.1 protocol error: unsupported transfer encoding");
}
}

if (strict_1xx_and_204_headers_ && (parser_.status_code < 200 || parser_.status_code == 204)) {
Expand Down
11 changes: 7 additions & 4 deletions test/integration/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,10 +1645,13 @@ TEST_P(IntegrationTest, ConnectWithChunkedBody) {
EXPECT_FALSE(absl::StrContains(data, "onnection")) << data;
ASSERT_TRUE(fake_upstream_connection->write(
"HTTP/1.1 200 OK\r\ntransfer-encoding: chunked\r\n\r\nb\r\nHello World\r\n0\r\n\r\n"));
// The response will be rejected because chunked headers are not allowed with CONNECT upgrades.
// Envoy will send a local reply due to the invalid upstream response.
tcp_client->waitForDisconnect(false);
EXPECT_TRUE(absl::StartsWith(tcp_client->data(), "HTTP/1.1 503 Service Unavailable\r\n"));
tcp_client->waitForData("\r\n\r\n", false);
EXPECT_TRUE(absl::StartsWith(tcp_client->data(), "HTTP/1.1 200 OK\r\n")) << tcp_client->data();
// Make sure the following payload is proxied without chunks or any other modifications.
ASSERT_TRUE(fake_upstream_connection->waitForData(
FakeRawConnection::waitForInexactMatch("\r\n\r\npayload"), &data));

tcp_client->close();
ASSERT_TRUE(fake_upstream_connection->waitForDisconnect());
}

Expand Down
16 changes: 9 additions & 7 deletions test/integration/tcp_tunneling_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,7 @@ TEST_P(TcpTunnelingIntegrationTest, ContentLengthHeaderIgnoredHttp1) {
ASSERT_TRUE(fake_upstream_connection_->waitForDisconnect());
}

// TODO(irozzo): temporarily disabled as a protocol error is thrown when
// transfer-encoding header is received in CONNECT responses.
TEST_P(TcpTunnelingIntegrationTest, DISABLED_TransferEncodingHeaderIgnoredHttp1) {
TEST_P(TcpTunnelingIntegrationTest, TransferEncodingHeaderIgnoredHttp1) {
if (upstreamProtocol() == FakeHttpConnection::Type::HTTP2) {
return;
}
Expand All @@ -812,13 +810,17 @@ TEST_P(TcpTunnelingIntegrationTest, DISABLED_TransferEncodingHeaderIgnoredHttp1)

// Send upgrade headers downstream, fully establishing the connection.
ASSERT_TRUE(
fake_upstream_connection->write("HTTP/1.1 299 OK\r\nTransfer-encoding: chunked\r\n\r\n"));
fake_upstream_connection->write("HTTP/1.1 200 OK\r\nTransfer-encoding: chunked\r\n\r\n"));

// Now send some data and close the TCP client.
ASSERT_TRUE(tcp_client->write("hello", false));
ASSERT_TRUE(tcp_client->write("hello"));
ASSERT_TRUE(
fake_upstream_connection->waitForData(FakeRawConnection::waitForInexactMatch("hello")));

// Close connections.
ASSERT_TRUE(fake_upstream_connection->close());
ASSERT_TRUE(fake_upstream_connection->waitForDisconnect());
tcp_client->close();
ASSERT_TRUE(upstream_request_->waitForData(*dispatcher_, 5));
ASSERT_TRUE(fake_upstream_connection_->waitForDisconnect());
}

TEST_P(TcpTunnelingIntegrationTest, DeferTransmitDataUntilSuccessConnectResponseIsReceived) {
Expand Down