From eda236f968ac3eaec3be5414439912b0cf76b6d7 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 20 Nov 2018 11:30:10 +0100 Subject: [PATCH] AuthenticationFeature::isEnabled() is not doing what is expected (#7373) --- arangod/RestHandler/RestAdminServerHandler.cpp | 2 +- arangod/RestHandler/RestShutdownHandler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arangod/RestHandler/RestAdminServerHandler.cpp b/arangod/RestHandler/RestAdminServerHandler.cpp index be3a32c977..55e7f3f111 100644 --- a/arangod/RestHandler/RestAdminServerHandler.cpp +++ b/arangod/RestHandler/RestAdminServerHandler.cpp @@ -153,7 +153,7 @@ void RestAdminServerHandler::handleMode() { } else if (requestType == rest::RequestType::PUT) { AuthenticationFeature* af = AuthenticationFeature::instance(); - if (af->isEnabled() && !_request->user().empty()) { + if (af->isActive() && !_request->user().empty()) { auth::Level lvl = auth::Level::NONE; if (af->userManager() != nullptr) { lvl = af->userManager()->databaseAuthLevel(_request->user(), diff --git a/arangod/RestHandler/RestShutdownHandler.cpp b/arangod/RestHandler/RestShutdownHandler.cpp index bc771e9f02..71c98c00f3 100644 --- a/arangod/RestHandler/RestShutdownHandler.cpp +++ b/arangod/RestHandler/RestShutdownHandler.cpp @@ -51,7 +51,7 @@ RestStatus RestShutdownHandler::execute() { } AuthenticationFeature* af = AuthenticationFeature::instance(); - if (af->isEnabled() && !_request->user().empty()) { + if (af->isActive() && !_request->user().empty()) { auth::Level lvl = auth::Level::NONE; if (af->userManager() != nullptr) { lvl = af->userManager()->databaseAuthLevel(_request->user(), "_system", /*configured*/true);