Refactor: Keep a reference to the serverContext in SaslTask

Change-Id: Ic24653fece3f507ca583489df67071cdb3a26a05
Reviewed-on: http://review.couchbase.org/100260
Tested-by: Build Bot <[email protected]>
Reviewed-by: Daniel Owen <[email protected]>

Author: trondn

daemon/sasl_tasks.cc

@@ -21,6 +21,7 @@
 #include "mcaudit.h"
 #include "memcached.h"
 #include <cbsasl/mechanism.h>
+#include <cbsasl/server.h>
 #include <logger/logger.h>
 #include <memcached/rbac.h>
 #include <utilities/logtags.h>
@@ -31,6 +32,7 @@ SaslAuthTask::SaslAuthTask(Cookie& cookie_,
                            const std::string& challenge_)
     : cookie(cookie_),
       connection(connection_),
+      serverContext(connection_.getSaslConn()),
       mechanism(mechanism_),
       challenge(challenge_) {
     // no more init needed
@@ -44,8 +46,8 @@ void SaslAuthTask::notifyExecutionComplete() {
                                               false};
 
     // If CBSASL generated a UUID, we should continue to use that UUID
-    if (connection.getSaslConn().containsUuid()) {
-        cookie.setEventId(connection.getSaslConn().getUuid());
+    if (serverContext.containsUuid()) {
+        cookie.setEventId(serverContext.getUuid());
     }
 
     if (response.first == cb::sasl::Error::OK) {

daemon/sasl_tasks.h

@@ -24,6 +24,14 @@
 class Connection;
 class Cookie;
 
+namespace cb {
+namespace sasl {
+namespace server {
+class ServerContext;
+} // namespace server
+} // namespace sasl
+} // namespace cb
+
 /**
  * The SaslAuthTask is the abstract base class used during SASL
  * authentication (which is being run by the executor service)
@@ -59,6 +67,7 @@ class SaslAuthTask : public Task {
 protected:
     Cookie& cookie;
     Connection& connection;
+    cb::sasl::server::ServerContext& serverContext;
     std::string mechanism;
     std::string challenge;
     std::pair<cb::sasl::Error, cb::const_char_buffer> response{

daemon/start_sasl_auth_task.cc

@@ -21,6 +21,7 @@
 #include "external_auth_manager_thread.h"
 #include "settings.h"
 #include <cbsasl/mechanism.h>
+#include <cbsasl/server.h>
 #include <logger/logger.h>
 
 StartSaslAuthTask::StartSaslAuthTask(Cookie& cookie_,
@@ -41,7 +42,7 @@ Task::Status StartSaslAuthTask::execute() {
 
 Task::Status StartSaslAuthTask::internal_auth() {
     connection.restartAuthentication();
-    auto& server = connection.getSaslConn();
+    auto& server = serverContext;
 
     try {
         if (connection.isSslEnabled()) {
@@ -92,7 +93,7 @@ Task::Status StartSaslAuthTask::external_auth() {
 
 bool StartSaslAuthTask::onlyRequestExternalAuthentication() {
     try {
-        cb::rbac::createInitialContext(connection.getSaslConn().getUsername(),
+        cb::rbac::createInitialContext(serverContext.getUsername(),
                                        cb::rbac::Domain::External);
         return true;
     } catch (const std::exception&) {
@@ -116,7 +117,7 @@ void StartSaslAuthTask::externalAuthResponse(cb::mcbp::Status status,
 void StartSaslAuthTask::successfull_external_auth() {
     try {
         response.first = cb::sasl::Error::OK;
-        connection.getSaslConn().setDomain(cb::sasl::Domain::External);
+        serverContext.setDomain(cb::sasl::Domain::External);
     } catch (const std::exception& e) {
         LOG_WARNING(R"({} successfull_external_auth() failed. UUID[{}] "{}")",
                     connection.getId(),