SERVER-45717 Allow changes to clusterIpSourceAllowlist without restart

2 files changed, 11 insertions, 9 deletions

diff --git a/src/mongo/client/authenticate.cpp b/src/mongo/client/authenticate.cpp
index 7180b707f10..a1b3fd5a649 100644
--- a/src/mongo/client/authenticate.cpp
+++ b/src/mongo/client/authenticate.cpp
@@ -253,8 +253,9 @@ Future<void> authenticateInternalClient(
     StepDownBehavior stepDownBehavior,
     RunCommandHook runCommand,
     std::shared_ptr<InternalAuthParametersProvider> internalParamsProvider) {
+    auto systemUser = internalSecurity.getUser();
     return negotiateSaslMechanism(
-               runCommand, internalSecurity.user->getName(), mechanismHint, stepDownBehavior)
+               runCommand, (*systemUser)->getName(), mechanismHint, stepDownBehavior)
         .then([runCommand, clientSubjectName, remote, internalParamsProvider](
                   std::string mechanism) -> Future<void> {
             auto params = internalParamsProvider->get(0, mechanism);
diff --git a/src/mongo/client/internal_auth.cpp b/src/mongo/client/internal_auth.cpp
index 59b8d6da5dc..467fb219546 100644
--- a/src/mongo/client/internal_auth.cpp
+++ b/src/mongo/client/internal_auth.cpp
@@ -103,16 +103,16 @@ BSONObj getInternalAuthParams(size_t idx, StringData mechanism) {
     }
 
     auto password = internalAuthKeys.at(idx);
+    auto systemUser = internalSecurity.getUser();
     if (mechanism == kMechanismScramSha1) {
-        password =
-            mongo::createPasswordDigest(internalSecurity.user->getName().getUser(), password);
+        password = mongo::createPasswordDigest((*systemUser)->getName().getUser(), password);
     }
 
     return BSON(saslCommandMechanismFieldName
-                << mechanism << saslCommandUserDBFieldName
-                << internalSecurity.user->getName().getDB() << saslCommandUserFieldName
-                << internalSecurity.user->getName().getUser() << saslCommandPasswordFieldName
-                << password << saslCommandDigestPasswordFieldName << false);
+                << mechanism << saslCommandUserDBFieldName << (*systemUser)->getName().getDB()
+                << saslCommandUserFieldName << (*systemUser)->getName().getUser()
+                << saslCommandPasswordFieldName << password << saslCommandDigestPasswordFieldName
+                << false);
 }
 
 std::string getBSONString(BSONObj container, StringData field) {
@@ -131,8 +131,9 @@ std::string getInternalAuthDB() {
         return getBSONString(internalAuthParams, saslCommandUserDBFieldName);
     }
 
-    if (auto isu = internalSecurity.user) {
-        return isu->getName().getDB();
+    auto systemUser = internalSecurity.getUser();
+    if (systemUser && *systemUser) {
+        return (*systemUser)->getName().getDB();
     }
 
     return "admin";