SERVER-53604 Convey both id and full arn to authenticate audit events

1 files changed, 53 insertions, 4 deletions

diff --git a/src/mongo/db/audit.h b/src/mongo/db/audit.h
index 1fb5a06f254..5f0c3e329db 100644
--- a/src/mongo/db/audit.h
+++ b/src/mongo/db/audit.h
@@ -39,11 +39,13 @@
 #include "mongo/db/auth/user.h"
 #include "mongo/db/ops/write_ops.h"
 #include "mongo/rpc/op_msg.h"
+#include "mongo/util/functional.h"
 
 namespace mongo {
 
 class AuthorizationSession;
 class BSONObj;
+class BSONObjBuilder;
 class Client;
 class NamespaceString;
 class OperationContext;
@@ -86,12 +88,59 @@ public:
 };
 
 /**
+ * AuthenticateEvent is a opaque view into a finished authentication handshake.
+ *
+ * This object is only valid within its initial stack context.
+ */
+class AuthenticateEvent {
+public:
+    using Appender = unique_function<void(BSONObjBuilder*)>;
+
+    AuthenticateEvent(StringData mechanism,
+                      StringData db,
+                      StringData user,
+                      Appender appender,
+                      ErrorCodes::Error result)
+        : _mechanism(mechanism),
+          _db(db),
+          _user(user),
+          _appender(std::move(appender)),
+          _result(result) {}
+
+    StringData getMechanism() const {
+        return _mechanism;
+    }
+
+    StringData getDatabase() const {
+        return _db;
+    }
+
+    StringData getUser() const {
+        return _user;
+    }
+
+    ErrorCodes::Error getResult() const {
+        return _result;
+    }
+
+    void appendExtraInfo(BSONObjBuilder* bob) const {
+        _appender(bob);
+    }
+
+private:
+    StringData _mechanism;
+    StringData _db;
+    StringData _user;
+
+    Appender _appender;
+
+    ErrorCodes::Error _result;
+};
+
+/**
  * Logs the result of an authentication attempt.
  */
-void logAuthentication(Client* client,
-                       StringData mechanism,
-                       const UserName& user,
-                       ErrorCodes::Error result);
+void logAuthentication(Client* client, const AuthenticateEvent& event);
 
 //
 // Authorization (authz) logging functions.