Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

common/auth: add override in headers #13692

Merged
merged 1 commit into from Feb 28, 2017
Merged

common/auth: add override in headers #13692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/auth/Crypto.cc
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ class CryptoNoneKeyHandler : public CryptoKeyHandler {
class CryptoNone : public CryptoHandler {
public:
CryptoNone() { }
~CryptoNone() {}
~CryptoNone() override {}
int get_type() const override {
return CEPH_CRYPTO_NONE;
}
Expand All @@ -103,7 +103,7 @@ class CryptoNone : public CryptoHandler {
class CryptoAES : public CryptoHandler {
public:
CryptoAES() { }
~CryptoAES() {}
~CryptoAES() override {}
int get_type() const override {
return CEPH_CRYPTO_AES;
}
Expand Down Expand Up @@ -267,7 +267,7 @@ class CryptoAESKeyHandler : public CryptoKeyHandler {
slot(NULL),
key(NULL),
param(NULL) {}
~CryptoAESKeyHandler() {
~CryptoAESKeyHandler() override {
SECITEM_FreeItem(param, PR_TRUE);
if (key)
PK11_FreeSymKey(key);
Expand Down
4 changes: 2 additions & 2 deletions src/auth/KeyRing.h
View file
Open in desktop
Expand Up @@ -45,15 +45,15 @@ class KeyRing : public KeyStore {
a = k->second;
return true;
}
bool get_secret(const EntityName& name, CryptoKey& secret) const {
bool get_secret(const EntityName& name, CryptoKey& secret) const override {
map<EntityName, EntityAuth>::const_iterator k = keys.find(name);
if (k == keys.end())
return false;
secret = k->second.key;
return true;
}
bool get_service_secret(uint32_t service_id, uint64_t secret_id,
CryptoKey& secret) const {
CryptoKey& secret) const override {
return false;
}
bool get_caps(const EntityName& name,
Expand Down
4 changes: 2 additions & 2 deletions src/auth/RotatingKeyRing.h
View file
Open in desktop
Expand Up @@ -43,9 +43,9 @@ class RotatingKeyRing : public KeyStore {
bool need_new_secrets(utime_t now) const;
void set_secrets(RotatingSecrets& s);
void dump_rotating() const;
bool get_secret(const EntityName& name, CryptoKey& secret) const;
bool get_secret(const EntityName& name, CryptoKey& secret) const override;
bool get_service_secret(uint32_t service_id, uint64_t secret_id,
CryptoKey& secret) const;
CryptoKey& secret) const override;
KeyRing *get_keyring();
};

Expand Down
4 changes: 2 additions & 2 deletions src/auth/cephx/CephxAuthorizeHandler.h
View file
Open in desktop
Expand Up @@ -23,8 +23,8 @@ struct CephxAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(CephContext *cct, KeyStore *keys,
bufferlist& authorizer_data, bufferlist& authorizer_reply,
EntityName& entity_name, uint64_t& global_id,
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid = NULL);
int authorizer_session_crypto();
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid = NULL) override;
int authorizer_session_crypto() override;
};


Expand Down
20 changes: 10 additions & 10 deletions src/auth/cephx/CephxClientHandler.h
View file
Open in desktop
Expand Up @@ -47,29 +47,29 @@ class CephxClientHandler : public AuthClientHandler {
reset();
}

void reset() {
void reset() override {
RWLock::WLocker l(lock);
starting = true;
server_challenge = 0;
}
void prepare_build_request();
int build_request(bufferlist& bl) const;
int handle_response(int ret, bufferlist::iterator& iter);
bool build_rotating_request(bufferlist& bl) const;
void prepare_build_request() override;
int build_request(bufferlist& bl) const override;
int handle_response(int ret, bufferlist::iterator& iter) override;
bool build_rotating_request(bufferlist& bl) const override;

int get_protocol() const { return CEPH_AUTH_CEPHX; }
int get_protocol() const override { return CEPH_AUTH_CEPHX; }

AuthAuthorizer *build_authorizer(uint32_t service_id) const;
AuthAuthorizer *build_authorizer(uint32_t service_id) const override;

bool need_tickets();
bool need_tickets() override;

void set_global_id(uint64_t id) {
void set_global_id(uint64_t id) override {
RWLock::WLocker l(lock);
global_id = id;
tickets.global_id = id;
}
private:
void validate_tickets();
void validate_tickets() override;
bool _need_tickets() const;
};

Expand Down
4 changes: 2 additions & 2 deletions src/auth/cephx/CephxKeyServer.h
View file
Open in desktop
Expand Up @@ -200,7 +200,7 @@ class KeyServer : public KeyStore {
KeyServer(CephContext *cct_, KeyRing *extra_secrets);
bool generate_secret(CryptoKey& secret);

bool get_secret(const EntityName& name, CryptoKey& secret) const;
bool get_secret(const EntityName& name, CryptoKey& secret) const override;
bool get_auth(const EntityName& name, EntityAuth& auth) const;
bool get_caps(const EntityName& name, const string& type, AuthCapsInfo& caps) const;
bool get_active_rotating_secret(const EntityName& name, CryptoKey& secret) const;
Expand All @@ -217,7 +217,7 @@ class KeyServer : public KeyStore {
bool get_service_secret(uint32_t service_id, CryptoKey& service_key,
uint64_t& secret_id) const;
bool get_service_secret(uint32_t service_id, uint64_t secret_id,
CryptoKey& secret) const;
CryptoKey& secret) const override;

bool generate_secret(EntityName& name, CryptoKey& secret);

Expand Down
2 changes: 1 addition & 1 deletion src/auth/cephx/CephxProtocol.h
View file
Open in desktop
Expand Up @@ -278,7 +278,7 @@ struct CephXAuthorizer : public AuthAuthorizer {
: AuthAuthorizer(CEPH_AUTH_CEPHX), cct(cct_), nonce(0) {}

bool build_authorizer();
bool verify_reply(bufferlist::iterator& reply);
bool verify_reply(bufferlist::iterator& reply) override;
};


Expand Down
6 changes: 3 additions & 3 deletions src/auth/cephx/CephxServiceHandler.h
View file
Open in desktop
Expand Up @@ -27,10 +27,10 @@ class CephxServiceHandler : public AuthServiceHandler {
public:
CephxServiceHandler(CephContext *cct_, KeyServer *ks)
: AuthServiceHandler(cct_), key_server(ks), server_challenge(0) {}
~CephxServiceHandler() {}
~CephxServiceHandler() override {}

int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps);
int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL);
int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override;
int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override;
void build_cephx_response_header(int request_type, int status, bufferlist& bl);
};

Expand Down
12 changes: 6 additions & 6 deletions src/auth/cephx/CephxSessionHandler.h
View file
Open in desktop
Expand Up @@ -26,24 +26,24 @@ class CephxSessionHandler : public AuthSessionHandler {
CephxSessionHandler(CephContext *cct_, CryptoKey session_key, uint64_t features)
: AuthSessionHandler(cct_, CEPH_AUTH_CEPHX, session_key),
features(features) {}
~CephxSessionHandler() {}
~CephxSessionHandler() override {}

bool no_security() {
bool no_security() override {
return false;
}

int _calc_signature(Message *m, uint64_t *psig);

int sign_message(Message *m);
int check_message_signature(Message *m) ;
int sign_message(Message *m) override;
int check_message_signature(Message *m) override ;

// Cephx does not currently encrypt messages, so just return 0 if called. PLR

int encrypt_message(Message *m) {
int encrypt_message(Message *m) override {
return 0;
}

int decrypt_message(Message *m) {
int decrypt_message(Message *m) override {
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions src/auth/none/AuthNoneAuthorizeHandler.h
View file
Open in desktop
Expand Up @@ -23,8 +23,8 @@ struct AuthNoneAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(CephContext *cct, KeyStore *keys,
bufferlist& authorizer_data, bufferlist& authorizer_reply,
EntityName& entity_name, uint64_t& global_id,
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid=NULL);
int authorizer_session_crypto();
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid=NULL) override;
int authorizer_session_crypto() override;
};


Expand Down
20 changes: 10 additions & 10 deletions src/auth/none/AuthNoneClientHandler.h
View file
Open in desktop
Expand Up @@ -25,16 +25,16 @@ class AuthNoneClientHandler : public AuthClientHandler {
AuthNoneClientHandler(CephContext *cct_, RotatingKeyRing *rkeys)
: AuthClientHandler(cct_) {}

void reset() { }
void reset() override { }

void prepare_build_request() {}
int build_request(bufferlist& bl) const { return 0; }
int handle_response(int ret, bufferlist::iterator& iter) { return 0; }
bool build_rotating_request(bufferlist& bl) const { return false; }
void prepare_build_request() override {}
int build_request(bufferlist& bl) const override { return 0; }
int handle_response(int ret, bufferlist::iterator& iter) override { return 0; }
bool build_rotating_request(bufferlist& bl) const override { return false; }

int get_protocol() const { return CEPH_AUTH_NONE; }
int get_protocol() const override { return CEPH_AUTH_NONE; }

AuthAuthorizer *build_authorizer(uint32_t service_id) const {
AuthAuthorizer *build_authorizer(uint32_t service_id) const override {
RWLock::RLocker l(lock);
AuthNoneAuthorizer *auth = new AuthNoneAuthorizer();
if (auth) {
Expand All @@ -43,14 +43,14 @@ class AuthNoneClientHandler : public AuthClientHandler {
return auth;
}

bool need_tickets() { return false; }
bool need_tickets() override { return false; }

void set_global_id(uint64_t id) {
void set_global_id(uint64_t id) override {
RWLock::WLocker l(lock);
global_id = id;
}
private:
void validate_tickets() {}
void validate_tickets() override {}
};

#endif
2 changes: 1 addition & 1 deletion src/auth/none/AuthNoneProtocol.h
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ struct AuthNoneAuthorizer : public AuthAuthorizer {
::encode(global_id, bl);
return 0;
}
bool verify_reply(bufferlist::iterator& reply) { return true; }
bool verify_reply(bufferlist::iterator& reply) override { return true; }
};

#endif
6 changes: 3 additions & 3 deletions src/auth/none/AuthNoneServiceHandler.h
View file
Open in desktop
Expand Up @@ -24,14 +24,14 @@ class AuthNoneServiceHandler : public AuthServiceHandler {
public:
explicit AuthNoneServiceHandler(CephContext *cct_)
: AuthServiceHandler(cct_) {}
~AuthNoneServiceHandler() {}
~AuthNoneServiceHandler() override {}

int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) {
int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override {
entity_name = name;
caps.allow_all = true;
return CEPH_AUTH_NONE;
}
int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) {
int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override {
return 0;
}
void build_cephx_response_header(int request_type, int status, bufferlist& bl) { }
Expand Down
12 changes: 6 additions & 6 deletions src/auth/none/AuthNoneSessionHandler.h
View file
Open in desktop
Expand Up @@ -21,28 +21,28 @@ class AuthNoneSessionHandler : public AuthSessionHandler {
public:
AuthNoneSessionHandler(CephContext *cct_, CryptoKey session_key)
: AuthSessionHandler(cct_, CEPH_AUTH_NONE, session_key) {}
~AuthNoneSessionHandler() {}
~AuthNoneSessionHandler() override {}

bool no_security() {
bool no_security() override {
return true;
}

// The None suite neither signs nor encrypts messages, so these functions just return success.
// Since nothing was signed or encrypted, don't increment the stats. PLR

int sign_message(Message *m) {
int sign_message(Message *m) override {
return 0;
}

int check_message_signature(Message *m) {
int check_message_signature(Message *m) override {
return 0;
}

int encrypt_message(Message *m) {
int encrypt_message(Message *m) override {
return 0;
}

int decrypt_message(Message *m) {
int decrypt_message(Message *m) override {
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions src/auth/unknown/AuthUnknownAuthorizeHandler.h
View file
Open in desktop
Expand Up @@ -23,8 +23,8 @@ struct AuthUnknownAuthorizeHandler : public AuthAuthorizeHandler {
bool verify_authorizer(CephContext *cct, KeyStore *keys,
bufferlist& authorizer_data, bufferlist& authorizer_reply,
EntityName& entity_name, uint64_t& global_id,
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid=NULL);
int authorizer_session_crypto();
AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid=NULL) override;
int authorizer_session_crypto() override;
};


Expand Down
12 changes: 6 additions & 6 deletions src/auth/unknown/AuthUnknownSessionHandler.h
View file
Open in desktop
Expand Up @@ -23,28 +23,28 @@ class AuthUnknownSessionHandler : public AuthSessionHandler {
public:
AuthUnknownSessionHandler(CephContext *cct_, CryptoKey session_key)
: AuthSessionHandler(cct_, CEPH_AUTH_UNKNOWN, session_key) {}
~AuthUnknownSessionHandler() {}
~AuthUnknownSessionHandler() override {}

bool no_security() {
bool no_security() override {
return true;
}

// The Unknown suite neither signs nor encrypts messages, so these functions just return success.
// Since nothing was signed or encrypted, don't increment the stats. PLR

int sign_message(Message *m) {
int sign_message(Message *m) override {
return 0;
}

int check_message_signature(Message *m) {
int check_message_signature(Message *m) override {
return 0;
}

int encrypt_message(Message *m) {
int encrypt_message(Message *m) override {
return 0;
}

int decrypt_message(Message *m) {
int decrypt_message(Message *m) override {
return 0;
}

Expand Down