summaryrefslogtreecommitdiff
path: root/jstests/sslSpecial
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2016-05-28 17:55:12 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2016-05-28 17:55:12 -0400
commit6dcdd23dd37ef12c87e71cf59ef01cd82432efe0 (patch)
treec8cfb5acb62c80f375bc37e7d4350382deea6a37 /jstests/sslSpecial
parentd4ac5673ea3f6cef4ce9dbcec90e31813997a528 (diff)
downloadmongo-6dcdd23dd37ef12c87e71cf59ef01cd82432efe0.tar.gz
SERVER-23971 Clang-Format code
Diffstat (limited to 'jstests/sslSpecial')
-rw-r--r--jstests/sslSpecial/mixed_mode_sharded_transition_nossl.js4
-rw-r--r--jstests/sslSpecial/ssl_mixedmode.js4
-rw-r--r--jstests/sslSpecial/upgrade_noauth_to_x509_nossl.js4
-rw-r--r--jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js63
4 files changed, 33 insertions, 42 deletions
diff --git a/jstests/sslSpecial/mixed_mode_sharded_transition_nossl.js b/jstests/sslSpecial/mixed_mode_sharded_transition_nossl.js
index 4978b56e11f..85f775c3b6b 100644
--- a/jstests/sslSpecial/mixed_mode_sharded_transition_nossl.js
+++ b/jstests/sslSpecial/mixed_mode_sharded_transition_nossl.js
@@ -12,9 +12,7 @@ load('jstests/ssl/libs/ssl_helpers.js');
'use strict';
// Disable auth explicitly
- var noAuthOptions = {
- noauth: ''
- };
+ var noAuthOptions = {noauth: ''};
var transitionToX509AllowSSL =
Object.merge(allowSSL, {transitionToAuth: '', clusterAuthMode: 'x509'});
var x509RequireSSL = Object.merge(requireSSL, {clusterAuthMode: 'x509'});
diff --git a/jstests/sslSpecial/ssl_mixedmode.js b/jstests/sslSpecial/ssl_mixedmode.js
index 085740f0a26..a9eefa16a2c 100644
--- a/jstests/sslSpecial/ssl_mixedmode.js
+++ b/jstests/sslSpecial/ssl_mixedmode.js
@@ -6,9 +6,7 @@
load("jstests/libs/ssl_test.js");
function testCombination(sslMode, sslShell, shouldSucceed) {
- var serverOptionOverrides = {
- sslMode: sslMode
- };
+ var serverOptionOverrides = {sslMode: sslMode};
var clientOptions =
sslShell ? SSLTest.prototype.defaultSSLClientOptions : SSLTest.prototype.noSSLClientOptions;
diff --git a/jstests/sslSpecial/upgrade_noauth_to_x509_nossl.js b/jstests/sslSpecial/upgrade_noauth_to_x509_nossl.js
index 964397397de..9e56c43f81e 100644
--- a/jstests/sslSpecial/upgrade_noauth_to_x509_nossl.js
+++ b/jstests/sslSpecial/upgrade_noauth_to_x509_nossl.js
@@ -16,9 +16,7 @@ load('jstests/ssl/libs/ssl_helpers.js');
var dbName = 'upgradeToX509';
// Disable auth explicitly
- var noAuth = {
- noauth: ''
- };
+ var noAuth = {noauth: ''};
// Undefine the flags we're replacing, otherwise upgradeSet will keep old values.
var transitionToX509AllowSSL =
diff --git a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js
index ec29c991e9d..47cc303069c 100644
--- a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js
+++ b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js
@@ -38,17 +38,16 @@ assert.eq(1, rstConn1.getDB("test").a.count(), "Error interacting with replSet")
print("===== UPGRADE disabled,keyFile -> allowSSL,sendKeyfile =====");
authAllNodes();
-rst.upgradeSet(
- {
- sslMode: "allowSSL",
- sslPEMKeyFile: SERVER_CERT,
- sslAllowInvalidCertificates: "",
- clusterAuthMode: "sendKeyFile",
- keyFile: KEYFILE,
- sslCAFile: CA_CERT
- },
- "root",
- "pwd");
+rst.upgradeSet({
+ sslMode: "allowSSL",
+ sslPEMKeyFile: SERVER_CERT,
+ sslAllowInvalidCertificates: "",
+ clusterAuthMode: "sendKeyFile",
+ keyFile: KEYFILE,
+ sslCAFile: CA_CERT
+},
+ "root",
+ "pwd");
authAllNodes();
rst.awaitReplication();
@@ -57,17 +56,16 @@ rstConn2.getDB("test").a.insert({a: 2, str: "CHECKCHECKCHECK"});
assert.eq(2, rstConn2.getDB("test").a.count(), "Error interacting with replSet");
print("===== UPGRADE allowSSL,sendKeyfile -> preferSSL,sendX509 =====");
-rst.upgradeSet(
- {
- sslMode: "preferSSL",
- sslPEMKeyFile: SERVER_CERT,
- sslAllowInvalidCertificates: "",
- clusterAuthMode: "sendX509",
- keyFile: KEYFILE,
- sslCAFile: CA_CERT
- },
- "root",
- "pwd");
+rst.upgradeSet({
+ sslMode: "preferSSL",
+ sslPEMKeyFile: SERVER_CERT,
+ sslAllowInvalidCertificates: "",
+ clusterAuthMode: "sendX509",
+ keyFile: KEYFILE,
+ sslCAFile: CA_CERT
+},
+ "root",
+ "pwd");
authAllNodes();
rst.awaitReplication();
@@ -88,17 +86,16 @@ assert.eq(0, canConnectSSL, "SSL Connection attempt failed when it should succee
print("===== UPGRADE preferSSL,sendX509 -> preferSSL,x509 =====");
// we cannot upgrade past preferSSL here because it will break the test client
-rst.upgradeSet(
- {
- sslMode: "preferSSL",
- sslPEMKeyFile: SERVER_CERT,
- sslAllowInvalidCertificates: "",
- clusterAuthMode: "x509",
- keyFile: KEYFILE,
- sslCAFile: CA_CERT
- },
- "root",
- "pwd");
+rst.upgradeSet({
+ sslMode: "preferSSL",
+ sslPEMKeyFile: SERVER_CERT,
+ sslAllowInvalidCertificates: "",
+ clusterAuthMode: "x509",
+ keyFile: KEYFILE,
+ sslCAFile: CA_CERT
+},
+ "root",
+ "pwd");
authAllNodes();
rst.awaitReplication();
var rstConn4 = rst.getPrimary();