History

libceph: message signature support

Yan, Zheng committed 12 years ago

Commit 33d07331 parent ae385ea8 files · +162 −4Browse files

Unified · Split

8 files
  1. fs/ceph/mds_client.c +16 −0
  2. include/linux/ceph/auth.h +26 −0
  3. include/linux/ceph/ceph_features.h +1 −0
  4. include/linux/ceph/messenger.h +8 −1
  5. include/linux/ceph/msgr.h +8 −0
  6. net/ceph/auth_x.c +58 −0
  7. net/ceph/messenger.c +29 −3
  8. net/ceph/osd_client.c +16 −0
fs/ceph/mds_client.c+16−0
@@ -3744,6 +3744,20 @@ static struct ceph_msg *mds_alloc_msg(struct ceph_connection *con, · 3743 unmodified lines
37443744 return msg;
37453745 }
37463746
3747+static int sign_message(struct ceph_connection *con, struct ceph_msg *msg)
3748+{
3749+ struct ceph_mds_session *s = con->private;
3750+ struct ceph_auth_handshake *auth = &s->s_auth;
3751+ return ceph_auth_sign_message(auth, msg);
3752+}
3753+
3754+static int check_message_signature(struct ceph_connection *con, struct ceph_msg *msg)
3755+{
3756+ struct ceph_mds_session *s = con->private;
3757+ struct ceph_auth_handshake *auth = &s->s_auth;
3758+ return ceph_auth_check_message_signature(auth, msg);
3759+}
3760+
37473761 static const struct ceph_connection_operations mds_con_ops = {
37483762 .get = con_get,
37493763 .put = con_put,
@@ -3753,6 +3767,8 @@ static const struct ceph_connection_operations mds_con_ops = { · 3 unmodified lines
37533767 .invalidate_authorizer = invalidate_authorizer,
37543768 .peer_reset = peer_reset,
37553769 .alloc_msg = mds_alloc_msg,
3770+ .sign_message = sign_message,
3771+ .check_message_signature = check_message_signature,
37563772 };
37573773
37583774 /* eof */
include/linux/ceph/auth.h+26−0
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313
1414 struct ceph_auth_client;
1515 struct ceph_authorizer;
16+struct ceph_msg;
1617
1718 struct ceph_auth_handshake {
1819 struct ceph_authorizer *authorizer;
@@ -20,6 +21,10 @@ struct ceph_auth_handshake { · 1 unmodified line
2021 size_t authorizer_buf_len;
2122 void *authorizer_reply_buf;
2223 size_t authorizer_reply_buf_len;
24+ int (*sign_message)(struct ceph_auth_handshake *auth,
25+ struct ceph_msg *msg);
26+ int (*check_message_signature)(struct ceph_auth_handshake *auth,
27+ struct ceph_msg *msg);
2328 };
2429
2530 struct ceph_auth_client_ops {
@@ -66,6 +71,11 @@ struct ceph_auth_client_ops { · 40 unmodified lines
6671 void (*reset)(struct ceph_auth_client *ac);
6772
6873 void (*destroy)(struct ceph_auth_client *ac);
74+
75+ int (*sign_message)(struct ceph_auth_handshake *auth,
76+ struct ceph_msg *msg);
77+ int (*check_message_signature)(struct ceph_auth_handshake *auth,
78+ struct ceph_msg *msg);
6979 };
7080
7181 struct ceph_auth_client {
@@ -113,4 +123,20 @@ extern int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac, · 41 unmodified lines
113123 extern void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac,
114124 int peer_type);
115125
126+static inline int ceph_auth_sign_message(struct ceph_auth_handshake *auth,
127+ struct ceph_msg *msg)
128+{
129+ if (auth->sign_message)
130+ return auth->sign_message(auth, msg);
131+ return 0;
132+}
133+
134+static inline
135+int ceph_auth_check_message_signature(struct ceph_auth_handshake *auth,
136+ struct ceph_msg *msg)
137+{
138+ if (auth->check_message_signature)
139+ return auth->check_message_signature(auth, msg);
140+ return 0;
141+}
116142 #endif
include/linux/ceph/ceph_features.h+1−0
@@ -84,6 +84,7 @@ static inline u64 ceph_sanitize_features(u64 features) · 83 unmodified lines
8484 CEPH_FEATURE_PGPOOL3 | \
8585 CEPH_FEATURE_OSDENC | \
8686 CEPH_FEATURE_CRUSH_TUNABLES | \
87+ CEPH_FEATURE_MSG_AUTH | \
8788 CEPH_FEATURE_CRUSH_TUNABLES2 | \
8889 CEPH_FEATURE_REPLY_CREATE_INODE | \
8990 CEPH_FEATURE_OSDHASHPSPOOL | \
include/linux/ceph/messenger.h+8−1
@@ -42,6 +42,10 @@ struct ceph_connection_operations { · 41 unmodified lines
4242 struct ceph_msg * (*alloc_msg) (struct ceph_connection *con,
4343 struct ceph_msg_header *hdr,
4444 int *skip);
45+ int (*sign_message) (struct ceph_connection *con, struct ceph_msg *msg);
46+
47+ int (*check_message_signature) (struct ceph_connection *con,
48+ struct ceph_msg *msg);
4549 };
4650
4751 /* use format string %s%d */
@@ -142,7 +146,10 @@ struct ceph_msg_data_cursor { · 94 unmodified lines
142146 */
143147 struct ceph_msg {
144148 struct ceph_msg_header hdr; /* header */
145− struct ceph_msg_footer footer; /* footer */
149+ union {
150+ struct ceph_msg_footer footer; /* footer */
151+ struct ceph_msg_footer_old old_footer; /* old format footer */
152+ };
146153 struct kvec front; /* unaligned blobs of message */
147154 struct ceph_buffer *middle;
148155
include/linux/ceph/msgr.h+8−0
@@ -164,13 +164,21 @@ struct ceph_msg_header { · 163 unmodified lines
164164 /*
165165 * follows data payload
166166 */
167+struct ceph_msg_footer_old {
168+ __le32 front_crc, middle_crc, data_crc;
169+ __u8 flags;
170+} __attribute__ ((packed));
171+
167172 struct ceph_msg_footer {
168173 __le32 front_crc, middle_crc, data_crc;
174+ // sig holds the 64 bits of the digital signature for the message PLR
175+ __le64 sig;
169176 __u8 flags;
170177 } __attribute__ ((packed));
171178
172179 #define CEPH_MSG_FOOTER_COMPLETE (1<<0) /* msg wasn't aborted */
173180 #define CEPH_MSG_FOOTER_NOCRC (1<<1) /* no data crc */
181+#define CEPH_MSG_FOOTER_SIGNED (1<<2) /* msg was signed */
174182
175183
176184 #endif
net/ceph/auth_x.c+58−0
@@ -8,6 +8,7 @@ · 7 unmodified lines
88
99 #include <linux/ceph/decode.h>
1010 #include <linux/ceph/auth.h>
11+#include <linux/ceph/messenger.h>
1112
1213 #include "crypto.h"
1314 #include "auth_x.h"
@@ -567,6 +568,8 @@ static int ceph_x_create_authorizer( · 553 unmodified lines
567568 auth->authorizer_buf_len = au->buf->vec.iov_len;
568569 auth->authorizer_reply_buf = au->reply_buf;
569570 auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
571+ auth->sign_message = ac->ops->sign_message;
572+ auth->check_message_signature = ac->ops->check_message_signature;
570573
571574 return 0;
572575 }
@@ -667,6 +670,59 @@ static void ceph_x_invalidate_authorizer(struct ceph_auth_client *ac, · 94 unmodified lines
667670 memset(&th->validity, 0, sizeof(th->validity));
668671 }
669672
673+static int calcu_signature(struct ceph_x_authorizer *au,
674+ struct ceph_msg *msg, __le64 *sig)
675+{
676+ int ret;
677+ char tmp_enc[40];
678+ __le32 tmp[5] = {
679+ 16u, msg->hdr.crc, msg->footer.front_crc,
680+ msg->footer.middle_crc, msg->footer.data_crc,
681+ };
682+ ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp),
683+ tmp_enc, sizeof(tmp_enc));
684+ if (ret < 0)
685+ return ret;
686+ *sig = *(__le64*)(tmp_enc + 4);
687+ return 0;
688+}
689+
690+static int ceph_x_sign_message(struct ceph_auth_handshake *auth,
691+ struct ceph_msg *msg)
692+{
693+ int ret;
694+ if (!auth->authorizer)
695+ return 0;
696+ ret = calcu_signature((struct ceph_x_authorizer *)auth->authorizer,
697+ msg, &msg->footer.sig);
698+ if (ret < 0)
699+ return ret;
700+ msg->footer.flags |= CEPH_MSG_FOOTER_SIGNED;
701+ return 0;
702+}
703+
704+static int ceph_x_check_message_signature(struct ceph_auth_handshake *auth,
705+ struct ceph_msg *msg)
706+{
707+ __le64 sig_check;
708+ int ret;
709+
710+ if (!auth->authorizer)
711+ return 0;
712+ ret = calcu_signature((struct ceph_x_authorizer *)auth->authorizer,
713+ msg, &sig_check);
714+ if (ret < 0)
715+ return ret;
716+ if (sig_check == msg->footer.sig)
717+ return 0;
718+ if (msg->footer.flags & CEPH_MSG_FOOTER_SIGNED)
719+ dout("ceph_x_check_message_signature %p has signature %llx "
720+ "expect %llx\n", msg, msg->footer.sig, sig_check);
721+ else
722+ dout("ceph_x_check_message_signature %p sender did not set "
723+ "CEPH_MSG_FOOTER_SIGNED\n", msg);
724+ return -EBADMSG;
725+}
670726
671727 static const struct ceph_auth_client_ops ceph_x_ops = {
672728 .name = "x",
@@ -681,6 +737,8 @@ static const struct ceph_auth_client_ops ceph_x_ops = { · 8 unmodified lines
681737 .invalidate_authorizer = ceph_x_invalidate_authorizer,
682738 .reset = ceph_x_reset,
683739 .destroy = ceph_x_destroy,
740+ .sign_message = ceph_x_sign_message,
741+ .check_message_signature = ceph_x_check_message_signature,
684742 };
685743
686744
net/ceph/messenger.c+29−3
@@ -1196,8 +1196,18 @@ static void prepare_write_message_footer(struct ceph_connection *con) · 1195 unmodified lines
11961196 dout("prepare_write_message_footer %p\n", con);
11971197 con->out_kvec_is_msg = true;
11981198 con->out_kvec[v].iov_base = &m->footer;
1199− con->out_kvec[v].iov_len = sizeof(m->footer);
1200− con->out_kvec_bytes += sizeof(m->footer);
1199+ if (con->peer_features & CEPH_FEATURE_MSG_AUTH) {
1200+ if (con->ops->sign_message)
1201+ con->ops->sign_message(con, m);
1202+ else
1203+ m->footer.sig = 0;
1204+ con->out_kvec[v].iov_len = sizeof(m->footer);
1205+ con->out_kvec_bytes += sizeof(m->footer);
1206+ } else {
1207+ m->old_footer.flags = m->footer.flags;
1208+ con->out_kvec[v].iov_len = sizeof(m->old_footer);
1209+ con->out_kvec_bytes += sizeof(m->old_footer);
1210+ }
12011211 con->out_kvec_left++;
12021212 con->out_more = m->more_to_follow;
12031213 con->out_msg_done = true;
@@ -2249,6 +2259,7 @@ static int read_partial_message(struct ceph_connection *con) · 1045 unmodified lines
22492259 int ret;
22502260 unsigned int front_len, middle_len, data_len;
22512261 bool do_datacrc = !con->msgr->nocrc;
2262+ bool need_sign = (con->peer_features & CEPH_FEATURE_MSG_AUTH);
22522263 u64 seq;
22532264 u32 crc;
22542265
@@ -2361,12 +2372,21 @@ static int read_partial_message(struct ceph_connection *con) · 106 unmodified lines
23612372 }
23622373
23632374 /* footer */
2364− size = sizeof (m->footer);
2375+ if (need_sign)
2376+ size = sizeof(m->footer);
2377+ else
2378+ size = sizeof(m->old_footer);
2379+
23652380 end += size;
23662381 ret = read_partial(con, end, size, &m->footer);
23672382 if (ret <= 0)
23682383 return ret;
23692384
2385+ if (!need_sign) {
2386+ m->footer.flags = m->old_footer.flags;
2387+ m->footer.sig = 0;
2388+ }
2389+
23702390 dout("read_partial_message got msg %p %d (%u) + %d (%u) + %d (%u)\n",
23712391 m, front_len, m->footer.front_crc, middle_len,
23722392 m->footer.middle_crc, data_len, m->footer.data_crc);
@@ -2390,6 +2410,12 @@ static int read_partial_message(struct ceph_connection *con) · 17 unmodified lines
23902410 return -EBADMSG;
23912411 }
23922412
2413+ if (need_sign && con->ops->check_message_signature &&
2414+ con->ops->check_message_signature(con, m)) {
2415+ pr_err("read_partial_message %p signature check failed\n", m);
2416+ return -EBADMSG;
2417+ }
2418+
23932419 return 1; /* done! */
23942420 }
23952421
net/ceph/osd_client.c+16−0
@@ -2920,6 +2920,20 @@ static int invalidate_authorizer(struct ceph_connection *con) · 2919 unmodified lines
29202920 return ceph_monc_validate_auth(&osdc->client->monc);
29212921 }
29222922
2923+static int sign_message(struct ceph_connection *con, struct ceph_msg *msg)
2924+{
2925+ struct ceph_osd *o = con->private;
2926+ struct ceph_auth_handshake *auth = &o->o_auth;
2927+ return ceph_auth_sign_message(auth, msg);
2928+}
2929+
2930+static int check_message_signature(struct ceph_connection *con, struct ceph_msg *msg)
2931+{
2932+ struct ceph_osd *o = con->private;
2933+ struct ceph_auth_handshake *auth = &o->o_auth;
2934+ return ceph_auth_check_message_signature(auth, msg);
2935+}
2936+
29232937 static const struct ceph_connection_operations osd_con_ops = {
29242938 .get = get_osd_con,
29252939 .put = put_osd_con,
@@ -2928,5 +2942,7 @@ static const struct ceph_connection_operations osd_con_ops = { · 2 unmodified lines
29282942 .verify_authorizer_reply = verify_authorizer_reply,
29292943 .invalidate_authorizer = invalidate_authorizer,
29302944 .alloc_msg = alloc_msg,
2945+ .sign_message = sign_message,
2946+ .check_message_signature = check_message_signature,
29312947 .fault = osd_reset,
29322948 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t