Skip to content

util: ignore unknown fields in parsing jsons #3778

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
htuch merged 2 commits into from
Jul 3, 2018
Merged

util: ignore unknown fields in parsing jsons #3778

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
6cc8fa3
ignore unknown fields in parsing jsons
kyessenov Jul 2, 2018
d62a8d9
add a regression test
kyessenov Jul 3, 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: 3 additions & 1 deletion source/common/protobuf/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ ProtoValidationException::ProtoValidationException(const std::string& validation
}

void MessageUtil::loadFromJson(const std::string& json, Protobuf::Message& message) {
const auto status = Protobuf::util::JsonStringToMessage(json, &message);
Protobuf::util::JsonParseOptions options;
options.ignore_unknown_fields = true;
const auto status = Protobuf::util::JsonStringToMessage(json, &message, options);
if (!status.ok()) {
throw EnvoyException("Unable to parse JSON as proto (" + status.ToString() + "): " + json);
}
Expand Down
6 changes: 6 additions & 0 deletions test/common/protobuf/utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@ TEST(UtilityTest, JsonConvertSuccess) {
EXPECT_EQ(42, dest_duration.seconds());
}

TEST(UtilityTest, JsonConvertUnknownFieldSuccess) {
const ProtobufWkt::Struct obj = MessageUtil::keyValueStruct("test_key", "test_value");
envoy::config::bootstrap::v2::Bootstrap bootstrap;
EXPECT_NO_THROW(MessageUtil::jsonConvert(obj, bootstrap));
}

TEST(UtilityTest, JsonConvertFail) {
ProtobufWkt::Duration source_duration;
source_duration.set_seconds(-281474976710656);
Expand Down