diff options
author | Andy Schwerin <schwerin@10gen.com> | 2013-09-20 10:36:01 -0400 |
---|---|---|
committer | Andy Schwerin <schwerin@10gen.com> | 2013-09-23 16:20:12 -0400 |
commit | a7f7c028c4cdda1ab0939c6c7788bb39bd94cc5f (patch) | |
tree | 270b9930bff0f280252850cd90ef0bf8e7de0a17 /src/mongo/db/commands/rename_collection_common.cpp | |
parent | 234f50a33cd6d2a2e0a30c4b1bddb1c7de176799 (diff) | |
download | mongo-a7f7c028c4cdda1ab0939c6c7788bb39bd94cc5f.tar.gz |
SERVER-1105 Use ResourcePattern type when identifying the resource component of required privileges.
This patch has two principal components. First, it changes the interface to Privilege and
AuthorizationSession to use ResourcePattern in place of std::string for identifying resources.
Second, it examines all call sites of the authorization session interface in commands and
other code to ensure that the correct resource requirements are conveyed to the authorization_session.
Diffstat (limited to 'src/mongo/db/commands/rename_collection_common.cpp')
-rw-r--r-- | src/mongo/db/commands/rename_collection_common.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/commands/rename_collection_common.cpp b/src/mongo/db/commands/rename_collection_common.cpp index 8000da5cd85..caf395af353 100644 --- a/src/mongo/db/commands/rename_collection_common.cpp +++ b/src/mongo/db/commands/rename_collection_common.cpp @@ -44,6 +44,8 @@ namespace rename_collection { std::vector<Privilege>* out) { NamespaceString sourceNS = NamespaceString(cmdObj.getStringField("renameCollection")); NamespaceString targetNS = NamespaceString(cmdObj.getStringField("to")); + uassert(17140, "Invalid source namespace " + sourceNS.ns(), sourceNS.isValid()); + uassert(17141, "Invalid target namespace " + targetNS.ns(), targetNS.isValid()); ActionSet sourceActions; ActionSet targetActions; @@ -58,8 +60,8 @@ namespace rename_collection { targetActions.addAction(ActionType::ensureIndex); } - out->push_back(Privilege(sourceNS.ns(), sourceActions)); - out->push_back(Privilege(targetNS.ns(), targetActions)); + out->push_back(Privilege(ResourcePattern::forExactNamespace(sourceNS), sourceActions)); + out->push_back(Privilege(ResourcePattern::forExactNamespace(targetNS), targetActions)); } } // namespace rename_collection |