|
|
@@ -16,7 +16,6 @@ static void reset(struct ceph_auth_client *ac)
|
|
|
struct ceph_auth_none_info *xi = ac->private;
|
|
|
|
|
|
xi->starting = true;
|
|
|
- xi->built_authorizer = false;
|
|
|
}
|
|
|
|
|
|
static void destroy(struct ceph_auth_client *ac)
|
|
|
@@ -39,6 +38,27 @@ static int should_authenticate(struct ceph_auth_client *ac)
|
|
|
return xi->starting;
|
|
|
}
|
|
|
|
|
|
+static int ceph_auth_none_build_authorizer(struct ceph_auth_client *ac,
|
|
|
+ struct ceph_none_authorizer *au)
|
|
|
+{
|
|
|
+ void *p = au->buf;
|
|
|
+ void *const end = p + sizeof(au->buf);
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ceph_encode_8_safe(&p, end, 1, e_range);
|
|
|
+ ret = ceph_entity_name_encode(ac->name, &p, end);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ ceph_encode_64_safe(&p, end, ac->global_id, e_range);
|
|
|
+ au->buf_len = p - (void *)au->buf;
|
|
|
+ dout("%s built authorizer len %d\n", __func__, au->buf_len);
|
|
|
+ return 0;
|
|
|
+
|
|
|
+e_range:
|
|
|
+ return -ERANGE;
|
|
|
+}
|
|
|
+
|
|
|
static int build_request(struct ceph_auth_client *ac, void *buf, void *end)
|
|
|
{
|
|
|
return 0;
|
|
|
@@ -57,32 +77,32 @@ static int handle_reply(struct ceph_auth_client *ac, int result,
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+static void ceph_auth_none_destroy_authorizer(struct ceph_authorizer *a)
|
|
|
+{
|
|
|
+ kfree(a);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
- * build an 'authorizer' with our entity_name and global_id. we can
|
|
|
- * reuse a single static copy since it is identical for all services
|
|
|
- * we connect to.
|
|
|
+ * build an 'authorizer' with our entity_name and global_id. it is
|
|
|
+ * identical for all services we connect to.
|
|
|
*/
|
|
|
static int ceph_auth_none_create_authorizer(
|
|
|
struct ceph_auth_client *ac, int peer_type,
|
|
|
struct ceph_auth_handshake *auth)
|
|
|
{
|
|
|
- struct ceph_auth_none_info *ai = ac->private;
|
|
|
- struct ceph_none_authorizer *au = &ai->au;
|
|
|
- void *p, *end;
|
|
|
+ struct ceph_none_authorizer *au;
|
|
|
int ret;
|
|
|
|
|
|
- if (!ai->built_authorizer) {
|
|
|
- p = au->buf;
|
|
|
- end = p + sizeof(au->buf);
|
|
|
- ceph_encode_8(&p, 1);
|
|
|
- ret = ceph_entity_name_encode(ac->name, &p, end - 8);
|
|
|
- if (ret < 0)
|
|
|
- goto bad;
|
|
|
- ceph_decode_need(&p, end, sizeof(u64), bad2);
|
|
|
- ceph_encode_64(&p, ac->global_id);
|
|
|
- au->buf_len = p - (void *)au->buf;
|
|
|
- ai->built_authorizer = true;
|
|
|
- dout("built authorizer len %d\n", au->buf_len);
|
|
|
+ au = kmalloc(sizeof(*au), GFP_NOFS);
|
|
|
+ if (!au)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
+ au->base.destroy = ceph_auth_none_destroy_authorizer;
|
|
|
+
|
|
|
+ ret = ceph_auth_none_build_authorizer(ac, au);
|
|
|
+ if (ret) {
|
|
|
+ kfree(au);
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
auth->authorizer = (struct ceph_authorizer *) au;
|
|
|
@@ -92,17 +112,6 @@ static int ceph_auth_none_create_authorizer(
|
|
|
auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-bad2:
|
|
|
- ret = -ERANGE;
|
|
|
-bad:
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
-static void ceph_auth_none_destroy_authorizer(struct ceph_auth_client *ac,
|
|
|
- struct ceph_authorizer *a)
|
|
|
-{
|
|
|
- /* nothing to do */
|
|
|
}
|
|
|
|
|
|
static const struct ceph_auth_client_ops ceph_auth_none_ops = {
|
|
|
@@ -114,7 +123,6 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = {
|
|
|
.build_request = build_request,
|
|
|
.handle_reply = handle_reply,
|
|
|
.create_authorizer = ceph_auth_none_create_authorizer,
|
|
|
- .destroy_authorizer = ceph_auth_none_destroy_authorizer,
|
|
|
};
|
|
|
|
|
|
int ceph_auth_none_init(struct ceph_auth_client *ac)
|
|
|
@@ -127,7 +135,6 @@ int ceph_auth_none_init(struct ceph_auth_client *ac)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
xi->starting = true;
|
|
|
- xi->built_authorizer = false;
|
|
|
|
|
|
ac->protocol = CEPH_AUTH_NONE;
|
|
|
ac->private = xi;
|
Ilya Dryomov