diff options
author | Gabriel Marks <gabriel.marks@mongodb.com> | 2020-06-26 15:42:20 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-14 18:38:47 +0000 |
commit | f1d1e28bb59cfdda58c9bf8aaf50561eca3aea4d (patch) | |
tree | cce0ce1d12d507149f7516199ad291f6f3778b7a /src/mongo/util/net/ssl_manager.cpp | |
parent | 526878fe931d0042000a94377501c89b403c43be (diff) | |
download | mongo-f1d1e28bb59cfdda58c9bf8aaf50561eca3aea4d.tar.gz |
SERVER-49114 Replace getSSLManager() with SSLManagerCoordinator
Diffstat (limited to 'src/mongo/util/net/ssl_manager.cpp')
-rw-r--r-- | src/mongo/util/net/ssl_manager.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp index 455a1662a57..54f3435dfe8 100644 --- a/src/mongo/util/net/ssl_manager.cpp +++ b/src/mongo/util/net/ssl_manager.cpp @@ -55,7 +55,7 @@ namespace mongo { -SSLManagerInterface* theSSLManager = nullptr; +SSLManagerCoordinator* theSSLManagerCoordinator; namespace { @@ -336,6 +336,19 @@ boost::optional<std::vector<SSLX509Name::Entry>> getClusterMemberDNOverrideParam } } // namespace +SSLManagerCoordinator* SSLManagerCoordinator::get() { + return theSSLManagerCoordinator; +} + +std::shared_ptr<SSLManagerInterface> SSLManagerCoordinator::getSSLManager() { + return *_manager; +} + +void SSLManagerCoordinator::rotate() {} + +SSLManagerCoordinator::SSLManagerCoordinator() + : _manager(SSLManagerInterface::create(sslGlobalParams, isSSLServer)) {} + void ClusterMemberDNOverride::append(OperationContext* opCtx, BSONObjBuilder& b, const std::string& name) { @@ -551,7 +564,7 @@ TLSVersionCounts& TLSVersionCounts::get(ServiceContext* serviceContext) { MONGO_INITIALIZER_WITH_PREREQUISITES(SSLManagerLogger, ("SSLManager", "GlobalLogManager")) (InitializerContext*) { if (!isSSLServer || (sslGlobalParams.sslMode.load() != SSLParams::SSLMode_disabled)) { - const auto& config = theSSLManager->getSSLConfiguration(); + const auto& config = SSLManagerCoordinator::get()->getSSLManager()->getSSLConfiguration(); if (!config.clientSubjectName.empty()) { LOGV2_DEBUG(23214, 1, @@ -1209,10 +1222,6 @@ void recordTLSVersion(TLSVersion version, const HostAndPort& hostForLogging) { } } -SSLManagerInterface* getSSLManager() { - return theSSLManager; -} - // TODO SERVER-11601 Use NFC Unicode canonicalization bool hostNameMatchForX509Certificates(std::string nameToMatch, std::string certHostName) { nameToMatch = removeFQDNRoot(std::move(nameToMatch)); |