hardcode authn identity

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

Author: emelialei88

src/groups/bmq/bmqa/bmqa_session.cpp

@@ -249,6 +249,14 @@ int SessionUtil::createApplication(SessionImpl* sessionImpl)
 
     static bsls::AtomicInt s_sessionInstanceCount(0);
 
+    // Authentication Message
+    bmqp_ctrlmsg::AuthenticationMessage authenticaionMessage;
+    bmqp_ctrlmsg::AuthenticateRequest&  ar =
+        authenticaionMessage.makeAuthenticateRequest();
+    bsl::string str = "username:password";
+    ar.mechanism()  = "basic";
+    ar.data()       = bsl::vector<char>(str.begin(), str.end());  // hexBinary
+
     // Negotiation Message
     bmqp_ctrlmsg::NegotiationMessage negotiationMessage;
     bmqp_ctrlmsg::ClientIdentity& ci = negotiationMessage.makeClientIdentity();
@@ -314,6 +322,7 @@ int SessionUtil::createApplication(SessionImpl* sessionImpl)
     sessionImpl->d_application_mp.load(
         new (*(sessionImpl->d_allocator_p))
             bmqimp::Application(options,
+                                authenticaionMessage,
                                 negotiationMessage,
                                 eventHandler,
                                 sessionImpl->d_allocator_p),

src/groups/bmq/bmqimp/README.md

@@ -13,13 +13,13 @@ its components directly, but rather use the accessor public APIs from 'bmqa'.
 
 Component Synopsis
 ------------------
-Component                         | Provides ...
-----------------------------------|-----------------------------------------------------------
-`bmqimp_application`              | the top level object to manipulate a session with bmqbrkr.
-`bmqimp_brokersession`            | the implementation of a session with the bmqbrkr.
-`bmqimp_event`                    | a value-semantic type representing an event.
-`bmqimp_eventqueue`               | a thread safe queue of pooled bmqimp::Event items.
-`bmqpimp_eventsstats`             | a mechanism to keep track of Events statistics.
-`bmqpimp_queue`                   | a type object to represent information about a queue.
-`bmqimp_stat`                     | utilities for stat manipulation.
-`bmqimp_negotiatedchannelfactory` | a channel factory that negotiates with a peer.
+Component                                | Provides ...
+-----------------------------------------|-----------------------------------------------------------
+`bmqimp_application`                     | the top level object to manipulate a session with bmqbrkr.
+`bmqimp_brokersession`                   | the implementation of a session with the bmqbrkr.
+`bmqimp_event`                           | a value-semantic type representing an event.
+`bmqimp_eventqueue`                      | a thread safe queue of pooled bmqimp::Event items.
+`bmqpimp_eventsstats`                    | a mechanism to keep track of Events statistics.
+`bmqpimp_queue`                          | a type object to represent information about a queue.
+`bmqimp_stat`                            | utilities for stat manipulation.
+`bmqimp_initialconnectionchannelfactory` | a channel factory that negotiates with a peer.

src/groups/bmq/bmqimp/bmqimp_application.cpp

@@ -20,6 +20,7 @@
 // BMQ
 #include <bmqex_executionpolicy.h>
 #include <bmqex_systemexecutor.h>
+#include <bmqimp_initialconnectionchannelfactory.h>
 #include <bmqio_channelutil.h>
 #include <bmqio_connectoptions.h>
 #include <bmqio_status.h>
@@ -388,7 +389,7 @@ bmqt::GenericResult::Enum Application::startChannel()
         .setAttemptInterval(attemptInterval)
         .setAutoReconnect(true);
 
-    d_negotiatedChannelFactory.connect(
+    d_initialConnectionChannelFactory.connect(
         &status,
         &d_connectHandle_mp,
         options,
@@ -554,10 +555,11 @@ Application::stateCb(bmqimp::BrokerSession::State::Enum    oldState,
 }
 
 Application::Application(
-    const bmqt::SessionOptions&             sessionOptions,
-    const bmqp_ctrlmsg::NegotiationMessage& negotiationMessage,
-    const EventQueue::EventHandlerCallback& eventHandlerCB,
-    bslma::Allocator*                       allocator)
+    const bmqt::SessionOptions&                sessionOptions,
+    const bmqp_ctrlmsg::AuthenticationMessage& authenticationMessage,
+    const bmqp_ctrlmsg::NegotiationMessage&    negotiationMessage,
+    const EventQueue::EventHandlerCallback&    eventHandlerCB,
+    bslma::Allocator*                          allocator)
 : d_allocatorStatContext(bmqst::StatContextConfiguration("Allocators",
                                                          allocator),
                          allocator)
@@ -602,12 +604,15 @@ Application::Application(
                                bdlf::PlaceHolders::_2),  // handle
           allocator),
       allocator)
