Stylistic changes

This commit is contained in:
Denis Glazachev 2020-10-06 19:23:08 +04:00
parent 2fc6a4ea9c
commit 950a07835f
3 changed files with 6 additions and 5 deletions

View File

@ -421,14 +421,15 @@ UUID IAccessStorage::login(
const String & password,
const Poco::Net::IPAddress & address,
const ExternalAuthenticators & external_authenticators,
bool log_and_mask_exceptions) const
bool replace_exception_with_cannot_authenticate) const
{
try {
try
{
return loginImpl(user_name, password, address, external_authenticators);
}
catch (...)
{
if (!log_and_mask_exceptions)
if (!replace_exception_with_cannot_authenticate)
throw;
tryLogCurrentException(getLogger(), user_name + ": Authentication failed");

View File

@ -144,7 +144,7 @@ public:
/// Finds an user, check its password and returns the ID of the user.
/// Throws an exception if no such user or password is incorrect.
UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool log_and_mask_exceptions = true) const;
UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool replace_exception_with_cannot_authenticate = true) const;
/// Returns the ID of an user who has logged in (maybe on another node).
/// The function assumes that the password has been already checked somehow, so we can skip checking it now.

View File

@ -409,7 +409,7 @@ UUID MultipleAccessStorage::loginImpl(const String & user_name, const String & p
{
try
{
auto id = storage->login(user_name, password, address, external_authenticators, false);
auto id = storage->login(user_name, password, address, external_authenticators, /* replace_exception_with_cannot_authenticate = */ false);
std::lock_guard lock{mutex};
ids_cache.set(id, storage);
return id;