597aeca93d
"
This series does not add or change any features of access-control and
roles, but addresses some bugs and finalizes the switch to roles.
"auth: Wait for schema agreement" and the patch prior help avoid false
negatives for integration tests and error messages in logs.
"auth: Remove ordering dependence" fixes an important bug in `auth` that
could leave the default superuser in a corrupted state when it is first
created.
Since roles are feature-complete (to the best of the author's knowledge
as of this writing), the final patch in the series removes any warnings
about them being unimplemented.
Tests: unit (release), dtest (PENDING)
"
* 'jhk/auth_fixes/v1' of https://github.com/hakuch/scylla:
Roles are implemented
auth: Increase delay before background tasks start
auth: Remove ordering dependence
auth: Don't warn on rescheduled task
auth: Wait for schema agreement
Single-node clusters can agree on schema
(cherry picked from commit 999df41a49)
98 lines
3.2 KiB
C++
98 lines
3.2 KiB
C++
/*
|
|
* Copyright (C) 2017 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/>.
|
|
*/
|
|
|
|
#include "auth/common.hh"
|
|
|
|
#include <seastar/core/shared_ptr.hh>
|
|
|
|
#include "cql3/query_processor.hh"
|
|
#include "cql3/statements/create_table_statement.hh"
|
|
#include "database.hh"
|
|
#include "schema_builder.hh"
|
|
#include "service/migration_manager.hh"
|
|
|
|
namespace auth {
|
|
|
|
namespace meta {
|
|
|
|
const sstring DEFAULT_SUPERUSER_NAME("cassandra");
|
|
const sstring AUTH_KS("system_auth");
|
|
const sstring USERS_CF("users");
|
|
const sstring AUTH_PACKAGE_NAME("org.apache.cassandra.auth.");
|
|
|
|
}
|
|
|
|
static logging::logger auth_log("auth");
|
|
|
|
// Func must support being invoked more than once.
|
|
future<> do_after_system_ready(seastar::abort_source& as, seastar::noncopyable_function<future<>()> func) {
|
|
struct empty_state { };
|
|
return delay_until_system_ready(as).then([&as, func = std::move(func)] () mutable {
|
|
return exponential_backoff_retry::do_until_value(1s, 1min, as, [func = std::move(func)] {
|
|
return func().then_wrapped([] (auto&& f) -> stdx::optional<empty_state> {
|
|
if (f.failed()) {
|
|
auth_log.info("Auth task failed with error, rescheduling: {}", f.get_exception());
|
|
return { };
|
|
}
|
|
return { empty_state() };
|
|
});
|
|
});
|
|
}).discard_result();
|
|
}
|
|
|
|
future<> create_metadata_table_if_missing(
|
|
stdx::string_view table_name,
|
|
cql3::query_processor& qp,
|
|
stdx::string_view cql,
|
|
::service::migration_manager& mm) {
|
|
auto& db = qp.db().local();
|
|
|
|
if (db.has_schema(meta::AUTH_KS, sstring(table_name))) {
|
|
return make_ready_future<>();
|
|
}
|
|
|
|
auto parsed_statement = static_pointer_cast<cql3::statements::raw::cf_statement>(
|
|
cql3::query_processor::parse_statement(cql));
|
|
|
|
parsed_statement->prepare_keyspace(meta::AUTH_KS);
|
|
|
|
auto statement = static_pointer_cast<cql3::statements::create_table_statement>(
|
|
parsed_statement->prepare(db, qp.get_cql_stats())->statement);
|
|
|
|
const auto schema = statement->get_cf_meta_data(qp.db().local());
|
|
const auto uuid = generate_legacy_id(schema->ks_name(), schema->cf_name());
|
|
|
|
schema_builder b(schema);
|
|
b.set_uuid(uuid);
|
|
|
|
return mm.announce_new_column_family(b.build(), false);
|
|
}
|
|
|
|
future<> wait_for_schema_agreement(::service::migration_manager& mm, const database& db) {
|
|
static const auto pause = [] { return sleep(std::chrono::milliseconds(500)); };
|
|
|
|
return do_until([&db] { return db.get_version() != database::empty_version; }, pause).then([&mm] {
|
|
return do_until([&mm] { return mm.have_schema_agreement(); }, pause);
|
|
});
|
|
}
|
|
|
|
}
|