diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
| commit | 4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch) | |
| tree | 1682a647d4463397c119183369ae6f750d5fdcff /src/mongo/util/net/ssl_options_server.cpp | |
| parent | aa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff) | |
| parent | 8f0827553e09872941945a093b647a4211a9db7f (diff) | |
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'src/mongo/util/net/ssl_options_server.cpp')
| -rw-r--r-- | src/mongo/util/net/ssl_options_server.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mongo/util/net/ssl_options_server.cpp b/src/mongo/util/net/ssl_options_server.cpp index eb67d49e2c3..4612993df07 100644 --- a/src/mongo/util/net/ssl_options_server.cpp +++ b/src/mongo/util/net/ssl_options_server.cpp @@ -29,7 +29,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kControl -#include "mongo/base/error_codes.h" #include "mongo/platform/basic.h" #include "mongo/util/net/ssl_options.h" @@ -193,27 +192,14 @@ MONGO_STARTUP_OPTIONS_POST(SSLServerOptions)(InitializerContext*) { const auto clusterAuthMode = serverGlobalParams.startupClusterAuthMode; if (sslGlobalParams.sslMode.load() != SSLParams::SSLMode_disabled) { - uassert(ErrorCodes::InvalidOptions, - "Specifying a tlsClusterCAFile requires a tlsCAFile also be specified. See " - "https://dochub.mongodb.org/core/mongod" - "#std-option-mongod.--tlsClusterCAFile for details.", - sslGlobalParams.sslClusterCAFile.empty() || !sslGlobalParams.sslCAFile.empty()); - uassert(ErrorCodes::InvalidOptions, - "The use of both a CA File and the System Certificate store is not supported.", - !sslGlobalParams.sslUseSystemCA || sslGlobalParams.sslCAFile.empty()); - uassert(ErrorCodes::InvalidOptions, - "The use of TLS without specifying a chain of trust is no longer supported. See " - "https://jira.mongodb.org/browse/SERVER-72839 for details.", - sslGlobalParams.sslUseSystemCA || !sslGlobalParams.sslCAFile.empty()); - if (!sslGlobalParams.sslCRLFile.empty() && sslGlobalParams.sslCAFile.empty()) { - uasserted(ErrorCodes::BadValue, - "Specifying a tlsCRLFile requires a tlsCAFile also be specified."); - } bool usingCertifiateSelectors = params.count("net.tls.certificateSelector"); if (sslGlobalParams.sslPEMKeyFile.size() == 0 && !usingCertifiateSelectors) { uasserted(ErrorCodes::BadValue, "need tlsCertificateKeyFile or certificateSelector when TLS is enabled"); } + if (!sslGlobalParams.sslCRLFile.empty() && sslGlobalParams.sslCAFile.empty()) { + uasserted(ErrorCodes::BadValue, "need tlsCAFile with tlsCRLFile"); + } std::string sslCANotFoundError( "No TLS certificate validation can be performed since" |