SERVER-34821 Log target connection database separately from username

4 files changed, 14 insertions, 8 deletions

diff --git a/jstests/ssl/x509_all_the_oids.js b/jstests/ssl/x509_all_the_oids.js
index b33bf81c4d7..f99d71cd182 100644
--- a/jstests/ssl/x509_all_the_oids.js
+++ b/jstests/ssl/x509_all_the_oids.js
@@ -30,7 +30,7 @@
         const NAME =
             'role=Datum-72,pseudonym=Datum-65,dmdName=Datum-54,deltaRevocationList=Datum-53,supportedAlgorithms=Datum-52,houseIdentifier=Datum-51,uniqueMember=Datum-50,distinguishedName=Datum-49,protocolInformation=Datum-48,enhancedSearchGuide=Datum-47,dnQualifier=Datum-46,x500UniqueIdentifier=Datum-45,generationQualifier=Datum-44,initials=Datum-43,GN=Datum-42,name=Datum-41,crossCertificatePair=Datum-40,certificateRevocationList=Datum-39,authorityRevocationList=Datum-38,cACertificate=Datum-37,userCertificate=Datum-36,userPassword=Datum-35,seeAlso=Datum-34,roleOccupant=Datum-33,owner=Datum-32,member=Datum-31,supportedApplicationContext=Datum-30,presentationAddress=Datum-29,preferredDeliveryMethod=Datum-28,destinationIndicator=Datum-27,registeredAddress=Datum-26,internationaliSDNNumber=Datum-25,x121Address=Datum-24,facsimileTelephoneNumber=Datum-23,teletexTerminalIdentifier=Datum-22,telexNumber=Datum-21,telephoneNumber=Datum-20,physicalDeliveryOfficeName=Datum-19,postOfficeBox=Datum-18,postalCode=Datum-17,postalAddress=Datum-16,businessCategory=Datum-15,searchGuide=Datum-14,description=Datum-13,title=Datum-12,OU=Datum-11,O=Datum-10,street=Datum-9,ST=NY,L=Datum-7,C=US,serialNumber=Datum-5,SN=Datum-4,CN=Datum-3';
 
-        assert(output.includes('Error: Could not find user ' + NAME + '@$external'),
+        assert(output.includes('Error: Could not find user "' + NAME + '" for db "$external"'),
                "Shell is missing unknown user message");
     }
 
diff --git a/src/mongo/db/auth/authorization_manager_test.cpp b/src/mongo/db/auth/authorization_manager_test.cpp
index 7e93729aed3..d782ec3567b 100644
--- a/src/mongo/db/auth/authorization_manager_test.cpp
+++ b/src/mongo/db/auth/authorization_manager_test.cpp
@@ -252,9 +252,12 @@ private:
                                      << userName.getDB()),
                                 userDoc);
         if (status == ErrorCodes::NoMatchingDocument) {
-            status = Status(ErrorCodes::UserNotFound,
-                            mongoutils::str::stream() << "Could not find user "
-                                                      << userName.getFullName());
+            status =
+                Status(ErrorCodes::UserNotFound,
+                       mongoutils::str::stream() << "Could not find user \"" << userName.getUser()
+                                                 << "\" for db \""
+                                                 << userName.getDB()
+                                                 << "\"");
         }
         return status;
     }
diff --git a/src/mongo/db/auth/authz_manager_external_state_local.cpp b/src/mongo/db/auth/authz_manager_external_state_local.cpp
index 1958970f387..4da06238437 100644
--- a/src/mongo/db/auth/authz_manager_external_state_local.cpp
+++ b/src/mongo/db/auth/authz_manager_external_state_local.cpp
@@ -290,9 +290,11 @@ Status AuthzManagerExternalStateLocal::_getUserDocument(OperationContext* opCtx,
                             userDoc);
 
     if (status == ErrorCodes::NoMatchingDocument) {
-        status =
-            Status(ErrorCodes::UserNotFound,
-                   mongoutils::str::stream() << "Could not find user " << userName.getFullName());
+        status = Status(ErrorCodes::UserNotFound,
+                        mongoutils::str::stream() << "Could not find user \"" << userName.getUser()
+                                                  << "\" for db \""
+                                                  << userName.getDB()
+                                                  << "\"");
     }
     return status;
 }
diff --git a/src/mongo/db/auth/sasl_scram_test.cpp b/src/mongo/db/auth/sasl_scram_test.cpp
index 4520586f0a4..9c75b632428 100644
--- a/src/mongo/db/auth/sasl_scram_test.cpp
+++ b/src/mongo/db/auth/sasl_scram_test.cpp
@@ -499,7 +499,8 @@ TEST_F(SCRAMFixture, testIncorrectUser) {
     ASSERT_OK(saslClientSession->initialize());
 
     ASSERT_EQ(SCRAMStepsResult(SaslTestState(SaslTestState::kServer, 1),
-                               Status(ErrorCodes::UserNotFound, "Could not find user sajack@test")),
+                               Status(ErrorCodes::UserNotFound,
+                                      "Could not find user \"sajack\" for db \"test\"")),
               runSteps());
 }