mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-02 22:25:48 +00:00
07b0ce27fa
"
Fixes #3420.
Tests: dtest (`auth_test.py`), unit (release)
"
* 'jhk/fix_3420/v2' of https://github.com/hakuch/scylla:
cql3: Include custom options in LIST ROLES
auth: Query custom options from the `authenticator`
auth: Add type alias for custom auth. options
(cherry picked from commit d49348b0e1)
65 lines
1.7 KiB
C++
65 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2018 ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <iosfwd>
|
|
#include <optional>
|
|
#include <stdexcept>
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
|
|
#include <seastar/core/print.hh>
|
|
#include <seastar/core/sstring.hh>
|
|
|
|
#include "seastarx.hh"
|
|
|
|
namespace auth {
|
|
|
|
enum class authentication_option {
|
|
password,
|
|
options
|
|
};
|
|
|
|
std::ostream& operator<<(std::ostream&, authentication_option);
|
|
|
|
using authentication_option_set = std::unordered_set<authentication_option>;
|
|
|
|
using custom_options = std::unordered_map<sstring, sstring>;
|
|
|
|
struct authentication_options final {
|
|
std::optional<sstring> password;
|
|
std::optional<custom_options> options;
|
|
};
|
|
|
|
inline bool any_authentication_options(const authentication_options& aos) noexcept {
|
|
return aos.password || aos.options;
|
|
}
|
|
|
|
class unsupported_authentication_option : public std::invalid_argument {
|
|
public:
|
|
explicit unsupported_authentication_option(authentication_option k)
|
|
: std::invalid_argument(sprint("The %s option is not supported.", k)) {
|
|
}
|
|
};
|
|
|
|
}
|