Skip to content

ssl: serialize accesses to SSL socket factory contexts #4345

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
dnoe merged 4 commits into from
Sep 5, 2018
Merged

ssl: serialize accesses to SSL socket factory contexts #4345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f36095
Serialize accesses to SSL socket factory contexts
akonradi Sep 4, 2018
95e24fc
Fix formatting
akonradi Sep 5, 2018
1403338
Use reader/writer locks with RAII
akonradi Sep 5, 2018
299a6b2
Empty commit to trigger CI
akonradi Sep 5, 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
6 changes: 5 additions & 1 deletion source/common/ssl/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ envoy_cc_library(
name = "ssl_socket_lib",
srcs = ["ssl_socket.cc"],
hdrs = ["ssl_socket.h"],
external_deps = ["ssl"],
external_deps = [
"abseil_synchronization",
"ssl",
],
deps = [
":context_config_lib",
":context_lib",
Expand All @@ -23,6 +26,7 @@ envoy_cc_library(
"//source/common/common:assert_lib",
"//source/common/common:empty_string",
"//source/common/common:minimal_logger_lib",
"//source/common/common:thread_annotations",
"//source/common/http:headers_lib",
],
)
Expand Down
22 changes: 18 additions & 4 deletions source/common/ssl/ssl_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,11 @@ Network::TransportSocketPtr ClientSslSocketFactory::createTransportSocket() cons
// onAddOrUpdateSecret() could be invoked in the middle of checking the existence of ssl_ctx and
// creating SslSocket using ssl_ctx. Capture ssl_ctx_ into a local variable so that we check and
// use the same ssl_ctx to create SslSocket.
auto ssl_ctx = ssl_ctx_;
ClientContextSharedPtr ssl_ctx;
{
absl::ReaderMutexLock l(&ssl_ctx_mu_);
ssl_ctx = ssl_ctx_;
}
if (ssl_ctx) {
return std::make_unique<Ssl::SslSocket>(std::move(ssl_ctx), Ssl::InitialState::Client);
} else {
Expand All @@ -436,7 +440,10 @@ bool ClientSslSocketFactory::implementsSecureTransport() const { return true; }

void ClientSslSocketFactory::onAddOrUpdateSecret() {
ENVOY_LOG(debug, "Secret is updated.");
ssl_ctx_ = manager_.createSslClientContext(stats_scope_, *config_);
{
absl::WriterMutexLock l(&ssl_ctx_mu_);
ssl_ctx_ = manager_.createSslClientContext(stats_scope_, *config_);
}
stats_.ssl_context_update_by_sds_.inc();
}

Expand All @@ -454,7 +461,11 @@ Network::TransportSocketPtr ServerSslSocketFactory::createTransportSocket() cons
// onAddOrUpdateSecret() could be invoked in the middle of checking the existence of ssl_ctx and
// creating SslSocket using ssl_ctx. Capture ssl_ctx_ into a local variable so that we check and
// use the same ssl_ctx to create SslSocket.
auto ssl_ctx = ssl_ctx_;
ServerContextSharedPtr ssl_ctx;
{
absl::ReaderMutexLock l(&ssl_ctx_mu_);
ssl_ctx = ssl_ctx_;
}
if (ssl_ctx) {
return std::make_unique<Ssl::SslSocket>(std::move(ssl_ctx), Ssl::InitialState::Server);
} else {
Expand All @@ -468,7 +479,10 @@ bool ServerSslSocketFactory::implementsSecureTransport() const { return true; }

void ServerSslSocketFactory::onAddOrUpdateSecret() {
ENVOY_LOG(debug, "Secret is updated.");
ssl_ctx_ = manager_.createSslServerContext(stats_scope_, *config_, server_names_);
{
absl::WriterMutexLock l(&ssl_ctx_mu_);
ssl_ctx_ = manager_.createSslServerContext(stats_scope_, *config_, server_names_);
}
stats_.ssl_context_update_by_sds_.inc();
}

Expand Down
7 changes: 5 additions & 2 deletions source/common/ssl/ssl_socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "common/common/logger.h"
#include "common/ssl/context_impl.h"

#include "absl/synchronization/mutex.h"
#include "openssl/ssl.h"

namespace Envoy {
Expand Down Expand Up @@ -101,7 +102,8 @@ class ClientSslSocketFactory : public Network::TransportSocketFactory,
Stats::Scope& stats_scope_;
SslSocketFactoryStats stats_;
ClientContextConfigPtr config_;
ClientContextSharedPtr ssl_ctx_;
mutable absl::Mutex ssl_ctx_mu_;
ClientContextSharedPtr ssl_ctx_ GUARDED_BY(ssl_ctx_mu_);
};

class ServerSslSocketFactory : public Network::TransportSocketFactory,
Expand All @@ -123,7 +125,8 @@ class ServerSslSocketFactory : public Network::TransportSocketFactory,
SslSocketFactoryStats stats_;
ServerContextConfigPtr config_;
const std::vector<std::string> server_names_;
ServerContextSharedPtr ssl_ctx_;
mutable absl::Mutex ssl_ctx_mu_;
ServerContextSharedPtr ssl_ctx_ GUARDED_BY(ssl_ctx_mu_);
};

} // namespace Ssl
Expand Down