Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 56 insertions, 0 deletions

diff --git a/jstests/ssl/ssl_cert_selector.js b/jstests/ssl/ssl_cert_selector.js
new file mode 100644
index 00000000000..f53c784f799
--- /dev/null
+++ b/jstests/ssl/ssl_cert_selector.js
@@ -0,0 +1,56 @@
+/**
+ * Validate that the shell can load certificates from the certificate store and connect to the
+ * server.
+ */
+
+load('jstests/ssl/libs/ssl_helpers.js');
+
+requireSSLProvider('windows', function() {
+    'use strict';
+
+    if (_isWindows()) {
+        // SChannel backed follows Windows rules and only trusts Root in LocalMachine
+        runProgram("certutil.exe", "-addstore", "-f", "Root", "jstests\\libs\\trusted-ca.pem");
+
+        // Import a pfx file since it contains both a cert and private key and is easy to import
+        // via command line.
+        runProgram("certutil.exe",
+                   "-importpfx",
+                   "-f",
+                   "-p",
+                   "qwerty",
+                   "jstests\\libs\\trusted-client.pfx");
+    }
+
+    const conn = MongoRunner.runMongod(
+        {sslMode: 'requireSSL', sslPEMKeyFile: "jstests\\libs\\trusted-server.pem"});
+
+    const testWithCert = function(certSelector) {
+        jsTest.log(`Testing with SSL cert ${certSelector}`);
+        const argv = [
+            'mongo',
+            '--ssl',
+            '--sslCertificateSelector',
+            certSelector,
+            '--port',
+            conn.port,
+            '--eval',
+            'db.runCommand({buildInfo: 1})'
+        ];
+
+        const exitStatus = runMongoProgram.apply(null, argv);
+        assert.eq(exitStatus, 0, "successfully connected with SSL");
+    };
+
+    const trusted_client_thumbprint = cat('jstests/libs/trusted-client.pem.digest.sha1');
+
+    assert.doesNotThrow(function() {
+        testWithCert("thumbprint=" + trusted_client_thumbprint);
+    });
+
+    assert.doesNotThrow(function() {
+        testWithCert("subject=Trusted Kernel Test Client");
+    });
+
+    MongoRunner.stopMongod(conn);
+});