address feedback

emelialei88 · emelialei88 · commit 899a9ea5c3df · 2025-10-16T14:56:49.000-04:00
Signed-off-by: Emelia Lei &lt;wlei29@bloomberg.net&gt;
diff --git a/src/groups/mqb/mqba/mqba_authenticator.cpp b/src/groups/mqb/mqba/mqba_authenticator.cpp
@@ -79,6 +79,8 @@ int Authenticator::onAuthenticationRequest(
     const bmqp_ctrlmsg::AuthenticationMessage& authenticationMsg,
     const InitialConnectionContextSp&          context)
 {
+    // executed by one of the *IO* threads
+
     // PRECONDITIONS
     BSLS_ASSERT_SAFE(authenticationMsg.isAuthenticateRequestValue());
     BSLS_ASSERT_SAFE(context->isIncoming());
@@ -95,14 +97,13 @@ int Authenticator::onAuthenticationRequest(
             authenticationMsg,  // authenticationMessage
             context
                 ->authenticationEncodingType(),  // authenticationEncodingType
-            State::e_AUTHENTICATING,             // state
-            mqbnet::ConnectionType::e_UNKNOWN    // connectionType
+            State::e_AUTHENTICATING              // state
         );
 
     context->setAuthenticationContext(authenticationContext);
 
     // Authenticate
-    int rc = authenticateAsync(errorDescription, context, context->channel());
+    int rc = authenticateAsync(errorDescription, context);
 
     return rc;
 }
