Skip to content

Retrieve the inner SNI in GetRequestedServerName() #1971

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

Closed
ronenschafferibm wants to merge 2 commits into from
Closed

Retrieve the inner SNI in GetRequestedServerName() #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3487d18
Retrieve the inner SNI if exists
ronensc Sep 6, 2018
66a94d2
Use envoy's version that includes network_level_sni_reader filter
ronensc Sep 6, 2018
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
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ bind(
)

# When updating envoy sha manually please update the sha in istio.deps file also
ENVOY_SHA = "2d8386532f68899ca1fe6476dc458b0df1260b29"
ENVOY_SHA = "349a03a250317937e18103bd49925fc9cf4ef480"

http_archive(
name = "envoy",
strip_prefix = "envoy-" + ENVOY_SHA,
url = "https://github.com/istio/envoy/archive/" + ENVOY_SHA + ".zip",
url = "https://github.com/ronenschafferibm/envoy/archive/" + ENVOY_SHA + ".zip",
)

load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
Expand Down
2 changes: 1 addition & 1 deletion istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "istio/envoy",
"file": "WORKSPACE",
"lastStableSHA": "2d8386532f68899ca1fe6476dc458b0df1260b29"
"lastStableSHA": "349a03a250317937e18103bd49925fc9cf4ef480"
}
]
7 changes: 6 additions & 1 deletion src/envoy/tcp/mixer/filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,12 @@ bool Filter::IsMutualTLS() const {
}

bool Filter::GetRequestedServerName(std::string* name) const {
return Utils::GetRequestedServerName(&filter_callbacks_->connection(), name);
bool isSet = Utils::GetRequestedServerName(&filter_callbacks_->connection(), name);
if (!filter_callbacks_->networkLevelRequestedServerName().empty()) {
*name = std::string(filter_callbacks_->networkLevelRequestedServerName());
isSet = true;
}
return isSet;
}

bool Filter::GetDestinationIpPort(std::string* str_ip, int* port) const {
Expand Down