RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth,mon,crimson: pass KeyStore by const reference

Browse Source 
AuthAuthorizeHandler::verify_authorizer() neither changes the keystore,
nor expects a nullptr. so we should pass the keystore by const reference
for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-04-26 16:01:52 +08:00
parent 0a8dbddf88
commit 7dfca035ac
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth/AuthAuthorizeHandler.h
View File

@ -31,7 +31,7 @@ struct AuthAuthorizeHandler {
virtual ~AuthAuthorizeHandler() {}
virtual bool verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
const ceph::buffer::list& authorizer_data,
size_t connection_secret_required_len,
ceph::buffer::list *authorizer_reply,

2
src/auth/cephx/CephxAuthorizeHandler.cc
View File

@ -8,7 +8,7 @@
bool CephxAuthorizeHandler::verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
const bufferlist& authorizer_data,
size_t connection_secret_required_len,
bufferlist *authorizer_reply,

2
src/auth/cephx/CephxAuthorizeHandler.h
View File

@ -22,7 +22,7 @@ class CephContext;
struct CephxAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
const bufferlist& authorizer_data,
size_t connection_secret_required_len,
bufferlist *authorizer_reply,

6
src/auth/cephx/CephxProtocol.cc
View File

@ -391,7 +391,7 @@ bool cephx_decode_ticket(CephContext *cct, KeyStore *keys, uint32_t service_id,
*
* {timestamp + 1}^session_key
*/
bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys,
bool cephx_verify_authorizer(CephContext *cct, const KeyStore& keys,
bufferlist::const_iterator& indata,
size_t connection_secret_required_len,
CephXServiceTicketInfo& ticket_info,
@ -422,13 +422,13 @@ bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys,
if (ticket.secret_id == (uint64_t)-1) {
EntityName name;
name.set_type(service_id);
if (!keys->get_secret(name, service_secret)) {
if (!keys.get_secret(name, service_secret)) {
ldout(cct, 0) << "verify_authorizer could not get general service secret for service "
<< ceph_entity_type_name(service_id) << " secret_id=" << ticket.secret_id << dendl;
return false;
}
} else {
if (!keys->get_service_secret(service_id, ticket.secret_id, service_secret)) {
if (!keys.get_service_secret(service_id, ticket.secret_id, service_secret)) {
ldout(cct, 0) << "verify_authorizer could not get service secret for service "
<< ceph_entity_type_name(service_id) << " secret_id=" << ticket.secret_id << dendl;
if (cct->_conf->auth_debug && ticket.secret_id == 0)

2
src/auth/cephx/CephxProtocol.h
View File

@ -424,7 +424,7 @@ bool cephx_decode_ticket(CephContext *cct, KeyStore *keys,
*/
extern bool cephx_verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
bufferlist::const_iterator& indata,
size_t connection_secret_required_len,
CephXServiceTicketInfo& ticket_info,

2
src/auth/cephx/CephxServiceHandler.cc
View File

@ -226,7 +226,7 @@ int CephxServiceHandler::handle_request(
CephXServiceTicketInfo auth_ticket_info;
// note: no challenge here.
if (!cephx_verify_authorizer(
cct, key_server, indata, 0, auth_ticket_info, nullptr,
cct, *key_server, indata, 0, auth_ticket_info, nullptr,
nullptr,
&tmp_bl)) {
ret = -EPERM;

2
src/auth/krb/KrbAuthorizeHandler.hpp
View File

@ -21,7 +21,7 @@
class KrbAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(
CephContext*,
KeyStore*,
const KeyStore&,
const bufferlist&,
size_t,
bufferlist *,

2
src/auth/none/AuthNoneAuthorizeHandler.cc
View File

@ -19,7 +19,7 @@
bool AuthNoneAuthorizeHandler::verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
const bufferlist& authorizer_data,
size_t connection_secret_required_len,
bufferlist *authorizer_reply,

2
src/auth/none/AuthNoneAuthorizeHandler.h
View File

@ -22,7 +22,7 @@ class CephContext;
struct AuthNoneAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(
CephContext *cct,
KeyStore *keys,
const KeyStore& keys,
const bufferlist& authorizer_data,
size_t connection_secret_required_len,
bufferlist *authorizer_reply,

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

@ -580,7 +580,7 @@ int Client::handle_auth_request(ceph::net::ConnectionRef con,
AuthCapsInfo caps_info;
bool is_valid = ah->verify_authorizer(
&cct,
&active_con->get_keys(),
active_con->get_keys(),
payload,
auth_meta->get_connection_secret_length(),
reply,

2
src/mon/MonClient.cc
View File

@ -1453,7 +1453,7 @@ int MonClient::handle_auth_request(
bool was_challenge = (bool)auth_meta->authorizer_challenge;
bool isvalid = ah->verify_authorizer(
cct,
rotating_secrets.get(),
*rotating_secrets,
payload,
auth_meta->get_connection_secret_length(),
reply,

2
src/mon/Monitor.cc
View File

@ -6213,7 +6213,7 @@ int Monitor::handle_auth_request(
bool was_challenge = (bool)auth_meta->authorizer_challenge;
bool isvalid = ah->verify_authorizer(
cct,
&keyring,
keyring,
payload,
auth_meta->get_connection_secret_length(),
reply,