-, d_negotiatedChannelFactory(
-      NegotiatedChannelFactoryConfig(&d_statChannelFactory,
-                                     negotiationMessage,
-                                     sessionOptions.connectTimeout(),
-                                     d_blobSpPool_sp.get(),
-                                     allocator),
+, d_initialConnectionChannelFactory(
+      InitialConnectionChannelFactoryConfig(
+          &d_statChannelFactory,
+          authenticationMessage,
+          sessionOptions.connectTimeout(),  // TODO: different for authn?
+          negotiationMessage,
+          sessionOptions.connectTimeout(),
+          d_blobSpPool_sp.get(),
+          allocator),
       allocator)
 , d_connectHandle_mp()
 , d_brokerSession(&d_scheduler,
@@ -771,9 +776,9 @@ Application::createMonitor(const bsl::shared_ptr<bmqio::Channel>& channel)
 {
     int maxMissedHeartbeats = k_DEFAULT_MAX_MISSED_HEARTBEATS;
 
-    channel->properties().load(
-        &maxMissedHeartbeats,
-        NegotiatedChannelFactory::k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
+    channel->properties().load(&maxMissedHeartbeats,
+                               InitialConnectionChannelFactory::
+                                   k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
 
     bsl::shared_ptr<bmqp::HeartbeatMonitor> monitor(
         new (d_allocator) bmqp::HeartbeatMonitor(maxMissedHeartbeats),
@@ -794,9 +799,9 @@ void Application::startHeartbeat(
 
     int heartbeatIntervalMs = k_DEFAULT_HEARTBEAT_INTERVAL_MS;
 
-    channel->properties().load(
-        &heartbeatIntervalMs,
-        NegotiatedChannelFactory::k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
+    channel->properties().load(&heartbeatIntervalMs,
+                               InitialConnectionChannelFactory::
+                                   k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
 
     bsls::TimeInterval interval;
     interval.addMilliseconds(heartbeatIntervalMs);

src/groups/bmq/bmqimp/bmqimp_application.h

@@ -38,7 +38,7 @@
 
 #include <bmqimp_brokersession.h>
 #include <bmqimp_eventqueue.h>
-#include <bmqimp_negotiatedchannelfactory.h>
+#include <bmqimp_initialconnectionchannelfactory.h>
 #include <bmqp_ctrlmsg_messages.h>
 #include <bmqp_heartbeatmonitor.h>
 #include <bmqt_sessionoptions.h>
@@ -81,7 +81,7 @@ namespace bmqimp {
 class Application {
   public:
     // PUBLIC TYPES
-    typedef bmqp::BlobPoolUtil::BlobSpPool BlobSpPool;
+    typedef bmqp::BlobPoolUtil::BlobSpPool   BlobSpPool;
     typedef bmqp::BlobPoolUtil::BlobSpPoolSp BlobSpPoolSp;
 
   private:
@@ -134,7 +134,7 @@ class Application {
 
     bmqio::StatChannelFactory d_statChannelFactory;
 
-    NegotiatedChannelFactory d_negotiatedChannelFactory;
+    InitialConnectionChannelFactory d_initialConnectionChannelFactory;
 
     ChannelFactoryOpHandleMp d_connectHandle_mp;
 
@@ -226,7 +226,8 @@ class Application {
         const bsl::shared_ptr<bmqp::HeartbeatMonitor>& monitor);
     bsl::shared_ptr<bmqp::HeartbeatMonitor>
     createMonitor(const bsl::shared_ptr<bmqio::Channel>& channel);
-    void startHeartbeat(const bsl::shared_ptr<bmqio::Channel>&         channel,
+    void
+         startHeartbeat(const bsl::shared_ptr<bmqio::Channel>&         channel,
                         const bsl::shared_ptr<bmqp::HeartbeatMonitor>& monitor);
     void stopHeartbeat();
 
@@ -252,10 +253,12 @@ class Application {
     /// negotiation.  The application will use the specified
     /// `eventHandlerCB`.  Use the specified `allocator` for all memory
     /// allocations.
-    Application(const bmqt::SessionOptions&             sessionOptions,
-                const bmqp_ctrlmsg::NegotiationMessage& negotiationMessage,
-                const EventQueue::EventHandlerCallback& eventHandlerCB,
-                bslma::Allocator*                       allocator);
+    Application(
+        const bmqt::SessionOptions&                sessionOptions,
+        const bmqp_ctrlmsg::AuthenticationMessage& authenticationMessage,
+        const bmqp_ctrlmsg::NegotiationMessage&    negotiationMessage,
+        const EventQueue::EventHandlerCallback&    eventHandlerCB,
+        bslma::Allocator*                          allocator);
 
     /// Destructor
     ~Application();

src/groups/bmq/bmqimp/bmqimp_application.t.cpp

@@ -45,11 +45,14 @@ static void test1_breathingTest()
 
     // Create a default application
     bmqt::SessionOptions options(bmqtst::TestHelperUtil::allocator());
+    bmqp_ctrlmsg::AuthenticationMessage authenticaionMessage(
+        bmqtst::TestHelperUtil::allocator());
     bmqp_ctrlmsg::NegotiationMessage negotiationMessage(
         bmqtst::TestHelperUtil::allocator());
     bmqimp::EventQueue::EventHandlerCallback emptyEventHandler;
 
     bmqimp::Application obj(options,
+                            authenticaionMessage,
                             negotiationMessage,
                             emptyEventHandler,
                             bmqtst::TestHelperUtil::allocator());
@@ -78,11 +81,14 @@ static void test2_startStopTest()
 
     // Create a default application, make sure it can start/stop
     bmqt::SessionOptions options(bmqtst::TestHelperUtil::allocator());
+    bmqp_ctrlmsg::AuthenticationMessage authenticaionMessage(
+        bmqtst::TestHelperUtil::allocator());
     bmqp_ctrlmsg::NegotiationMessage negotiationMessage(
         bmqtst::TestHelperUtil::allocator());
     bmqimp::EventQueue::EventHandlerCallback emptyEventHandler;
 
     bmqimp::Application obj(options,
+                            authenticaionMessage,
                             negotiationMessage,
                             emptyEventHandler,
                             bmqtst::TestHelperUtil::allocator());
@@ -130,11 +136,14 @@ static void test3_startStopAsyncTest()
 
     // Create a default application, make sure it can start/stop
     bmqt::SessionOptions options(bmqtst::TestHelperUtil::allocator());
+    bmqp_ctrlmsg::AuthenticationMessage authenticaionMessage(
+        bmqtst::TestHelperUtil::allocator());
     bmqp_ctrlmsg::NegotiationMessage negotiationMessage(
         bmqtst::TestHelperUtil::allocator());
     bmqimp::EventQueue::EventHandlerCallback emptyEventHandler;
 
     bmqimp::Application obj(options,
+                            authenticaionMessage,
                             negotiationMessage,
                             emptyEventHandler,
                             bmqtst::TestHelperUtil::allocator());

src/groups/bmq/bmqimp/bmqimp_brokersession.cpp

@@ -18,7 +18,7 @@
 
 #include <bmqscm_version.h>
 // BMQ
-#include <bmqimp_negotiatedchannelfactory.h>
+#include <bmqimp_initialconnectionchannelfactory.h>
 #include <bmqimp_queue.h>
 #include <bmqp_ackeventbuilder.h>
 #include <bmqp_ackmessageiterator.h>
@@ -407,7 +407,7 @@ void BrokerSession::SessionFsm::setStarted(
     // Temporary safety switch to control configure request.
     d_session.d_channel_sp->properties().load(
         &d_session.d_doConfigureStream,
-        NegotiatedChannelFactory::k_CHANNEL_PROPERTY_CONFIGURE_STREAM);
+        InitialConnectionChannelFactory::k_CHANNEL_PROPERTY_CONFIGURE_STREAM);
 }
 
 bmqt::GenericResult::Enum
@@ -6051,7 +6051,7 @@ void BrokerSession::onOpenQueueResponse(
 
         if (d_channel_sp->properties().load(
                 &isMPsEx,
-                NegotiatedChannelFactory::k_CHANNEL_PROPERTY_MPS_EX)) {
+                InitialConnectionChannelFactory::k_CHANNEL_PROPERTY_MPS_EX)) {
             BSLS_ASSERT_SAFE(isMPsEx);
             queue->setOldStyle(false);
         }