Skip to content

tls: support for api::v2::DataSource's new inline_string option #2341

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
mattklein123 merged 1 commit into from
Jan 10, 2018
Merged

tls: support for api::v2::DataSource's new inline_string option #2341

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
4 changes: 4 additions & 0 deletions source/common/ssl/context_config_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ ServerContextConfigImpl::ServerContextConfigImpl(const envoy::api::v2::Downstrea
validateAndAppendKey(ret, datasource.inline_bytes());
break;
}
case envoy::api::v2::DataSource::kInlineString: {
validateAndAppendKey(ret, datasource.inline_string());
break;
}
default:
throw EnvoyException(fmt::format("Unexpected DataSource::specifier_case(): {}",
datasource.specifier_case()));
Expand Down
24 changes: 21 additions & 3 deletions test/common/ssl/context_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,23 +248,41 @@ TEST_F(SslServerContextImplTicketTest, TicketKeyNone) {
EXPECT_NO_THROW(loadConfigV2(cfg));
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineSuccess) {
TEST_F(SslServerContextImplTicketTest, TicketKeyInlineBytesSuccess) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_bytes(std::string(80, '\0'));
EXPECT_NO_THROW(loadConfigV2(cfg));
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineFailTooBig) {
TEST_F(SslServerContextImplTicketTest, TicketKeyInlineStringSuccess) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_string(std::string(80, '\0'));
EXPECT_NO_THROW(loadConfigV2(cfg));
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineBytesFailTooBig) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_bytes(std::string(81, '\0'));
EXPECT_THROW(loadConfigV2(cfg), EnvoyException);
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineFailTooSmall) {
TEST_F(SslServerContextImplTicketTest, TicketKeyInlineStringFailTooBig) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_string(std::string(81, '\0'));
EXPECT_THROW(loadConfigV2(cfg), EnvoyException);
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineBytesFailTooSmall) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_bytes(std::string(79, '\0'));
EXPECT_THROW(loadConfigV2(cfg), EnvoyException);
}

TEST_F(SslServerContextImplTicketTest, TicketKeyInlineStringFailTooSmall) {
envoy::api::v2::DownstreamTlsContext cfg;
cfg.mutable_session_ticket_keys()->add_keys()->set_inline_string(std::string(79, '\0'));
EXPECT_THROW(loadConfigV2(cfg), EnvoyException);
}

} // namespace Ssl
} // namespace Envoy