RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/mon: fix the v1 auth

Browse Source 
* initialize mon::Connection::global_id to `0` in the ctor.
  global_id is assigned by monitor, a zero global_id implies
  that "allocate me a new global_id please". so we should
  never use a random number on stack for the global_id.
* do not use a magic number for initializing MAuth::protocol,
  use `CEPH_AUTH_UNKNOWN` instead.
* do not try to dereference `auth` before creating it. `auth`
  is created by `create_auth()`. in which, the global_id
  is always assigned to `auth->global_id`, as it's a new session.
  so we should just call `create_auth()`.
* restructure the code to finish the authentication. to remove
  the find_if(), and use the `parallel_for_each()` loop for
  both set the active_con and closing the other pending connections.
* ask for the rotating keyring once gets authenticated.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-05-09 17:51:33 +08:00
parent 6fe8d8223e
commit 86b5989175
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/crimson/mon/MonClient.cc
View File

@ -111,7 +111,7 @@ private:
ceph::net::ConnectionRef conn;
std::unique_ptr<AuthClientHandler> auth;
std::unique_ptr<RotatingKeyRing> rotating_keyring;
uint64_t global_id;
uint64_t global_id = 0;
clock_t::time_point last_rotating_renew_sent;
};
@ -207,7 +207,7 @@ Connection::setup_session(epoch_t epoch,
const EntityName& name)
{
auto m = make_message<MAuth>();
m->protocol = 0;
m->protocol = CEPH_AUTH_UNKNOWN;
m->monmap_epoch = epoch;
__u8 struct_v = 1;
encode(struct_v, m->auth_payload);
@ -269,14 +269,8 @@ Connection::authenticate_v1(epoch_t epoch,
return reply.get_future();
}).then([name, want_keys, this](Ref<MAuthReply> m) {
reply = {};
if (m->global_id != global_id) {
// it's a new session
global_id = m->global_id;
auth->set_global_id(global_id);
auth->reset();
}
auth = create_auth(m->protocol, m->global_id, name, want_keys);
global_id = m->global_id;
auth = create_auth(m->protocol, m->global_id, name, want_keys);
switch (auto p = m->result_bl.cbegin();
auth->handle_response(m->result, p,
nullptr, nullptr)) {
@ -911,19 +905,20 @@ seastar::future<> Client::reopen_session(int rank)
if (!is_hunting()) {
return seastar::now();
}
auto found = std::find_if(pending_conns.begin(), pending_conns.end(),
[peer](auto& mc) {
return mc.is_my_peer(peer);
});
ceph_assert_always(found != pending_conns.end());
active_con.reset(new Connection{std::move(*found)});
logger().info("found mon.{}", monmap.get_name(peer));
return seastar::parallel_for_each(pending_conns, [] (auto& conn) {
return conn.close();
return seastar::parallel_for_each(pending_conns, [peer, this] (auto& conn) {
if (conn.is_my_peer(peer)) {
active_con.reset(new Connection{std::move(conn)});
return seastar::now();
} else {
return conn.close();
}
});
});
}).then([this] {
pending_conns.clear();
ceph_assert_always(active_con);
return active_con->renew_rotating_keyring();
});
}