minor fix

Signed-off-by: Emelia Lei <[email protected]>

Author: emelialei88

src/groups/mqb/mqba/mqba_authenticator.cpp

@@ -66,22 +66,10 @@ int Authenticator::onAuthenticationRequest(
     bmqp_ctrlmsg::AuthenticateResponse& response =
         authenticationResponse.makeAuthenticateResponse();
 
-    // TODO: authenticate
-    if (authenticateRequest.mechanism() == "") {
-        BALL_LOG_ERROR << "Error on authentication";
-
-        bmqu::MemOutStream os;
-        os << "Mechanism is unspecified";
-        response.status().category() =
-            bmqp_ctrlmsg::StatusCategory::E_NOT_SUPPORTED;
-        response.status().message() = os.str();
-        response.status().code()    = -1;
-    }
-    else {
-        response.status().category() = bmqp_ctrlmsg::StatusCategory::E_SUCCESS;
-        response.status().code()     = 0;
-        response.lifetimeMs()        = 10 * 60 * 1000;
-    }
+    // Always succeeds for now
+    response.status().category() = bmqp_ctrlmsg::StatusCategory::E_SUCCESS;
+    response.status().code()     = 0;
+    response.lifetimeMs()        = 10 * 60 * 1000;
 
     int rc = sendAuthenticationMessage(errorDescription,
                                        authenticationResponse,
@@ -113,7 +101,6 @@ int Authenticator::sendAuthenticationMessage(
 
     bmqp::EncodingType::Enum encodingType = bmqp::EncodingType::e_BER;
 
-    // TODO: why do we create a local allocator?
     bdlma::LocalSequentialAllocator<2048> localAllocator(d_allocator_p);
 
     bmqp::SchemaEventBuilder builder(d_blobSpPool_p,
@@ -144,14 +131,14 @@ int Authenticator::sendAuthenticationMessage(
 void Authenticator::initiateOutboundAuthentication(
     const AuthenticationContextSp& context)
 {
+    BALL_LOG_ERROR << "Not Implemented";
 }
 
 // CREATORS
 Authenticator::Authenticator(BlobSpPool*       blobSpPool,
                              bslma::Allocator* allocator)
 : d_allocator_p(allocator)
 , d_blobSpPool_p(blobSpPool)
-, d_clusterCatalog_p(0)
 {
     // NOTHING
 }
@@ -203,7 +190,9 @@ int Authenticator::handleAuthenticationOnMsgType(
 int Authenticator::authenticationOutboundOrReverse(
     const AuthenticationContextSp& context)
 {
-    return 0;
+    BALL_LOG_ERROR << "Not Implemented";
+
+    return -1;
 }
 
 }  // close package namespace

src/groups/mqb/mqba/mqba_authenticator.h

@@ -86,9 +86,6 @@ class Authenticator : public mqbnet::Authenticator {
 
     BlobSpPool* d_blobSpPool_p;
 
-    /// Cluster catalog to query for cluster information.
-    mqbblp::ClusterCatalog* d_clusterCatalog_p;
-
   private:
     // NOT IMPLEMENTED
 
@@ -165,21 +162,6 @@ class Authenticator : public mqbnet::Authenticator {
         BSLS_KEYWORD_OVERRIDE;
 };
 
-// ============================================================================
-//                             INLINE DEFINITIONS
-// ============================================================================
-
-// -------------------
-// class Authenticator
-// -------------------
-
-inline Authenticator&
-Authenticator::setClusterCatalog(mqbblp::ClusterCatalog* value)
-{
-    d_clusterCatalog_p = value;
-    return *this;
-}
-
 }  // close package namespace
 }  // close enterprise namespace
 

src/groups/mqb/mqba/mqba_initialconnectionhandler.cpp

@@ -208,9 +208,9 @@ int InitialConnectionHandler::processBlob(
             context->negotiationContext());
     }
     else {
-        errorDescription
-            << "Decode NegotiationMessage succeeds but nothing is "
-               "loaded into the NegotiationMessage.";
+        errorDescription << "Decode AuthenticationMessage or "
+                            "NegotiationMessage succeeds but nothing gets "
+                            "loaded in.";
         rc = (rc * 10) + rc_INVALID_NEGOTIATION_MESSAGE;
     }
 
@@ -246,11 +246,11 @@ int InitialConnectionHandler::decodeInitialConnectionMessage(
         return rc_INVALID_MESSAGE;  // RETURN
     }
 
-    bmqp_ctrlmsg::AuthenticationMessage authenticaionMessage;
+    bmqp_ctrlmsg::AuthenticationMessage authenticationMessage;
     bmqp_ctrlmsg::NegotiationMessage    negotiationMessage;
 
     if (event.isAuthenticationEvent()) {
-        const int rc = event.loadAuthenticationEvent(&authenticaionMessage);
+        const int rc = event.loadAuthenticationEvent(&authenticationMessage);
         if (rc != 0) {
             BALL_LOG_ERROR
                 << "Invalid response from broker [reason: 'authentication "
@@ -259,15 +259,14 @@ int InitialConnectionHandler::decodeInitialConnectionMessage(
             return rc_INVALID_AUTHENTICATION_EVENT;  // RETURN
         }
 
-        *authenticationMsg = authenticaionMessage;
+        *authenticationMsg = authenticationMessage;
     }
     else if (event.isControlEvent()) {
         const int rc = event.loadControlEvent(&negotiationMessage);
         if (rc != 0) {
-            BALL_LOG_ERROR
-                << "Invalid response from broker [reason: 'authentication "
-                   "event is not an AuthenticationMessage', rc: "
-                << rc << "]: " << event;
+            BALL_LOG_ERROR << "Invalid response from broker [reason: 'control "
+                              "event is not an NegotiationMessage', rc: "
+                           << rc << "]: " << event;
 
             return rc_INVALID_CONTROL_EVENT;  // RETURN
         }

src/groups/mqb/mqba/mqba_initialconnectionhandler.h

@@ -38,10 +38,6 @@ namespace BloombergLP {
 
 namespace mqba {
 
-// FORWARD DECLARATION
-class SessionNegotiator;
-class Authenticator;
-
 // ==============================
 // class InitialConnectionHandler
 // ==============================