@@ -112,6 +113,8 @@ int Authenticator::onAuthenticationResponse(
     BSLA_UNUSED const bmqp_ctrlmsg::AuthenticationMessage& authenticationMsg,
     BSLA_UNUSED const InitialConnectionContextSp&          context)
 {
+    // executed by one of the *IO* threads
+
     BALL_LOG_ERROR << "Not Implemented";
 
     return -1;
@@ -160,22 +163,25 @@ int Authenticator::sendAuthenticationMessage(
     return rc_SUCCESS;
 }
 
-int Authenticator::authenticateAsync(
-    bsl::ostream&                          errorDescription,
-    const InitialConnectionContextSp&      context,
-    const bsl::shared_ptr<bmqio::Channel>& channel)
+int Authenticator::authenticateAsync(bsl::ostream& errorDescription,
+                                     const InitialConnectionContextSp& context)
 {
-    int rc = d_threadPool.enqueueJob(
-        bdlf::BindUtil::bindS(d_allocator_p,
-                              &Authenticator::authenticate,
-                              this,
-                              context,
-                              channel));
+    // executed by one of the *IO* threads
+
+    int rc = d_threadPool.enqueueJob(bdlf::BindUtil::bindS(
+        d_allocator_p,
+        &Authenticator::authenticate,
+        this,
+        context,
+        context->channel(),
+        context->state() ==
+            mqbnet::InitialConnectionState::e_DEFAULT_AUTHENTICATING));
 
     if (rc != 0) {
         errorDescription
             << "Failed to enqueue authentication job for '"
-            << channel->peerUri() << "' [rc: " << rc << ", message: "
+            << context->channel()->peerUri() << "' [rc: " << rc
+            << ", message: "
             << context->authenticationContext()->authenticationMessage()
             << "]";
     }
@@ -185,7 +191,8 @@ int Authenticator::authenticateAsync(
 
 void Authenticator::authenticate(
     const InitialConnectionContextSp&      context,
-    const bsl::shared_ptr<bmqio::Channel>& channel)
+    const bsl::shared_ptr<bmqio::Channel>& channel,
+    bool                                   isDefaultAuthn)
 {
     // executed by an *AUTHENTICATION* thread
 
@@ -214,7 +221,8 @@ void Authenticator::authenticate(
 
     int                                  rc = rc_SUCCESS;
     bsl::string                          error;
-    mqbnet::InitialConnectionEvent::Enum input;
+    mqbnet::InitialConnectionEvent::Enum input =
+        InitialConnectionEvent::e_ERROR;
 
     bdlb::ScopeExitAny handleEventOnReturn(
         bdlf::BindUtil::bind(&mqbnet::InitialConnectionContext::handleEvent,
@@ -242,18 +250,15 @@ void Authenticator::authenticate(
     if (processRc != rc_SUCCESS) {
         rc    = (processRc * 10) + rc_PROCESS_AUTHENTICATION_FAILED;
         error = processErrStream.str();
-        input = InitialConnectionEvent::e_ERROR;
         return;  // RETURN
     }
 
     // In the case of a default authentication, we do not need to send
     // an AuthenticationResponse, we just need to continue the negotiation.
-    if (context->state() ==
-        mqbnet::InitialConnectionState::e_DEFAULT_AUTHENTICATING) {
+    if (isDefaultAuthn) {
         if (status.category() != bmqp_ctrlmsg::StatusCategory::E_SUCCESS) {
             rc    = (status.code() * 10) + rc_AUTHENTICATION_FAILED;
             error = status.message();
-            input = InitialConnectionEvent::e_ERROR;
         }
         else {
             input = InitialConnectionEvent::e_AUTHN_SUCCESS;
@@ -272,14 +277,12 @@ void Authenticator::authenticate(
     if (status.category() != bmqp_ctrlmsg::StatusCategory::E_SUCCESS) {
         rc    = (status.code() * 10) + rc_AUTHENTICATION_FAILED;
         error = status.message();
-        input = InitialConnectionEvent::e_ERROR;
         return;  // RETURN
     }
 
     if (sendRc != rc_SUCCESS) {
         rc    = (sendRc * 10) + rc_SEND_AUTHENTICATION_RESPONSE_FAILED;
         error = sendResponseErrStream.str();
-        input = InitialConnectionEvent::e_ERROR;
         return;  // RETURN
     }
 
@@ -496,6 +499,8 @@ int Authenticator::handleAuthentication(
     const InitialConnectionContextSp&          context,
     const bmqp_ctrlmsg::AuthenticationMessage& authenticationMsg)
 {
+    // executed by one of the *IO* threads
+
     enum RcEnum {
         // Value for the various RC error categories
         rc_SUCCESS             = 0,
diff --git a/src/groups/mqb/mqba/mqba_authenticator.h b/src/groups/mqb/mqba/mqba_authenticator.h
@@ -97,6 +97,7 @@ class Authenticator : public mqbnet::Authenticator {
         InitialConnectionContextSp;
 
     typedef mqbnet::InitialConnectionEvent InitialConnectionEvent;
+    typedef mqbnet::InitialConnectionState InitialConnectionState;
 
   private:
     // DATA
@@ -165,20 +166,21 @@ class Authenticator : public mqbnet::Authenticator {
         bmqp::EncodingType::Enum                   authenticationEncodingType);
 
     /// Schedule an authentication job in the thread pool using the
-    /// specified `context` and `channel`.  Return 0 on success, or a
+    /// specified `context`.  Return 0 on success, or a
     /// non-zero error code and populate the specified `errorDescription`
     /// with a description of the error otherwise.
     int authenticateAsync(bsl::ostream&                     errorDescription,
-                          const InitialConnectionContextSp& context,
-                          const bsl::shared_ptr<bmqio::Channel>& channel);
+                          const InitialConnectionContextSp& context);
 
     /// Authenticate the connection using the `AuthenticationMessage` stored in
     /// `context`.  If authentication fails, invoke
-    /// `initialConnectionCompleteCb` to close the `channel`. Also, update the
-    /// state of `context` as appropriate. Return 0 on success, or a
-    /// non-zero error code otherwise.
+    /// `initialConnectionCompleteCb` to close the `channel`.  Also, update the
+    /// state of `context` as appropriate.  `isDefaultAuthn` indicates if this
+    /// is default authentication.  Return 0 on success, or a non-zero error
+    /// code otherwise.
     void authenticate(const InitialConnectionContextSp&      context,
-                      const bsl::shared_ptr<bmqio::Channel>& channel);
+                      const bsl::shared_ptr<bmqio::Channel>& channel,
+                      bool                                   isDefaultAuthn);
 
     /// Reauthenticate the connection using the `AuthenticationMessage`
     /// stored in `context`.  If reauthentication fails, invoke
diff --git a/src/groups/mqb/mqbnet/mqbnet_authenticationcontext.cpp b/src/groups/mqb/mqbnet/mqbnet_authenticationcontext.cpp
@@ -102,7 +102,6 @@ AuthenticationContext::AuthenticationContext(
     const bmqp_ctrlmsg::AuthenticationMessage& authenticationMessage,
     bmqp::EncodingType::Enum                   authenticationEncodingType,
     State                                      state,
-    ConnectionType::Enum                       connectionType,
     bslma::Allocator*                          allocator)
 : d_self(this)  // use default allocator
 , d_mutex()
@@ -112,7 +111,6 @@ AuthenticationContext::AuthenticationContext(
 , d_initialConnectionContext_p(initialConnectionContext)
 , d_authenticationMessage(authenticationMessage)
 , d_authenticationEncodingType(authenticationEncodingType)
-, d_connectionType(connectionType)
 , d_allocator_p(allocator)
 {
     // NOTHING
@@ -142,11 +140,6 @@ void AuthenticationContext::setAuthenticationEncodingType(
     d_authenticationEncodingType = value;
 }
 
-void AuthenticationContext::setConnectionType(ConnectionType::Enum value)
-{
-    d_connectionType = value;
-}
-
 int AuthenticationContext::scheduleReauthn(
     bsl::ostream&                          errorDescription,
     bdlmt::EventScheduler*                 scheduler_p,
@@ -211,7 +204,7 @@ void AuthenticationContext::onReauthenticateErrorOrTimeout(
                    << channel->peerUri() << "' [error: " << errorName
                    << ", code: " << errorCode << "]";
 
-    bmqio::Status status(bmqio::StatusCategory::e_GENERIC_ERROR,
+    bmqio::Status status(bmqio::StatusCategory::e_CANCELED,
                          errorName,
                          errorCode,
                          d_allocator_p);
@@ -270,10 +263,5 @@ AuthenticationContext::authenticationEncodingType() const
     return d_authenticationEncodingType;
 }
 
-ConnectionType::Enum AuthenticationContext::connectionType() const
-{
-    return d_connectionType;
-}
-
 }  // namespace mqbnet
 }  // namespace BloombergLP
diff --git a/src/groups/mqb/mqbnet/mqbnet_authenticationcontext.h b/src/groups/mqb/mqbnet/mqbnet_authenticationcontext.h
@@ -154,8 +154,6 @@ class AuthenticationContext {
     /// encoding type of the received message.
     bmqp::EncodingType::Enum d_authenticationEncodingType;
 
-    ConnectionType::Enum d_connectionType;
-
     /// Allocator to use.
     bslma::Allocator* d_allocator_p;
 
@@ -177,7 +175,6 @@ class AuthenticationContext {
         const bmqp_ctrlmsg::AuthenticationMessage& authenticationMessage,
         bmqp::EncodingType::Enum                   authenticationEncodingType,
         State                                      state,
-        ConnectionType::Enum                       connectionType,
         bslma::Allocator*                          allocator = 0);
 
     // MANIPULATORS
diff --git a/src/groups/mqb/mqbnet/mqbnet_initialconnectioncontext.cpp b/src/groups/mqb/mqbnet/mqbnet_initialconnectioncontext.cpp
diff --git a/src/groups/mqb/mqbnet/mqbnet_initialconnectioncontext.h b/src/groups/mqb/mqbnet/mqbnet_initialconnectioncontext.h
