Add unit test for GetActiveUsers

Verify that the external users is correctly reported

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

Author: trondn

protocol/connection/client_mcbp_commands.h

@@ -642,6 +642,10 @@ using BinprotIsaslRefreshCommand =
 
 using BinprotIsaslRefreshResponse = BinprotResponse;
 
+using BinprotGetActiveUsersCommand = BinprotCommandT<
+        BinprotGenericCommand,
+        uint8_t(cb::mcbp::ClientOpcode::GetActiveExternalUsers)>;
+
 class BinprotMutationCommand : public BinprotCommandT<BinprotMutationCommand> {
 public:
     BinprotMutationCommand& setMutationType(MutationType);

tests/testapp/testapp_external_auth.cc

@@ -111,6 +111,54 @@ class ExternalAuthTest : public TestappClientTest {
         provider->sendFrame(frame);
     }
 
+    std::unique_ptr<MemcachedConnection> loginOsbourne() {
+        auto ret = getConnection().clone();
+
+        BinprotSaslAuthCommand saslAuthCommand;
+        saslAuthCommand.setChallenge({"\0osbourne\0password", 18});
+        saslAuthCommand.setMechanism("PLAIN");
+        ret->sendCommand(saslAuthCommand);
+
+        stepAuthProvider();
+
+        // Now read out the response from the client
+        BinprotResponse response;
+        ret->recvResponse(response);
+        if (!response.isSuccess()) {
+            return {};
+        }
+
+        return ret;
+    }
+
+    /**
+     * We've got multiple worker threads and if we try to disconnect a user
+     * connected to one thread that thread may not be sheduled to run
+     * immediately, so we may end up serving requests for another worker
+     * thread.
+     *
+     * To work around this (and try to avoid spurious test failures) we'll
+     * try to run the command a few times before we give up.
+     *
+     * @param content what we want the content of the users list to be
+     */
+    void waitForUserList(const std::string& content) {
+        const auto start = std::chrono::steady_clock::now();
+        do {
+            auto& conn = getAdminConnection();
+            auto resp = conn.execute(BinprotGetActiveUsersCommand{});
+            if (resp.isSuccess() && content == resp.getDataString()) {
+                return;
+            }
+        } while ((std::chrono::steady_clock::now() - start) <
+                 std::chrono::seconds(2));
+
+        auto& conn = getAdminConnection();
+        auto resp = conn.execute(BinprotGetActiveUsersCommand{});
+        FAIL() << "Timed out trying to get expected content [" << content
+               << "] Current content is: " << resp.getDataString();
+    }
+
     std::unique_ptr<MemcachedConnection> provider;
 };
 
@@ -255,3 +303,36 @@ TEST_P(ExternalAuthTest, TestReloadRbacDbDontNukeExternalUsers) {
     EXPECT_EQ("external", json["osbourne"]["domain"])
             << response.getDataString();
 }
+
+TEST_P(ExternalAuthTest, GetActiveUsers) {
+    // Log in a few "local" users
+    auto& conn = getConnection();
+    auto clone1 = conn.clone();
+    auto clone2 = conn.clone();
+    auto clone3 = conn.clone();
+    auto clone4 = conn.clone();
+
+    clone1->authenticate("smith", "smithpassword", "PLAIN");
+    clone2->authenticate("smith", "smithpassword", "PLAIN");
+    clone3->authenticate("jones", "jonespassword", "PLAIN");
+    clone4->authenticate("@admin", "password", "PLAIN");
+
+    // Log in 2 external ones
+    auto osbourne1 = loginOsbourne();
+    EXPECT_TRUE(osbourne1);
+
+    auto osbourne2 = loginOsbourne();
+    EXPECT_TRUE(osbourne2);
+
+    waitForUserList(R"(["osbourne"])");
+
+    // Log out one of the external users
+    osbourne1.reset();
+
+    waitForUserList(R"(["osbourne"])");
+
+    // Log out the second external user
+    osbourne2.reset();
+
+    waitForUserList(R"([])");
+}

tests/testapp/testapp_misc.cc

@@ -62,31 +62,6 @@ TEST_P(MiscTest, GetFailoverLog) {
     EXPECT_EQ(header.cas, 0);
 }
 
-TEST_P(MiscTest, GetActiveUsers) {
-    auto& conn = getConnection();
-    auto clone1 = conn.clone();
-    auto clone2 = conn.clone();
-    auto clone3 = conn.clone();
-    auto clone4 = conn.clone();
-
-    clone1->authenticate("smith", "smithpassword", "PLAIN");
-    clone2->authenticate("smith", "smithpassword", "PLAIN");
-    clone3->authenticate("jones", "jonespassword", "PLAIN");
-    clone4->authenticate("@admin", "password", "PLAIN");
-
-    conn = getAdminConnection();
-    BinprotCommand cmd;
-    cmd.setOp(uint8_t(cb::mcbp::ClientOpcode::GetActiveExternalUsers));
-    BinprotResponse resp;
-
-    conn.executeCommand(cmd, resp);
-    EXPECT_TRUE(resp.isSuccess());
-    // We don't have any external users to test with for now.. will add
-    // them after we've added support for external auth through our mock
-    // server
-    EXPECT_EQ("[]", resp.getDataString());
-}
-
 /**
  * Send the UpdateUserPermissions with a valid username and paylaod.
  *