diff options
author | David Storch <david.storch@10gen.com> | 2019-05-29 17:01:35 -0400 |
---|---|---|
committer | David Storch <david.storch@10gen.com> | 2019-06-05 15:56:45 -0400 |
commit | 22a595fbef4d023002b3c74d529368fcc4dbb196 (patch) | |
tree | 7b17834f3189c1b16647a40e71af43a2f38b768a /src/mongo/s/mongos_options_init.cpp | |
parent | bcad0d20e517e10f0dab71a0cfabe0a9e25c401b (diff) | |
download | mongo-22a595fbef4d023002b3c74d529368fcc4dbb196.tar.gz |
SERVER-41412 Introduce a search_beta_auth suite.
This variant of search_beta turns on auth on the cluster,
including on the mongotmock, which supports the SCRAM-SHA-1
authentication mechanism.
Also configures the pre-existing search_beta_ssl suite to
use auth.
There are changes in this commit which permit mongotmock to
link in the necessary auth-related code and command line
parameters without pulling in unnecessary dependencies, or
adding new dependencies to mongocryptd.
Diffstat (limited to 'src/mongo/s/mongos_options_init.cpp')
-rw-r--r-- | src/mongo/s/mongos_options_init.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mongo/s/mongos_options_init.cpp b/src/mongo/s/mongos_options_init.cpp index 3b10a7a2ce0..cf139b81b92 100644 --- a/src/mongo/s/mongos_options_init.cpp +++ b/src/mongo/s/mongos_options_init.cpp @@ -33,6 +33,8 @@ #include <iostream> +#include "mongo/db/cluster_auth_mode_option_gen.h" +#include "mongo/db/keyfile_option_gen.h" #include "mongo/db/server_options_base.h" #include "mongo/db/server_options_nongeneral_gen.h" #include "mongo/util/exit_code.h" @@ -47,6 +49,16 @@ MONGO_GENERAL_STARTUP_OPTIONS_REGISTER(MongosOptions)(InitializerContext* contex return status; } + status = addKeyfileServerOption(&moe::startupOptions); + if (!status.isOK()) { + return status; + } + + status = addClusterAuthModeServerOption(&moe::startupOptions); + if (!status.isOK()) { + return status; + } + return addNonGeneralServerOptions(&moe::startupOptions); } |