Skip to content

Do not fail multicert load if line does not create entry #6760

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
shinrich merged 1 commit into from
May 13, 2020
Merged

Do not fail multicert load if line does not create entry #6760

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
12 changes: 8 additions & 4 deletions iocore/net/QUICMultiCertConfigLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,13 @@ QUICMultiCertConfigLoader::_store_ssl_ctx(SSLCertLookup *lookup, const shared_SS
shared_ssl_ticket_key_block keyblock = nullptr;

if (!ctx || !multi_cert_params || !this->_store_single_ssl_ctx(lookup, multi_cert_params, ctx, common_names)) {
lookup->is_valid = false;
retval = false;
retval = false;
std::string names;
for (auto name : data.cert_names_list) {
names.append(name);
names.append(" ");
}
Warning("QUIC: Failed to insert SSL_CTX for certificate %s entries for names already made", names.c_str());
}

for (auto iter = unique_names.begin(); retval && iter != unique_names.end(); ++iter) {
Expand All @@ -205,8 +210,7 @@ QUICMultiCertConfigLoader::_store_ssl_ctx(SSLCertLookup *lookup, const shared_SS

shared_SSL_CTX unique_ctx(this->init_server_ssl_ctx(single_data, multi_cert_params.get(), iter->second), SSL_CTX_free);
if (!unique_ctx || !this->_store_single_ssl_ctx(lookup, multi_cert_params, unique_ctx, iter->second)) {
lookup->is_valid = false;
retval = false;
retval = false;
}
}

Expand Down
12 changes: 8 additions & 4 deletions iocore/net/SSLUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,8 +1420,13 @@ SSLMultiCertConfigLoader::_store_ssl_ctx(SSLCertLookup *lookup, const shared_SSL
shared_SSL_CTX ctx(this->init_server_ssl_ctx(data, sslMultCertSettings.get(), common_names), SSL_CTX_free);

if (!ctx || !sslMultCertSettings || !this->_store_single_ssl_ctx(lookup, sslMultCertSettings, ctx, common_names)) {
lookup->is_valid = false;
retval = false;
retval = false;
std::string names;
for (auto name : data.cert_names_list) {
names.append(name);
names.append(" ");
}
Warning("Failed to insert SSL_CTX for certificate %s entries for names already made", names.c_str());
}

for (auto iter = unique_names.begin(); retval && iter != unique_names.end(); ++iter) {
Expand All @@ -1435,8 +1440,7 @@ SSLMultiCertConfigLoader::_store_ssl_ctx(SSLCertLookup *lookup, const shared_SSL

shared_SSL_CTX unique_ctx(this->init_server_ssl_ctx(single_data, sslMultCertSettings.get(), iter->second), SSL_CTX_free);
if (!unique_ctx || !this->_store_single_ssl_ctx(lookup, sslMultCertSettings, unique_ctx, iter->second)) {
lookup->is_valid = false;
retval = false;
retval = false;
}
}

Expand Down