diff options
author | Spencer T Brody <spencer@10gen.com> | 2013-05-30 17:00:12 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@10gen.com> | 2013-05-31 17:17:06 -0400 |
commit | ed8e8bde125c38db215e1fe5dfbdc2ad560ced4e (patch) | |
tree | 38a1489661827fede6b525ff43cff158a9f1e174 /src | |
parent | 0f97e5ee12313038cc9f0d62184cd98fa80fa790 (diff) | |
download | mongo-ed8e8bde125c38db215e1fe5dfbdc2ad560ced4e.tar.gz |
Rename Auth[Global,Session]ExternalState
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/auth/SConscript | 20 | ||||
-rw-r--r-- | src/mongo/db/auth/authorization_manager.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/auth/authorization_manager.h | 8 | ||||
-rw-r--r-- | src/mongo/db/auth/authorization_session.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/auth/authorization_session.h | 6 | ||||
-rw-r--r-- | src/mongo/db/auth/authorization_session_test.cpp | 6 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state.cpp (renamed from src/mongo/db/auth/auth_global_external_state.cpp) | 14 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state.h (renamed from src/mongo/db/auth/auth_global_external_state.h) | 8 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state_d.cpp (renamed from src/mongo/db/auth/auth_global_external_state_d.cpp) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state_d.h (renamed from src/mongo/db/auth/auth_global_external_state_d.h) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state_s.cpp (renamed from src/mongo/db/auth/auth_global_external_state_s.cpp) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state_s.h (renamed from src/mongo/db/auth/auth_global_external_state_s.h) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state.cpp (renamed from src/mongo/db/auth/auth_session_external_state.cpp) | 14 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state.h (renamed from src/mongo/db/auth/auth_session_external_state.h) | 16 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_d.cpp (renamed from src/mongo/db/auth/auth_session_external_state_d.cpp) | 22 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_d.h (renamed from src/mongo/db/auth/auth_session_external_state_d.h) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_mock.h (renamed from src/mongo/db/auth/auth_session_external_state_mock.h) | 10 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_s.cpp (renamed from src/mongo/db/auth/auth_session_external_state_s.cpp) | 14 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_s.h (renamed from src/mongo/db/auth/auth_session_external_state_s.h) | 12 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_server_common.cpp (renamed from src/mongo/db/auth/auth_session_external_state_server_common.cpp) | 10 | ||||
-rw-r--r-- | src/mongo/db/auth/authz_session_external_state_server_common.h (renamed from src/mongo/db/auth/auth_session_external_state_server_common.h) | 12 | ||||
-rw-r--r-- | src/mongo/db/client.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/db.cpp | 4 | ||||
-rw-r--r-- | src/mongo/s/client_info.cpp | 4 | ||||
-rw-r--r-- | src/mongo/s/s_only.cpp | 4 | ||||
-rw-r--r-- | src/mongo/s/server.cpp | 4 |
26 files changed, 130 insertions, 130 deletions
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index 527c28bbed1..e82b37ccd65 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -10,16 +10,16 @@ env.Command(['action_type.h', 'action_type.cpp'], ['generate_action_types.py', ' # Just the data structures used env.StaticLibrary('authcore', ['action_set.cpp', 'action_type.cpp', - 'auth_global_external_state.cpp', - 'auth_session_external_state.cpp', 'authorization_manager.cpp', - 'role_graph.cpp', - 'role_name.cpp', 'authorization_session.cpp', + 'authz_manager_external_state.cpp', + 'authz_session_external_state.cpp', 'principal.cpp', 'principal_set.cpp', 'privilege.cpp', 'privilege_set.cpp', + 'role_graph.cpp', + 'role_name.cpp', 'user.cpp', 'user_name.cpp'], LIBDEPS=['$BUILD_DIR/mongo/base/base', @@ -27,21 +27,21 @@ env.StaticLibrary('authcore', ['action_set.cpp', '$BUILD_DIR/mongo/stringutils']) env.StaticLibrary('authservercommon', - ['auth_session_external_state_server_common.cpp', - 'auth_server_parameters.cpp', + ['auth_server_parameters.cpp', 'authorization_manager_global.cpp', + 'authz_session_external_state_server_common.cpp', 'security_key.cpp'], LIBDEPS=['authcore']) env.StaticLibrary('authmongod', - ['auth_global_external_state_d.cpp', - 'auth_session_external_state_d.cpp', + ['authz_manager_external_state_d.cpp', + 'authz_session_external_state_d.cpp', 'auth_index_d.cpp'], LIBDEPS=['authservercommon']) env.StaticLibrary('authmongos', - ['auth_global_external_state_s.cpp', - 'auth_session_external_state_s.cpp'], + ['authz_manager_external_state_s.cpp', + 'authz_session_external_state_s.cpp'], LIBDEPS=['authservercommon']) env.CppUnitTest('action_set_test', 'action_set_test.cpp', LIBDEPS=['authcore']) diff --git a/src/mongo/db/auth/authorization_manager.cpp b/src/mongo/db/auth/authorization_manager.cpp index 0956bb3353f..5ab155ebb17 100644 --- a/src/mongo/db/auth/authorization_manager.cpp +++ b/src/mongo/db/auth/authorization_manager.cpp @@ -34,10 +34,10 @@ namespace mongo { bool AuthorizationManager::_doesSupportOldStylePrivileges = true; bool AuthorizationManager::_authEnabled = false; - AuthorizationManager::AuthorizationManager(AuthGlobalExternalState* globalExternalState) : + AuthorizationManager::AuthorizationManager(AuthzManagerExternalState* globalExternalState) : _globalExternalState(globalExternalState) {} - AuthGlobalExternalState* AuthorizationManager::getGlobalExternalState() const { + AuthzManagerExternalState* AuthorizationManager::getExternalState() const { return _globalExternalState.get(); } diff --git a/src/mongo/db/auth/authorization_manager.h b/src/mongo/db/auth/authorization_manager.h index 050c94c84c3..eea50c699ce 100644 --- a/src/mongo/db/auth/authorization_manager.h +++ b/src/mongo/db/auth/authorization_manager.h @@ -20,7 +20,7 @@ #include <string> #include "mongo/base/disallow_copying.h" -#include "mongo/db/auth/auth_global_external_state.h" +#include "mongo/db/auth/authz_manager_external_state.h" namespace mongo { @@ -42,7 +42,7 @@ namespace mongo { public: // The newly constructed AuthorizationManager takes ownership of "externalState" - explicit AuthorizationManager(AuthGlobalExternalState* externalState); + explicit AuthorizationManager(AuthzManagerExternalState* externalState); static const std::string SERVER_RESOURCE_NAME; static const std::string CLUSTER_RESOURCE_NAME; @@ -74,7 +74,7 @@ namespace mongo { */ static bool isAuthEnabled(); - AuthGlobalExternalState* getGlobalExternalState() const; + AuthzManagerExternalState* getExternalState() const; private: @@ -85,7 +85,7 @@ namespace mongo { // This is a config setting, set at startup and not changing after initialization. static bool _authEnabled; - scoped_ptr<AuthGlobalExternalState> _globalExternalState; + scoped_ptr<AuthzManagerExternalState> _globalExternalState; }; } // namespace mongo diff --git a/src/mongo/db/auth/authorization_session.cpp b/src/mongo/db/auth/authorization_session.cpp index a551017be32..62554b73579 100644 --- a/src/mongo/db/auth/authorization_session.cpp +++ b/src/mongo/db/auth/authorization_session.cpp @@ -23,7 +23,7 @@ #include "mongo/base/status.h" #include "mongo/db/auth/action_set.h" #include "mongo/db/auth/action_type.h" -#include "mongo/db/auth/auth_session_external_state.h" +#include "mongo/db/auth/authz_session_external_state.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/principal.h" #include "mongo/db/auth/principal_set.h" @@ -347,7 +347,7 @@ namespace { return Status::OK(); } - AuthorizationSession::AuthorizationSession(AuthSessionExternalState* externalState) { + AuthorizationSession::AuthorizationSession(AuthzSessionExternalState* externalState) { _externalState.reset(externalState); } diff --git a/src/mongo/db/auth/authorization_session.h b/src/mongo/db/auth/authorization_session.h index e47de747245..934d7cbac61 100644 --- a/src/mongo/db/auth/authorization_session.h +++ b/src/mongo/db/auth/authorization_session.h @@ -23,7 +23,7 @@ #include "mongo/base/status.h" #include "mongo/db/auth/action_set.h" #include "mongo/db/auth/action_type.h" -#include "mongo/db/auth/auth_session_external_state.h" +#include "mongo/db/auth/authz_session_external_state.h" #include "mongo/db/auth/principal.h" #include "mongo/db/auth/principal_set.h" #include "mongo/db/auth/privilege.h" @@ -50,7 +50,7 @@ namespace mongo { static Status checkValidPrivilegeDocument(const StringData& dbname, const BSONObj& doc); // Takes ownership of the externalState. - explicit AuthorizationSession(AuthSessionExternalState* externalState); + explicit AuthorizationSession(AuthzSessionExternalState* externalState); ~AuthorizationSession(); // Should be called at the beginning of every new request. This performs the checks @@ -183,7 +183,7 @@ namespace mongo { Privilege _modifyPrivilegeForSpecialCases(const Privilege& privilege); - scoped_ptr<AuthSessionExternalState> _externalState; + scoped_ptr<AuthzSessionExternalState> _externalState; // All the privileges that have been acquired by the authenticated principals. PrivilegeSet _acquiredPrivileges; diff --git a/src/mongo/db/auth/authorization_session_test.cpp b/src/mongo/db/auth/authorization_session_test.cpp index 1c09b332165..aa741523bdb 100644 --- a/src/mongo/db/auth/authorization_session_test.cpp +++ b/src/mongo/db/auth/authorization_session_test.cpp @@ -18,7 +18,7 @@ */ #include "mongo/base/status.h" -#include "mongo/db/auth/auth_session_external_state_mock.h" +#include "mongo/db/auth/authz_session_external_state_mock.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/jsobj.h" @@ -38,7 +38,7 @@ namespace { actions.addAction(ActionType::insert); Privilege writePrivilege("test", actions); Privilege allDBsWritePrivilege("*", actions); - AuthSessionExternalStateMock* externalState = new AuthSessionExternalStateMock(); + AuthzSessionExternalStateMock* externalState = new AuthzSessionExternalStateMock(); AuthorizationSession authzSession(externalState); ASSERT_FALSE(authzSession.checkAuthorization("test", ActionType::insert)); @@ -500,7 +500,7 @@ namespace { "roles" << BSONArrayBuilder().arr()))); } - class AuthExternalStateImplictPriv : public AuthSessionExternalStateMock { + class AuthExternalStateImplictPriv : public AuthzSessionExternalStateMock { public: virtual bool _findUser(const string& usersNamespace, const BSONObj& query, diff --git a/src/mongo/db/auth/auth_global_external_state.cpp b/src/mongo/db/auth/authz_manager_external_state.cpp index 48731aece4b..cf63a4d1e14 100644 --- a/src/mongo/db/auth/auth_global_external_state.cpp +++ b/src/mongo/db/auth/authz_manager_external_state.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_global_external_state.h" +#include "mongo/db/auth/authz_manager_external_state.h" #include "mongo/base/status.h" #include "mongo/db/auth/authorization_manager.h" @@ -24,12 +24,12 @@ namespace mongo { - AuthGlobalExternalState::AuthGlobalExternalState() {} - AuthGlobalExternalState::~AuthGlobalExternalState() {} + AuthzManagerExternalState::AuthzManagerExternalState() {} + AuthzManagerExternalState::~AuthzManagerExternalState() {} - Status AuthGlobalExternalState::getPrivilegeDocument(const std::string& dbname, - const UserName& userName, - BSONObj* result) { + Status AuthzManagerExternalState::getPrivilegeDocument(const std::string& dbname, + const UserName& userName, + BSONObj* result) { if (dbname == StringData("$external", StringData::LiteralTag()) || dbname == AuthorizationManager::SERVER_RESOURCE_NAME || @@ -83,7 +83,7 @@ namespace mongo { return Status::OK(); } - bool AuthGlobalExternalState::_hasPrivilegeDocument(const std::string& dbname) const { + bool AuthzManagerExternalState::_hasPrivilegeDocument(const std::string& dbname) const { std::string usersNamespace = dbname + ".system.users"; BSONObj userBSONObj; diff --git a/src/mongo/db/auth/auth_global_external_state.h b/src/mongo/db/auth/authz_manager_external_state.h index 144193d0a30..39a9b27e91b 100644 --- a/src/mongo/db/auth/auth_global_external_state.h +++ b/src/mongo/db/auth/authz_manager_external_state.h @@ -30,12 +30,12 @@ namespace mongo { * state not stored in AuthorizationManager. This is primarily to make AuthorizationManager * easier to test as well as to allow different implementations for mongos and mongod. */ - class AuthGlobalExternalState { - MONGO_DISALLOW_COPYING(AuthGlobalExternalState); + class AuthzManagerExternalState { + MONGO_DISALLOW_COPYING(AuthzManagerExternalState); public: - virtual ~AuthGlobalExternalState(); + virtual ~AuthzManagerExternalState(); // Gets the privilege information document for "userName" on "dbname". // @@ -46,7 +46,7 @@ namespace mongo { BSONObj* result); protected: - AuthGlobalExternalState(); // This class should never be instantiated directly. + AuthzManagerExternalState(); // This class should never be instantiated directly. // Queries the userNamespace with the given query and returns the privilegeDocument found // in *result. Returns true if it finds a document matching the query, or false if not. diff --git a/src/mongo/db/auth/auth_global_external_state_d.cpp b/src/mongo/db/auth/authz_manager_external_state_d.cpp index 9af0d3e626a..00d16a00762 100644 --- a/src/mongo/db/auth/auth_global_external_state_d.cpp +++ b/src/mongo/db/auth/authz_manager_external_state_d.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_global_external_state_d.h" +#include "mongo/db/auth/authz_manager_external_state_d.h" #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" @@ -22,12 +22,12 @@ namespace mongo { - AuthGlobalExternalStateMongod::AuthGlobalExternalStateMongod() {} - AuthGlobalExternalStateMongod::~AuthGlobalExternalStateMongod() {} + AuthzManagerExternalStateMongod::AuthzManagerExternalStateMongod() {} + AuthzManagerExternalStateMongod::~AuthzManagerExternalStateMongod() {} - bool AuthGlobalExternalStateMongod::_findUser(const string& usersNamespace, - const BSONObj& query, - BSONObj* result) const { + bool AuthzManagerExternalStateMongod::_findUser(const string& usersNamespace, + const BSONObj& query, + BSONObj* result) const { Client::GodScope gs; Client::ReadContext ctx(usersNamespace); diff --git a/src/mongo/db/auth/auth_global_external_state_d.h b/src/mongo/db/auth/authz_manager_external_state_d.h index afa079c852d..c06a74cae69 100644 --- a/src/mongo/db/auth/auth_global_external_state_d.h +++ b/src/mongo/db/auth/authz_manager_external_state_d.h @@ -20,19 +20,19 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_global_external_state.h" +#include "mongo/db/auth/authz_manager_external_state.h" namespace mongo { /** - * The implementation of AuthGlobalExternalState functionality for mongod. + * The implementation of AuthzManagerExternalState functionality for mongod. */ - class AuthGlobalExternalStateMongod : public AuthGlobalExternalState { - MONGO_DISALLOW_COPYING(AuthGlobalExternalStateMongod); + class AuthzManagerExternalStateMongod : public AuthzManagerExternalState { + MONGO_DISALLOW_COPYING(AuthzManagerExternalStateMongod); public: - AuthGlobalExternalStateMongod(); - virtual ~AuthGlobalExternalStateMongod(); + AuthzManagerExternalStateMongod(); + virtual ~AuthzManagerExternalStateMongod(); protected: virtual bool _findUser(const string& usersNamespace, diff --git a/src/mongo/db/auth/auth_global_external_state_s.cpp b/src/mongo/db/auth/authz_manager_external_state_s.cpp index 8083a235c29..ed33670d7e9 100644 --- a/src/mongo/db/auth/auth_global_external_state_s.cpp +++ b/src/mongo/db/auth/authz_manager_external_state_s.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_global_external_state_s.h" +#include "mongo/db/auth/authz_manager_external_state_s.h" #include <string> @@ -24,8 +24,8 @@ namespace mongo { - AuthGlobalExternalStateMongos::AuthGlobalExternalStateMongos() {} - AuthGlobalExternalStateMongos::~AuthGlobalExternalStateMongos() {} + AuthzManagerExternalStateMongos::AuthzManagerExternalStateMongos() {} + AuthzManagerExternalStateMongos::~AuthzManagerExternalStateMongos() {} namespace { ScopedDbConnection* getConnectionForUsersCollection(const std::string& ns) { @@ -42,9 +42,9 @@ namespace mongo { } } - bool AuthGlobalExternalStateMongos::_findUser(const string& usersNamespace, - const BSONObj& query, - BSONObj* result) const { + bool AuthzManagerExternalStateMongos::_findUser(const string& usersNamespace, + const BSONObj& query, + BSONObj* result) const { scoped_ptr<ScopedDbConnection> conn(getConnectionForUsersCollection(usersNamespace)); *result = conn->get()->findOne(usersNamespace, query).getOwned(); conn->done(); diff --git a/src/mongo/db/auth/auth_global_external_state_s.h b/src/mongo/db/auth/authz_manager_external_state_s.h index 5cd6a4f05e3..c5b77d702d6 100644 --- a/src/mongo/db/auth/auth_global_external_state_s.h +++ b/src/mongo/db/auth/authz_manager_external_state_s.h @@ -20,19 +20,19 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_global_external_state.h" +#include "mongo/db/auth/authz_manager_external_state.h" namespace mongo { /** - * The implementation of AuthGlobalExternalState functionality for mongos. + * The implementation of AuthzManagerExternalState functionality for mongos. */ - class AuthGlobalExternalStateMongos : public AuthGlobalExternalState{ - MONGO_DISALLOW_COPYING(AuthGlobalExternalStateMongos); + class AuthzManagerExternalStateMongos : public AuthzManagerExternalState{ + MONGO_DISALLOW_COPYING(AuthzManagerExternalStateMongos); public: - AuthGlobalExternalStateMongos(); - virtual ~AuthGlobalExternalStateMongos(); + AuthzManagerExternalStateMongos(); + virtual ~AuthzManagerExternalStateMongos(); protected: virtual bool _findUser(const string& usersNamespace, diff --git a/src/mongo/db/auth/auth_session_external_state.cpp b/src/mongo/db/auth/authz_session_external_state.cpp index 2f63a31504b..e887cec0a72 100644 --- a/src/mongo/db/auth/auth_session_external_state.cpp +++ b/src/mongo/db/auth/authz_session_external_state.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_session_external_state.h" +#include "mongo/db/auth/authz_session_external_state.h" #include "mongo/base/status.h" #include "mongo/client/dbclientinterface.h" @@ -23,12 +23,12 @@ namespace mongo { - AuthSessionExternalState::AuthSessionExternalState() {} - AuthSessionExternalState::~AuthSessionExternalState() {} + AuthzSessionExternalState::AuthzSessionExternalState() {} + AuthzSessionExternalState::~AuthzSessionExternalState() {} - Status AuthSessionExternalState::getPrivilegeDocument(const std::string& dbname, - const UserName& userName, - BSONObj* result) { + Status AuthzSessionExternalState::getPrivilegeDocument(const std::string& dbname, + const UserName& userName, + BSONObj* result) { if (dbname == StringData("$external", StringData::LiteralTag()) || dbname == AuthorizationManager::SERVER_RESOURCE_NAME || @@ -82,7 +82,7 @@ namespace mongo { return Status::OK(); } - bool AuthSessionExternalState::_hasPrivilegeDocument(const std::string& dbname) const { + bool AuthzSessionExternalState::_hasPrivilegeDocument(const std::string& dbname) const { std::string usersNamespace = dbname + ".system.users"; BSONObj userBSONObj; diff --git a/src/mongo/db/auth/auth_session_external_state.h b/src/mongo/db/auth/authz_session_external_state.h index 4701cb3cbdb..d3e7f10b3af 100644 --- a/src/mongo/db/auth/auth_session_external_state.h +++ b/src/mongo/db/auth/authz_session_external_state.h @@ -29,15 +29,15 @@ namespace mongo { /** * Public interface for a class that encapsulates all the session information related to system - * state not stored in AuthorizationasSession. This is primarily to make AuthorizationSession + * state not stored in AuthorizationSession. This is primarily to make AuthorizationSession * easier to test as well as to allow different implementations in mongos and mongod. */ - class AuthSessionExternalState { - MONGO_DISALLOW_COPYING(AuthSessionExternalState); + class AuthzSessionExternalState { + MONGO_DISALLOW_COPYING(AuthzSessionExternalState); public: - virtual ~AuthSessionExternalState(); + virtual ~AuthzSessionExternalState(); // Returns true if this connection should be treated as if it has full access to do // anything, regardless of the current auth state. Currently the reasons why this could be @@ -55,7 +55,7 @@ namespace mongo { // // On success, returns Status::OK() and stores a shared-ownership copy of the document into // "result". - // TODO: remove this in favor of using the AuthGlobalExternalState + // TODO: remove this in favor of using the AuthzManagerExternalState Status getPrivilegeDocument(const std::string& dbname, const UserName& userName, BSONObj* result); @@ -69,17 +69,17 @@ namespace mongo { virtual void onLogoutDatabase(const std::string& dbname) = 0; protected: - AuthSessionExternalState(); // This class should never be instantiated directly. + AuthzSessionExternalState(); // This class should never be instantiated directly. // Queries the userNamespace with the given query and returns the privilegeDocument found // in *result. Returns true if it finds a document matching the query, or false if not. - // TODO: remove this in favor of using the AuthGlobalExternalState + // TODO: remove this in favor of using the AuthzManagerExternalState virtual bool _findUser(const std::string& usersNamespace, const BSONObj& query, BSONObj* result) const = 0; // Returns true if there exists at least one privilege document in the given database. - // TODO: remove this in favor of using the AuthGlobalExternalState + // TODO: remove this in favor of using the AuthzManagerExternalState bool _hasPrivilegeDocument(const std::string& dbname) const; }; diff --git a/src/mongo/db/auth/auth_session_external_state_d.cpp b/src/mongo/db/auth/authz_session_external_state_d.cpp index 55bc4535ca7..e53270508df 100644 --- a/src/mongo/db/auth/auth_session_external_state_d.cpp +++ b/src/mongo/db/auth/authz_session_external_state_d.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_session_external_state_d.h" +#include "mongo/db/auth/authz_session_external_state_d.h" #include "mongo/base/status.h" #include "mongo/client/dbclientinterface.h" @@ -27,35 +27,35 @@ namespace mongo { - AuthSessionExternalStateMongod::AuthSessionExternalStateMongod() {} - AuthSessionExternalStateMongod::~AuthSessionExternalStateMongod() {} + AuthzSessionExternalStateMongod::AuthzSessionExternalStateMongod() {} + AuthzSessionExternalStateMongod::~AuthzSessionExternalStateMongod() {} - void AuthSessionExternalStateMongod::startRequest() { + void AuthzSessionExternalStateMongod::startRequest() { if (!Lock::isLocked()) { _checkShouldAllowLocalhost(); } } - bool AuthSessionExternalStateMongod::_findUser(const string& usersNamespace, - const BSONObj& query, - BSONObj* result) const { + bool AuthzSessionExternalStateMongod::_findUser(const string& usersNamespace, + const BSONObj& query, + BSONObj* result) const { Client::GodScope gs; Client::ReadContext ctx(usersNamespace); return Helpers::findOne(usersNamespace, query, *result); } - bool AuthSessionExternalStateMongod::shouldIgnoreAuthChecks() const { - return cc().isGod() || AuthSessionExternalStateServerCommon::shouldIgnoreAuthChecks(); + bool AuthzSessionExternalStateMongod::shouldIgnoreAuthChecks() const { + return cc().isGod() || AuthzSessionExternalStateServerCommon::shouldIgnoreAuthChecks(); } - void AuthSessionExternalStateMongod::onAddAuthorizedPrincipal(Principal*) { + void AuthzSessionExternalStateMongod::onAddAuthorizedPrincipal(Principal*) { // invalidate all thread-local JS scopes due to new user authentication if (globalScriptEngine) globalScriptEngine->threadDone(); } - void AuthSessionExternalStateMongod::onLogoutDatabase(const std::string&) { + void AuthzSessionExternalStateMongod::onLogoutDatabase(const std::string&) { // invalidate all thread-local JS scopes due to logout if (globalScriptEngine) globalScriptEngine->threadDone(); diff --git a/src/mongo/db/auth/auth_session_external_state_d.h b/src/mongo/db/auth/authz_session_external_state_d.h index af97192a48d..ee5295f5c80 100644 --- a/src/mongo/db/auth/auth_session_external_state_d.h +++ b/src/mongo/db/auth/authz_session_external_state_d.h @@ -18,19 +18,19 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_session_external_state_server_common.h" +#include "mongo/db/auth/authz_session_external_state_server_common.h" namespace mongo { /** - * The implementation of AuthSessionExternalState functionality for mongod. + * The implementation of AuthzSessionExternalState functionality for mongod. */ - class AuthSessionExternalStateMongod : public AuthSessionExternalStateServerCommon { - MONGO_DISALLOW_COPYING(AuthSessionExternalStateMongod); + class AuthzSessionExternalStateMongod : public AuthzSessionExternalStateServerCommon { + MONGO_DISALLOW_COPYING(AuthzSessionExternalStateMongod); public: - AuthSessionExternalStateMongod(); - virtual ~AuthSessionExternalStateMongod(); + AuthzSessionExternalStateMongod(); + virtual ~AuthzSessionExternalStateMongod(); virtual bool shouldIgnoreAuthChecks() const; diff --git a/src/mongo/db/auth/auth_session_external_state_mock.h b/src/mongo/db/auth/authz_session_external_state_mock.h index 09678567ebd..a081eab45bd 100644 --- a/src/mongo/db/auth/auth_session_external_state_mock.h +++ b/src/mongo/db/auth/authz_session_external_state_mock.h @@ -18,18 +18,18 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_session_external_state.h" +#include "mongo/db/auth/authz_session_external_state.h" namespace mongo { /** - * Mock of the AuthSessionExternalState class used only for testing. + * Mock of the AuthzSessionExternalState class used only for testing. */ - class AuthSessionExternalStateMock : public AuthSessionExternalState { - MONGO_DISALLOW_COPYING(AuthSessionExternalStateMock); + class AuthzSessionExternalStateMock : public AuthzSessionExternalState { + MONGO_DISALLOW_COPYING(AuthzSessionExternalStateMock); public: - AuthSessionExternalStateMock() : _returnValue(false) {} + AuthzSessionExternalStateMock() : _returnValue(false) {} virtual bool shouldIgnoreAuthChecks() const { return _returnValue; diff --git a/src/mongo/db/auth/auth_session_external_state_s.cpp b/src/mongo/db/auth/authz_session_external_state_s.cpp index 504f00a045b..25caed2667f 100644 --- a/src/mongo/db/auth/auth_session_external_state_s.cpp +++ b/src/mongo/db/auth/authz_session_external_state_s.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_session_external_state_s.h" +#include "mongo/db/auth/authz_session_external_state_s.h" #include <string> @@ -25,14 +25,14 @@ namespace mongo { - AuthSessionExternalStateMongos::AuthSessionExternalStateMongos() {} - AuthSessionExternalStateMongos::~AuthSessionExternalStateMongos() {} + AuthzSessionExternalStateMongos::AuthzSessionExternalStateMongos() {} + AuthzSessionExternalStateMongos::~AuthzSessionExternalStateMongos() {} - void AuthSessionExternalStateMongos::onAddAuthorizedPrincipal(Principal*) { } + void AuthzSessionExternalStateMongos::onAddAuthorizedPrincipal(Principal*) { } - void AuthSessionExternalStateMongos::onLogoutDatabase(const std::string&) { } + void AuthzSessionExternalStateMongos::onLogoutDatabase(const std::string&) { } - void AuthSessionExternalStateMongos::startRequest() { + void AuthzSessionExternalStateMongos::startRequest() { _checkShouldAllowLocalhost(); } @@ -51,7 +51,7 @@ namespace mongo { } } - bool AuthSessionExternalStateMongos::_findUser(const string& usersNamespace, + bool AuthzSessionExternalStateMongos::_findUser(const string& usersNamespace, const BSONObj& query, BSONObj* result) const { scoped_ptr<ScopedDbConnection> conn(getConnectionForUsersCollection(usersNamespace)); diff --git a/src/mongo/db/auth/auth_session_external_state_s.h b/src/mongo/db/auth/authz_session_external_state_s.h index b8d8d03290a..bbddf9d5e51 100644 --- a/src/mongo/db/auth/auth_session_external_state_s.h +++ b/src/mongo/db/auth/authz_session_external_state_s.h @@ -18,19 +18,19 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_session_external_state_server_common.h" +#include "mongo/db/auth/authz_session_external_state_server_common.h" namespace mongo { /** - * The implementation of AuthSessionExternalState functionality for mongos. + * The implementation of AuthzSessionExternalState functionality for mongos. */ - class AuthSessionExternalStateMongos : public AuthSessionExternalStateServerCommon { - MONGO_DISALLOW_COPYING(AuthSessionExternalStateMongos); + class AuthzSessionExternalStateMongos : public AuthzSessionExternalStateServerCommon { + MONGO_DISALLOW_COPYING(AuthzSessionExternalStateMongos); public: - AuthSessionExternalStateMongos(); - virtual ~AuthSessionExternalStateMongos(); + AuthzSessionExternalStateMongos(); + virtual ~AuthzSessionExternalStateMongos(); virtual void startRequest(); diff --git a/src/mongo/db/auth/auth_session_external_state_server_common.cpp b/src/mongo/db/auth/authz_session_external_state_server_common.cpp index 8862c56f9ef..200eeb6f0e5 100644 --- a/src/mongo/db/auth/auth_session_external_state_server_common.cpp +++ b/src/mongo/db/auth/authz_session_external_state_server_common.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mongo/db/auth/auth_session_external_state_server_common.h" +#include "mongo/db/auth/authz_session_external_state_server_common.h" #include "mongo/base/status.h" #include "mongo/db/auth/authorization_manager.h" @@ -31,11 +31,11 @@ namespace { // NOTE: we default _allowLocalhost to true under the assumption that _checkShouldAllowLocalhost // will always be called before any calls to shouldIgnoreAuthChecks. If this is not the case, // it could cause a security hole. - AuthSessionExternalStateServerCommon::AuthSessionExternalStateServerCommon() : + AuthzSessionExternalStateServerCommon::AuthzSessionExternalStateServerCommon() : _allowLocalhost(true) {} - AuthSessionExternalStateServerCommon::~AuthSessionExternalStateServerCommon() {} + AuthzSessionExternalStateServerCommon::~AuthzSessionExternalStateServerCommon() {} - void AuthSessionExternalStateServerCommon::_checkShouldAllowLocalhost() { + void AuthzSessionExternalStateServerCommon::_checkShouldAllowLocalhost() { if (!AuthorizationManager::isAuthEnabled()) return; // If we know that an admin user exists, don't re-check. @@ -56,7 +56,7 @@ namespace { } } - bool AuthSessionExternalStateServerCommon::shouldIgnoreAuthChecks() const { + bool AuthzSessionExternalStateServerCommon::shouldIgnoreAuthChecks() const { ClientBasic* client = ClientBasic::getCurrent(); return !AuthorizationManager::isAuthEnabled() || (enableLocalhostAuthBypass &&client->getIsLocalHostConnection() && _allowLocalhost); diff --git a/src/mongo/db/auth/auth_session_external_state_server_common.h b/src/mongo/db/auth/authz_session_external_state_server_common.h index 3d1375c9517..cde8d3f1919 100644 --- a/src/mongo/db/auth/auth_session_external_state_server_common.h +++ b/src/mongo/db/auth/authz_session_external_state_server_common.h @@ -18,23 +18,23 @@ #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_session_external_state.h" +#include "mongo/db/auth/authz_session_external_state.h" namespace mongo { /** - * The implementation of AuthSessionExternalState functionality common to mongod and mongos. + * The implementation of AuthzSessionExternalState functionality common to mongod and mongos. */ - class AuthSessionExternalStateServerCommon : public AuthSessionExternalState { - MONGO_DISALLOW_COPYING(AuthSessionExternalStateServerCommon); + class AuthzSessionExternalStateServerCommon : public AuthzSessionExternalState { + MONGO_DISALLOW_COPYING(AuthzSessionExternalStateServerCommon); public: - virtual ~AuthSessionExternalStateServerCommon(); + virtual ~AuthzSessionExternalStateServerCommon(); virtual bool shouldIgnoreAuthChecks() const; protected: - AuthSessionExternalStateServerCommon(); + AuthzSessionExternalStateServerCommon(); // Checks whether or not localhost connections should be given full access and stores the // result in _allowLocalhost. Currently localhost connections are only given full access diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp index 87f2cd85fe5..79d5a9992b5 100644 --- a/src/mongo/db/client.cpp +++ b/src/mongo/db/client.cpp @@ -31,7 +31,7 @@ #include "mongo/db/auth/action_set.h" #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/auth/auth_session_external_state_d.h" +#include "mongo/db/auth/authz_session_external_state_d.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/db.h" #include "mongo/db/commands.h" @@ -132,7 +132,7 @@ namespace mongo { Client *c = new Client( fullDesc, mp ); currentClient.reset(c); mongo::lastError.initThread(); - c->setAuthorizationSession(new AuthorizationSession(new AuthSessionExternalStateMongod())); + c->setAuthorizationSession(new AuthorizationSession(new AuthzSessionExternalStateMongod())); return *c; } diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 963aa21e95f..36a579b9f4f 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -25,7 +25,7 @@ #include "mongo/base/init.h" #include "mongo/base/initializer.h" #include "mongo/base/status.h" -#include "mongo/db/auth/auth_global_external_state_d.h" +#include "mongo/db/auth/authz_manager_external_state_d.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_manager_global.h" #include "mongo/db/client.h" @@ -1274,7 +1274,7 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) { } MONGO_INITIALIZER(CreateAuthorizationManager)(InitializerContext* context) { - setGlobalAuthorizationManager(new AuthorizationManager(new AuthGlobalExternalStateMongod())); + setGlobalAuthorizationManager(new AuthorizationManager(new AuthzManagerExternalStateMongod())); return Status::OK(); } diff --git a/src/mongo/s/client_info.cpp b/src/mongo/s/client_info.cpp index 7728eb79959..837266a59aa 100644 --- a/src/mongo/s/client_info.cpp +++ b/src/mongo/s/client_info.cpp @@ -19,7 +19,7 @@ #include "pch.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/auth/auth_session_external_state_s.h" +#include "mongo/db/auth/authz_session_external_state_s.h" #include "server.h" #include "../util/scopeguard.h" #include "../db/commands.h" @@ -85,7 +85,7 @@ namespace mongo { massert(16472, "A ClientInfo already exists for this thread", !info); info = new ClientInfo(messagingPort); info->setAuthorizationSession(new AuthorizationSession( - new AuthSessionExternalStateMongos())); + new AuthzSessionExternalStateMongos())); _tlInfo.reset( info ); info->newRequest(); return info; diff --git a/src/mongo/s/s_only.cpp b/src/mongo/s/s_only.cpp index df35fbbfbf3..93d82d07c12 100644 --- a/src/mongo/s/s_only.cpp +++ b/src/mongo/s/s_only.cpp @@ -20,7 +20,7 @@ #include "mongo/client/connpool.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/auth/auth_session_external_state_s.h" +#include "mongo/db/auth/authz_session_external_state_s.h" #include "mongo/s/shard.h" #include "mongo/s/grid.h" #include "request.h" @@ -77,7 +77,7 @@ namespace mongo { Client *c = new Client( fullDesc, mp ); currentClient.reset(c); mongo::lastError.initThread(); - c->setAuthorizationSession(new AuthorizationSession(new AuthSessionExternalStateMongos())); + c->setAuthorizationSession(new AuthorizationSession(new AuthzSessionExternalStateMongos())); return *c; } diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 50a12929186..2addd112407 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -24,7 +24,7 @@ #include "mongo/base/initializer.h" #include "mongo/base/status.h" #include "mongo/client/connpool.h" -#include "mongo/db/auth/auth_global_external_state_s.h" +#include "mongo/db/auth/authz_manager_external_state_s.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_manager_global.h" #include "mongo/db/dbwebserver.h" @@ -547,7 +547,7 @@ namespace mongo { #endif MONGO_INITIALIZER(CreateAuthorizationManager)(InitializerContext* context) { - setGlobalAuthorizationManager(new AuthorizationManager(new AuthGlobalExternalStateMongos())); + setGlobalAuthorizationManager(new AuthorizationManager(new AuthzManagerExternalStateMongos())); return Status::OK(); } |