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

fuzz: fixes oss-fuzz: 8363 #3905

Merged
merged 4 commits into from
Jul 25, 2018
Merged

fuzz: fixes oss-fuzz: 8363 #3905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4dade7
fuzz: fixes oss-fuzz: 8363
anirudhmurali Jul 19, 2018
4b80067
added todo
anirudhmurali Jul 23, 2018
90e3738
addressed comments
anirudhmurali Jul 24, 2018
6b9cb71
added tests and addressed comments
anirudhmurali Jul 25, 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
2 changes: 1 addition & 1 deletion source/common/protobuf/utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ uint64_t fractionalPercentDenominatorToInt(const envoy::type::FractionalPercent&
// @param default_value supplies the default if the field is not present.
#define PROTOBUF_PERCENT_TO_ROUNDED_INTEGER_OR_DEFAULT(message, field_name, max_value, \
default_value) \
((message).has_##field_name() \
((message).has_##field_name() && !std::isnan((message).field_name().value()) \
? ProtobufPercentHelper::convertPercent((message).field_name().value(), max_value) \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine to mitigate the issue today. The clean way to do this is to catch NaN in PGV annotations (i.e. https://github.com/envoyproxy/envoy/blob/master/api/envoy/type/percent.proto#L14, https://github.com/lyft/protoc-gen-validate/blob/master/validate/validate.proto#L98), the same way we validate the [0..100] range.

Can you file an issue for NaN validation at https://github.com/lyft/protoc-gen-validate and add a TODO comment here?

@rodaine @akonradi does this make sense to you?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, this would be a good validation to have in PGV - it's simple, self-contained, and generally useful.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done both 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for filing the issue. I think you need a small change of behavior here. Instead of returning the default in NaN, it should throw EnvoyException(), to allow the NaN to be reflected back to the config pipeline.

: ProtobufPercentHelper::checkAndReturnDefault(default_value, max_value))

Expand Down
29 changes: 29 additions & 0 deletions test/server/server_corpus/clusterfuzz-testcase-server_fuzz_test-5988544525893632
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
static_resources {
clusters {
name: "-2353373969551157135775236"
connect_timeout {
seconds: 12884901890
}
hosts {
pipe {
path: "@"
}
}
outlier_detection {
}
common_lb_config {
healthy_panic_threshold {
value: nan
}
}
}
}
admin {
access_log_path: "@r"
address {
pipe {
path: "W"
}
}
}