Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 14 insertions, 0 deletions

diff --git a/src/mongo/db/auth/authorization_session_impl.cpp b/src/mongo/db/auth/authorization_session_impl.cpp
index a657784f660..8c2be85d37c 100644
--- a/src/mongo/db/auth/authorization_session_impl.cpp
+++ b/src/mongo/db/auth/authorization_session_impl.cpp
@@ -715,6 +715,20 @@ void AuthorizationSessionImpl::_refreshUserInfoAsNeeded(OperationContext* opCtx)
         auto swUser = authMan.reacquireUser(opCtx, currentUser);
         if (!swUser.isOK()) {
             auto& status = swUser.getStatus();
+            // If an external user is no longer in the cache and cannot be acquired from the cache's
+            // backing external service, it should be removed from _authenticatedUsers. This
+            // guarantees that no operations can be performed until the external authorization
+            // provider comes back up.
+            if (name.getDB() == "$external"_sd) {
+                removeUser(it++);
+                LOGV2(5914804,
+                      "Removed external user from session cache of user information because of "
+                      "error status",
+                      "user"_attr = name,
+                      "status"_attr = status);
+                continue;  // No need to advance "it" in this case.
+            }
+
             switch (status.code()) {
                 case ErrorCodes::UserNotFound: {
                     // User does not exist anymore; remove it from _authenticatedUsers.