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.

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

http: removing whitespace from appended XFF headers #3587

Merged
merged 1 commit into from
Jun 11, 2018
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
1 change: 1 addition & 0 deletions docs/root/intro/version_history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Version history
to elide *x-forwarded-for* header modifications.
* http: fixing a bug in inline headers where addCopy and addViaMove didn't add header values when
encountering inline headers with multiple instances.
* http: no longer adding whitespace when appending X-Forwarded-For headers.
* listeners: added :ref:`tcp_fast_open_queue_length <envoy_api_field_Listener.tcp_fast_open_queue_length>` option.
* listeners: added the ability to match :ref:`FilterChain <envoy_api_msg_listener.FilterChain>` using
:ref:`application_protocols <envoy_api_field_listener.FilterChainMatch.application_protocols>`
Expand Down
7 changes: 1 addition & 6 deletions source/common/http/utility.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,9 @@ void Utility::appendXff(HeaderMap& headers, const Network::Address::Instance& re
return;
}

// TODO(alyssawilk) move over to the append utility.
HeaderString& header = headers.insertForwardedFor().value();
if (!header.empty()) {
header.append(", ", 2);
}

const std::string& address_as_string = remote_address.ip()->addressAsString();
header.append(address_as_string.c_str(), address_as_string.size());
HeaderMapImpl::appendToHeader(header, address_as_string.c_str());
}

void Utility::appendVia(HeaderMap& headers, const std::string& via) {
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/conn_manager_utility_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ TEST_F(ConnectionManagerUtilityTest, AppendInternalAddressXffNotInternalRequest)

EXPECT_EQ((MutateRequestRet{"10.0.0.1:0", false}),
callMutateRequestHeaders(headers, Protocol::Http2));
EXPECT_EQ("10.0.0.2, 10.0.0.1", headers.get_("x-forwarded-for"));
EXPECT_EQ("10.0.0.2,10.0.0.1", headers.get_("x-forwarded-for"));
}

// A request that is from an internal address and uses remote address should be an internal request.
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/utility_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TEST(HttpUtility, appendXff) {
TestHeaderMapImpl headers{{"x-forwarded-for", "10.0.0.1"}};
Network::Address::Ipv4Instance address("127.0.0.1");
Utility::appendXff(headers, address);
EXPECT_EQ("10.0.0.1, 127.0.0.1", headers.get_("x-forwarded-for"));
EXPECT_EQ("10.0.0.1,127.0.0.1", headers.get_("x-forwarded-for"));
}

{
Expand Down