Skip to content

fix portFromUrl when double protocol is provided #7838

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

Merged
lizan merged 1 commit into from
Aug 7, 2019
Merged

fix portFromUrl when double protocol is provided #7838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions source/common/network/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ uint32_t portFromUrl(const std::string& url, const std::string& scheme,
throw EnvoyException(fmt::format("malformed url: {}", url));
}

size_t rcolon_index = url.rfind(':');
if (colon_index != rcolon_index) {
throw EnvoyException(fmt::format("malformed url: {}", url));
}

try {
return std::stoi(url.substr(colon_index + 1));
} catch (const std::invalid_argument& e) {
Expand Down
2 changes: 2 additions & 0 deletions test/common/network/utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ TEST(NetworkUtility, Url) {
EXPECT_THROW(Utility::hostFromTcpUrl("tcp://foo"), EnvoyException);
EXPECT_THROW(Utility::portFromTcpUrl("tcp://foo"), EnvoyException);
EXPECT_THROW(Utility::portFromTcpUrl("tcp://foo:bar"), EnvoyException);
EXPECT_THROW(Utility::portFromTcpUrl("tcp://https://foo:1234"), EnvoyException);
EXPECT_THROW(Utility::hostFromTcpUrl(""), EnvoyException);
EXPECT_THROW(Utility::portFromTcpUrl("tcp://foo:999999999999"), EnvoyException);
}
Expand All @@ -40,6 +41,7 @@ TEST(NetworkUtility, udpUrl) {
EXPECT_THROW(Utility::portFromUdpUrl("bogus://foo:1234"), EnvoyException);
EXPECT_THROW(Utility::hostFromUdpUrl("tcp://foo"), EnvoyException);
EXPECT_THROW(Utility::portFromUdpUrl("tcp://foo:1234"), EnvoyException);
EXPECT_THROW(Utility::portFromUdpUrl("udp://https://foo:1234"), EnvoyException);
EXPECT_THROW(Utility::hostFromUdpUrl(""), EnvoyException);
EXPECT_THROW(Utility::portFromUdpUrl("udp://foo:999999999999"), EnvoyException);
}
Expand Down