Skip to content

TSSslSecretSet: Update SSL_CTX TLS Secrets #8368

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
bneradt merged 1 commit into from
Oct 1, 2021
Merged

TSSslSecretSet: Update SSL_CTX TLS Secrets #8368

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
3 changes: 3 additions & 0 deletions iocore/net/SSLConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,9 @@ SSLCertificateConfig::acquire()
void
SSLCertificateConfig::release(SSLCertLookup *lookup)
{
if (lookup == nullptr) {
return;
}
configProcessor.release(configid, lookup);
}

Expand Down
8 changes: 5 additions & 3 deletions iocore/net/SSLSecret.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ SSLSecret::setSecret(const std::string &name, const char *data, int data_len)
return false;
}
iter->second.assign(data, data_len);
Debug("secret_ssl", "Set secret=%10.s... to %*.s", name.c_str(), static_cast<int>(iter->second.size()), iter->second.data());
Debug("ssl_secret", "Set secret for %s to %.*s", name.c_str(), static_cast<int>(iter->second.size()), iter->second.data());
return true;
}

Expand All @@ -102,9 +102,10 @@ SSLSecret::getSecret(const std::string &name, std::string_view &data) const
{
const std::string *data_item = this->getSecretItem(name);
if (data_item) {
Debug("secret_ssl", "Get secret=%10.s... %s(%zd)", name.c_str(), data_item->data(), data_item->length());
Debug("ssl_secret", "Get secret for %s: %.*s", name.c_str(), static_cast<int>(data_item->length()), data_item->data());
data = *data_item;
} else {
Debug("ssl_secret", "Get secret for %s: not found", name.c_str());
data = std::string_view{};
}
return data_item != nullptr;
Expand All @@ -113,11 +114,12 @@ SSLSecret::getSecret(const std::string &name, std::string_view &data) const
bool
SSLSecret::getOrLoadSecret(const std::string &name1, const std::string &name2, std::string_view &data1, std::string_view &data2)
{
Debug("ssl_secret", "lookup up secrets for %s and %s", name1.c_str(), name2.c_str());
std::scoped_lock lock(secret_map_mutex);
bool found_secret1 = this->getSecret(name1, data1);
bool found_secret2 = name2.empty() || this->getSecret(name2, data2);

// If we can't find either secret, load the both again
// If we can't find either secret, load them both again
if (!found_secret1 || !found_secret2) {
// Make sure each name has an entry
if (!found_secret1) {
Expand Down
7 changes: 7 additions & 0 deletions iocore/net/SSLUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,13 @@ SSLMultiCertConfigLoader::update_ssl_ctx(const std::string &secret_name)
bool retval = true;

SSLCertificateConfig::scoped_config lookup;
if (!lookup) {
// SSLCertificateConfig is still being configured, thus there are no SSL
// contexts to update. This situation can happen during startup if a
// registered hook updates certs before SSLCertContext configuration is
// complete.
return retval;
}
std::set<shared_SSLMultiCertConfigParams> policies;
lookup->getPolicies(secret_name, policies);

Expand Down
6 changes: 5 additions & 1 deletion src/traffic_server/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9511,15 +9511,19 @@ TSSslSecretSet(const char *secret_name, int secret_name_length, const char *secr
SSLConfigParams *load_params = SSLConfig::load_acquire();
SSLConfigParams *params = SSLConfig::acquire();
if (load_params != nullptr) { // Update the current data structure
Debug("ssl.cert_update", "Setting secrets in SSLConfig load for: %.*s", secret_name_length, secret_name);
if (!load_params->secrets.setSecret(std::string(secret_name, secret_name_length), secret_data, secret_data_len)) {
retval = TS_ERROR;
}
SSLConfig::load_release(params);
load_params->updateCTX(std::string(secret_name, secret_name_length));
SSLConfig::load_release(load_params);
}
if (params != nullptr) {
Debug("ssl.cert_update", "Setting secrets in SSLConfig for: %.*s", secret_name_length, secret_name);
if (!params->secrets.setSecret(std::string(secret_name, secret_name_length), secret_data, secret_data_len)) {
retval = TS_ERROR;
}
params->updateCTX(std::string(secret_name, secret_name_length));
SSLConfig::release(params);
}
return retval;
Expand Down