Remove ServerCookieIface::test_privilege

Use CookieIface::testPrivilege instead Change-Id: Ifd8b5c4b2f8d154c9d9f2390744c2d0392fc2297 Reviewed-on: http://review.couchbase.org/c/kv_engine/+/159022 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: Dave Rigby <daver@couchbase.com>
couchbase · Aug 12, 2021 · a9c94f1 · a9c94f1
1 parent ae75f89
commit a9c94f1
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 49 deletions.
diff --git a/auditd/tests/testauditd.cc b/auditd/tests/testauditd.cc
@@ -85,13 +85,6 @@ class AuditMockServerCookieApi : public ServerCookieIface {
             std::optional<CollectionID> cid) override {
         throw std::runtime_error("Not implemented");
     }
-    cb::rbac::PrivilegeAccess test_privilege(
-            const CookieIface& cookie,
-            cb::rbac::Privilege privilege,
-            std::optional<ScopeID> sid,
-            std::optional<CollectionID> cid) override {
-        throw std::runtime_error("Not implemented");
-    }
     uint32_t get_privilege_context_revision(
             const CookieIface& cookie) override {
         throw std::runtime_error("Not implemented");

diff --git a/daemon/server_api.cc b/daemon/server_api.cc
@@ -138,14 +138,6 @@ struct ServerCookieApi : public ServerCookieIface {
         return getCookie(cookie).checkPrivilege(privilege, sid, cid);
     }
 
-    cb::rbac::PrivilegeAccess test_privilege(
-            const CookieIface& cookie,
-            cb::rbac::Privilege privilege,
-            std::optional<ScopeID> sid,
-            std::optional<CollectionID> cid) override {
-        return getCookie(cookie).testPrivilege(privilege, sid, cid);
-    }
-
     uint32_t get_privilege_context_revision(
             const CookieIface& cookie) override {
         return getCookie(cookie).getPrivilegeContext().getGeneration();

diff --git a/engines/ep/src/ep_engine.cc b/engines/ep/src/ep_engine.cc
@@ -4944,8 +4944,7 @@ cb::engine_errc EventuallyPersistentEngine::testPrivilege(
         std::optional<ScopeID> sid,
         std::optional<CollectionID> cid) const {
     try {
-        switch (serverApi->cookie->test_privilege(cookie, priv, sid, cid)
-                        .getStatus()) {
+        switch (cookie.testPrivilege(priv, sid, cid).getStatus()) {
         case cb::rbac::PrivilegeAccess::Status::Ok:
             return cb::engine_errc::success;
         case cb::rbac::PrivilegeAccess::Status::Fail:

diff --git a/engines/ep/tests/module_tests/dcp_test.cc b/engines/ep/tests/module_tests/dcp_test.cc
@@ -116,13 +116,6 @@ class WrappedServerCookieIface : public ServerCookieIface {
             std::optional<CollectionID> cid) override {
         return wrapped->check_privilege(cookie, privilege, sid, cid);
     }
-    cb::rbac::PrivilegeAccess test_privilege(
-            const CookieIface& cookie,
-            cb::rbac::Privilege privilege,
-            std::optional<ScopeID> sid,
-            std::optional<CollectionID> cid) override {
-        return wrapped->test_privilege(cookie, privilege, sid, cid);
-    }
     uint32_t get_privilege_context_revision(
             const CookieIface& cookie) override {
         return wrapped->get_privilege_context_revision(cookie);

diff --git a/include/memcached/server_cookie_iface.h b/include/memcached/server_cookie_iface.h
@@ -140,23 +140,6 @@ struct ServerCookieIface {
     virtual void setDcpFlowControlBufferSize(const CookieIface& cookie,
                                              std::size_t size) = 0;
 
-    /**
-     * Test if the cookie have the specified privilege in it's active set.
-     *
-     * @param cookie the cookie sent to the engine for an operation
-     * @param privilege the privilege to check for
-     * @param sid the scope id (optional for bucket tests)
-     * @param cid the collection id (optional for scope/bucket tests)
-     * @throws invalid_argument if cid defined but not sid
-     * @return PrivilegeAccess::Ok if the cookie have the privilege in its
-     *         active set. PrivilegeAccess::Fail/FailNoPrivileges otherwise
-     */
-    virtual cb::rbac::PrivilegeAccess test_privilege(
-            const CookieIface& cookie,
-            cb::rbac::Privilege privilege,
-            std::optional<ScopeID> sid,
-            std::optional<CollectionID> cid) = 0;
-
     /// Get the revision number for the privilege context for the cookie to
     /// allow the engine to cache the result of a privilege check if locating
     /// the sid / cid is costly.

diff --git a/programs/engine_testapp/mock_server.cc b/programs/engine_testapp/mock_server.cc
@@ -222,14 +222,6 @@ struct MockServerCookieApi : public ServerCookieIface {
         return cookie.testPrivilege(privilege, sid, cid);
     }
 
-    cb::rbac::PrivilegeAccess test_privilege(
-            const CookieIface& cookie,
-            cb::rbac::Privilege privilege,
-            std::optional<ScopeID> sid,
-            std::optional<CollectionID> cid) override {
-        return cookie.testPrivilege(privilege, sid, cid);
-    }
-
     uint32_t get_privilege_context_revision(
             const CookieIface& cookie) override {
         return privilege_context_revision;