Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27859f97 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: wrap auth ops in wrapper functions 



Use wrapper functions that check whether the auth op exists so that callers
do not need a bunch of conditional checks.  Simplifies the external
interface.

Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 0bed9b5c

fs/ceph/mds_client.c

+12 −14
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ void ceph_put_mds_session(struct ceph_mds_session *s) 
	     atomic_read(&s->s_ref), atomic_read(&s->s_ref)-1);

	if (atomic_dec_and_test(&s->s_ref)) {

		if (s->s_auth.authorizer)

		     s->s_mdsc->fsc->client->monc.auth->ops->destroy_authorizer(

			ceph_auth_destroy_authorizer(

				s->s_mdsc->fsc->client->monc.auth,

				s->s_auth.authorizer);

		kfree(s);
@@ -3439,17 +3439,16 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, 
	struct ceph_auth_handshake *auth = &s->s_auth;



	if (force_new && auth->authorizer) {

		if (ac->ops && ac->ops->destroy_authorizer)

			ac->ops->destroy_authorizer(ac, auth->authorizer);

		ceph_auth_destroy_authorizer(ac, auth->authorizer);

		auth->authorizer = NULL;

	}

	if (!auth->authorizer && ac->ops && ac->ops->create_authorizer) {

		int ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

	if (!auth->authorizer) {

		int ret = ceph_auth_create_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

						      auth);

		if (ret)

			return ERR_PTR(ret);

	} else if (ac->ops && ac->ops_update_authorizer) {

		int ret = ac->ops->update_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

	} else {

		int ret = ceph_auth_update_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

						      auth);

		if (ret)

			return ERR_PTR(ret);
@@ -3466,7 +3465,7 @@ static int verify_authorizer_reply(struct ceph_connection *con, int len) 
	struct ceph_mds_client *mdsc = s->s_mdsc;

	struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;



	return ac->ops->verify_authorizer_reply(ac, s->s_auth.authorizer, len);

	return ceph_auth_verify_authorizer_reply(ac, s->s_auth.authorizer, len);

}



static int invalidate_authorizer(struct ceph_connection *con)
@@ -3475,8 +3474,7 @@ static int invalidate_authorizer(struct ceph_connection *con) 
	struct ceph_mds_client *mdsc = s->s_mdsc;

	struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;



	if (ac->ops->invalidate_authorizer)

		ac->ops->invalidate_authorizer(ac, CEPH_ENTITY_TYPE_MDS);

	ceph_auth_invalidate_authorizer(ac, CEPH_ENTITY_TYPE_MDS);



	return ceph_monc_validate_auth(&mdsc->fsc->client->monc);

}

include/linux/ceph/auth.h

+13 −0
Original line number Diff line number Diff line
@@ -97,5 +97,18 @@ extern int ceph_build_auth(struct ceph_auth_client *ac, 
		    void *msg_buf, size_t msg_len);



extern int ceph_auth_is_authenticated(struct ceph_auth_client *ac);

extern int ceph_auth_create_authorizer(struct ceph_auth_client *ac,

				       int peer_type,

				       struct ceph_auth_handshake *auth);

extern void ceph_auth_destroy_authorizer(struct ceph_auth_client *ac,

					 struct ceph_authorizer *a);

extern int ceph_auth_update_authorizer(struct ceph_auth_client *ac,

				       int peer_type,

				       struct ceph_auth_handshake *a);

extern int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,

					     struct ceph_authorizer *a,

					     size_t len);

extern void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac,

					    int peer_type);



#endif

net/ceph/auth.c

+47 −0
Original line number Diff line number Diff line
@@ -257,3 +257,50 @@ int ceph_auth_is_authenticated(struct ceph_auth_client *ac) 
		return 0;

	return ac->ops->is_authenticated(ac);

}

EXPORT_SYMBOL(ceph_auth_is_authenticated);



int ceph_auth_create_authorizer(struct ceph_auth_client *ac,

				int peer_type,

				struct ceph_auth_handshake *auth)

{

	if (ac->ops && ac->ops->create_authorizer)

		return ac->ops->create_authorizer(ac, peer_type, auth);

	return 0;

}

EXPORT_SYMBOL(ceph_auth_create_authorizer);



void ceph_auth_destroy_authorizer(struct ceph_auth_client *ac,

				  struct ceph_authorizer *a)

{

	if (ac->ops && ac->ops->destroy_authorizer)

		ac->ops->destroy_authorizer(ac, a);

}

EXPORT_SYMBOL(ceph_auth_destroy_authorizer);



int ceph_auth_update_authorizer(struct ceph_auth_client *ac,

				int peer_type,

				struct ceph_auth_handshake *a)

{

	int ret = 0;



	if (ac->ops && ac->ops->update_authorizer)

		ret = ac->ops->update_authorizer(ac, peer_type, a);

	return ret;

}

EXPORT_SYMBOL(ceph_auth_update_authorizer);



int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,

				      struct ceph_authorizer *a, size_t len)

{

	if (ac->ops && ac->ops->verify_authorizer_reply)

		return ac->ops->verify_authorizer_reply(ac, a, len);

	return 0;

}

EXPORT_SYMBOL(ceph_auth_verify_authorizer_reply);



void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac, int peer_type)

{

	if (ac->ops && ac->ops->invalidate_authorizer)

		ac->ops->invalidate_authorizer(ac, peer_type);

}

EXPORT_SYMBOL(ceph_auth_invalidate_authorizer);

net/ceph/auth_x.c

+0 −1
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ static int ceph_x_update_authorizer( 
{

	struct ceph_x_authorizer *au;

	struct ceph_x_ticket_handler *th;

	int ret;



	th = get_ticket_handler(ac, peer_type);

	if (IS_ERR(th))

net/ceph/mon_client.c

+3 −4
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static void delayed_work(struct work_struct *work) 


		__validate_auth(monc);



		if (monc->auth->ops->is_authenticated(monc->auth))

		if (ceph_auth_is_authenticated(monc->auth))

			__send_subscribe(monc);

	}

	__schedule_delayed(monc);
@@ -892,8 +892,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc, 


	mutex_lock(&monc->mutex);

	had_debugfs_info = have_debugfs_info(monc);

	if (monc->auth->ops)

		was_auth = monc->auth->ops->is_authenticated(monc->auth);

	was_auth = ceph_auth_is_authenticated(monc->auth);

	monc->pending_auth = 0;

	ret = ceph_handle_auth_reply(monc->auth, msg->front.iov_base,

				     msg->front.iov_len,
@@ -904,7 +903,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc, 
		wake_up_all(&monc->client->auth_wq);

	} else if (ret > 0) {

		__send_prepared_auth_request(monc, ret);

	} else if (!was_auth && monc->auth->ops->is_authenticated(monc->auth)) {

	} else if (!was_auth && ceph_auth_is_authenticated(monc->auth)) {

		dout("authenticated, starting session\n");



		monc->client->msgr.inst.name.type = CEPH_ENTITY_TYPE_CLIENT;