From 0c2d7974a785d6dfabb8857ec974a85e8864277c Mon Sep 17 00:00:00 2001
From: Spencer Jackson <spencer.jackson@mongodb.com>
Date: Wed, 21 Jun 2017 13:56:22 -0400
Subject: SERVER-29568: Create opensslCipherConfig setParameter

(cherry picked from commit b964786f0ce519caf214f4c321d2a2abf9580365)
---
 src/mongo/util/net/ssl_manager.cpp | 25 +++++++++++++++++++++++++
 src/mongo/util/net/ssl_options.cpp |  7 +++++++
 2 files changed, 32 insertions(+)

diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 95bfa0e23c4..187c0c105e2 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -90,6 +90,31 @@ ExportedServerParameter<bool, ServerParameterType::kStartupOnly>
                                             "disableNonSSLConnectionLogging",
                                             &sslGlobalParams.disableNonSSLConnectionLogging);
 
+class OpenSSLCipherConfigParameter
+    : public ExportedServerParameter<std::string, ServerParameterType::kStartupOnly> {
+public:
+    OpenSSLCipherConfigParameter()
+        : ExportedServerParameter<std::string, ServerParameterType::kStartupOnly>(
+              ServerParameterSet::getGlobal(),
+              "opensslCipherConfig",
+              &sslGlobalParams.sslCipherConfig) {}
+    Status validate(const std::string& potentialNewValue) final {
+        if (!sslGlobalParams.sslCipherConfig.empty()) {
+            return Status(
+                ErrorCodes::BadValue,
+                "opensslCipherConfig setParameter is incompatible with net.ssl.sslCipherConfig");
+        }
+        // Note that there is very little validation that we can do here.
+        // OpenSSL exposes no API to validate a cipher config string. The only way to figure out
+        // what a string maps to is to make an SSL_CTX object, set the string on it, then parse the
+        // resulting STACK_OF object. If provided an invalid entry in the string, it will silently
+        // ignore it. Because an entry in the string may map to multiple ciphers, or remove ciphers
+        // from the final set produced by the full string, we can't tell if any entry failed
+        // to parse.
+        return Status::OK();
+    }
+} openSSLCipherConfig;
+
 #ifdef MONGO_CONFIG_SSL
 // Old copies of OpenSSL will not have constants to disable protocols they don't support.
 // Define them to values we can OR together safely to generically disable these protocols across
diff --git a/src/mongo/util/net/ssl_options.cpp b/src/mongo/util/net/ssl_options.cpp
index 5d548029c80..2a9090d4531 100644
--- a/src/mongo/util/net/ssl_options.cpp
+++ b/src/mongo/util/net/ssl_options.cpp
@@ -267,6 +267,13 @@ Status storeSSLServerOptions(const moe::Environment& params) {
     }
 
     if (params.count("net.ssl.sslCipherConfig")) {
+        warning()
+            << "net.ssl.sslCipherConfig is deprecated. It will be removed in a future release.";
+        if (!sslGlobalParams.sslCipherConfig.empty()) {
+            return Status(ErrorCodes::BadValue,
+                          "net.ssl.sslCipherConfig is incompatible with the openSSLCipherConfig "
+                          "setParameter");
+        }
         sslGlobalParams.sslCipherConfig = params["net.ssl.sslCipherConfig"].as<string>();
     }
 
-- 
cgit v1.2.1