Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not grant rights on system collections (#3627)

This commit is contained in:
Simon Grätzer 2017-11-10 18:01:17 +01:00 committed by Frank Celler
parent 6cbf7159be
commit 161d7e8b5c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/Pipeline/Jenkinsfile.groovy
View File

@ -855,6 +855,7 @@ def getTests(os, edition, maintainer, mode, engine) {
["arangosh", "arangosh", "--skipShebang true"],
["authentication", "authentication", ""],
["authentication_parameters", "authentication_parameters", ""],
["authentication_server", "authentication_server", ""],
["config", "config" , ""],
["dump", "dump" , ""],
["dump_authentication", "dump_authentication" , ""],

1
Installation/Pipeline/Jenkinsfile.groovy.in
View File

@ -855,6 +855,7 @@ def getTests(os, edition, maintainer, mode, engine) {
["arangosh", "arangosh", "--skipShebang true"],
["authentication", "authentication", ""],
["authentication_parameters", "authentication_parameters", ""],
["authentication_server", "authentication_server", ""],
["config", "config" , ""],
["dump", "dump" , ""],
["dump_authentication", "dump_authentication" , ""],

12
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -784,7 +784,7 @@ void RestReplicationHandler::handleCommandRestoreCollection() {
}
if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION(res);
THROW_ARANGO_EXCEPTION_MESSAGE(res, errorMsg);
}
VPackBuilder result;
@ -1075,8 +1075,10 @@ int RestReplicationHandler::processRestoreCollectionCoordinator(
return res;
}
} catch (...) {
}
} catch (basics::Exception const& e) {
LOG_TOPIC(DEBUG, Logger::FIXME) << "processRestoreCollectionCoordinator "
<< "could not drop collection: " << e.message();
} catch (...) {}
// now re-create the collection
@ -1154,7 +1156,7 @@ int RestReplicationHandler::processRestoreCollectionCoordinator(
TRI_ASSERT(col != nullptr);
ExecContext const* exe = ExecContext::CURRENT;
if (exe != nullptr && !exe->isSuperuser()) {
if (name[0] != '_' && exe != nullptr && !exe->isSuperuser()) {
AuthenticationFeature *auth = AuthenticationFeature::INSTANCE;
auth->authInfo()->updateUser(ExecContext::CURRENT->user(),
[&](AuthUserEntry& entry) {
@ -2518,7 +2520,7 @@ int RestReplicationHandler::createCollection(VPackSlice slice,
}
ExecContext const* exe = ExecContext::CURRENT;
if (exe != nullptr && !exe->isSuperuser() &&
if (name[0] != '_' && exe != nullptr && !exe->isSuperuser() &&
ServerState::instance()->isSingleServer()) {
AuthenticationFeature *auth = AuthenticationFeature::INSTANCE;
auth->authInfo()->updateUser(exe->user(), [&](AuthUserEntry& entry) {