Skip to content

Fixes Issue #7824 - The strategies.yaml parser can incorrectly interpret #8742

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
jrushford merged 1 commit into from
Mar 21, 2022
Merged

Fixes Issue #7824 - The strategies.yaml parser can incorrectly interpret #8742

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
10 changes: 9 additions & 1 deletion plugins/experimental/parent_select/strategy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,19 @@ template <> struct convert<PLNHProtocol> {
} else if (node["scheme"].Scalar() == "https") {
nh.scheme = PL_NH_SCHEME_HTTPS;
} else {
nh.scheme = PL_NH_SCHEME_NONE;
throw YAML::ParserException(node["scheme"].Mark(), "no valid scheme defined, valid schemes are http or https");
}
} else {
throw YAML::ParserException(node["scheme"].Mark(), "no scheme defined, valid schemes are http or https");
}
if (node["port"]) {
nh.port = node["port"].as<int>();
if (nh.port <= 0 || nh.port > 65535) {
throw YAML::ParserException(node["port"].Mark(), "port number must be in (inclusive) range 1 - 65,536");
}
} else {
throw YAML::ParserException(node["port"].Mark(),
"no port is defined, a port number must be defined within (inclusive) range 1 - 65,536");
}
if (node["health_check_url"]) {
nh.health_check_url = node["health_check_url"].Scalar();
Expand Down
12 changes: 9 additions & 3 deletions proxy/http/remap/NextHopSelectionStrategy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,19 @@ template <> struct convert<NHProtocol> {
} else if (map["scheme"].Scalar() == "https") {
nh.scheme = NH_SCHEME_HTTPS;
} else {
nh.scheme = NH_SCHEME_NONE;
throw YAML::ParserException(map["scheme"].Mark(), "no valid scheme defined, valid schemes are http or https");
}
} else {
throw YAML::ParserException(map["scheme"].Mark(), "no scheme defined, valid schemes are http or https");
}
if (map["port"]) {
nh.port = map["port"].as<int>();
if ((nh.port <= 0) || (nh.port > 65535)) {
throw YAML::ParserException(map["port"].Mark(), "port number must be in (inclusive) range 0 - 65,536");
if (nh.port <= 0 || nh.port > 65535) {
throw YAML::ParserException(map["port"].Mark(), "port number must be in (inclusive) range 1 - 65,536");
}
} else {
if (nh.port == 0) {
throw YAML::ParserException(map["port"].Mark(), "no port defined must be in (inclusive) range 1 - 65,536");
}
}
if (map["health_check_url"]) {
Expand Down