Patchwork [v2] rbd: allow client id to be specified in config string

login
register
mail settings
Submitter Sage Weil
Date Aug. 22, 2011, 9:45 p.m.
Message ID <Pine.LNX.4.64.1108221444190.18049@cobra.newdream.net>
Download mbox | patch
Permalink /patch/110997/
State New
Headers show

Comments

Sage Weil - Aug. 22, 2011, 9:45 p.m.
Allow the client id to be specified in the config string via 'id=' so that
users can control who they authenticate as.  Currently they are stuck with
the default ('admin').  This is necessary for anyone using authentication
in their environment.

Signed-off-by: Sage Weil <sage@newdream.net>
---
v2: whoops, fixed default case where id= is not specified.

 block/rbd.c |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 deletions(-)
Stefan Hajnoczi - Aug. 23, 2011, 7:58 a.m.
On Mon, Aug 22, 2011 at 02:45:48PM -0700, Sage Weil wrote:
> diff --git a/block/rbd.c b/block/rbd.c
> index d5659cd..b0cd750 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -169,6 +169,34 @@ done:
>      return ret;
>  }
>  
> +static char *qemu_rbd_parse_clientname(const char *conf, char *clientname)
> +{
> +    const char *p = conf;
> +
> +    while (*p) {
> +	int len;
> +	const char *end = strchr(p, ':');
> +
> +	if (end) {
> +	    len = end - p;
> +	} else {
> +	    len = strlen(p);
> +	}
> +
> +	if (strncmp(p, "id=", 3) == 0) {
> +	    len -= 3;
> +	    strncpy(clientname, p + 3, len);
> +	    clientname[len] = '\0';
> +	    return clientname;
> +	}
> +	if (end == NULL) {
> +	    break;
> +	}
> +	p = end + 1;
> +    }
> +    return NULL;
> +}

Please run scripts/checkpatch.pl to check coding style.  You are using
tab characters, QEMU uses 4 spaces for indentation instead of tabs.

> @@ -398,7 +433,8 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags)
>          s->snap = qemu_strdup(snap_buf);
>      }
>  
> -    r = rados_create(&s->cluster, NULL);
> +    clientname = qemu_rbd_parse_clientname(conf, clientname_buf);
> +    r = rados_create(&s->cluster, clientname);
>      if (r < 0) {
>          error_report("error initializing");
>          return r;

s->snap may be leaked here.  If .bdrv_file_open() fails .bdrv_close()
will not be called to clean things up.

Stefan

Patch

diff --git a/block/rbd.c b/block/rbd.c
index d5659cd..b0cd750 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -169,6 +169,34 @@  done:
     return ret;
 }
 
+static char *qemu_rbd_parse_clientname(const char *conf, char *clientname)
+{
+    const char *p = conf;
+
+    while (*p) {
+	int len;
+	const char *end = strchr(p, ':');
+
+	if (end) {
+	    len = end - p;
+	} else {
+	    len = strlen(p);
+	}
+
+	if (strncmp(p, "id=", 3) == 0) {
+	    len -= 3;
+	    strncpy(clientname, p + 3, len);
+	    clientname[len] = '\0';
+	    return clientname;
+	}
+	if (end == NULL) {
+	    break;
+	}
+	p = end + 1;
+    }
+    return NULL;
+}
+
 static int qemu_rbd_set_conf(rados_t cluster, const char *conf)
 {
     char *p, *buf;
@@ -198,17 +226,19 @@  static int qemu_rbd_set_conf(rados_t cluster, const char *conf)
             break;
         }
 
-        if (strcmp(name, "conf")) {
-            ret = rados_conf_set(cluster, name, value);
+        if (strcmp(name, "conf") == 0) {
+            ret = rados_conf_read_file(cluster, value);
             if (ret < 0) {
-                error_report("invalid conf option %s", name);
-                ret = -EINVAL;
+                error_report("error reading conf file %s", value);
                 break;
             }
-        } else {
-            ret = rados_conf_read_file(cluster, value);
+	} else if (strcmp(name, "id") == 0) {
+	    /* ignore, this is parsed by qemu_rbd_parse_clientname() */
+	} else {
+            ret = rados_conf_set(cluster, name, value);
             if (ret < 0) {
-                error_report("error reading conf file %s", value);
+                error_report("invalid conf option %s", name);
+                ret = -EINVAL;
                 break;
             }
         }
@@ -227,6 +257,8 @@  static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options)
     char name[RBD_MAX_IMAGE_NAME_SIZE];
     char snap_buf[RBD_MAX_SNAP_NAME_SIZE];
     char conf[RBD_MAX_CONF_SIZE];
+    char clientname_buf[RBD_MAX_CONF_SIZE];
+    char *clientname;
     rados_t cluster;
     rados_ioctx_t io_ctx;
     int ret;
@@ -259,7 +291,8 @@  static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options)
         options++;
     }
 
-    if (rados_create(&cluster, NULL) < 0) {
+    clientname = qemu_rbd_parse_clientname(conf, clientname_buf);
+    if (rados_create(&cluster, clientname) < 0) {
         error_report("error initializing");
         return -EIO;
     }
@@ -385,6 +418,8 @@  static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags)
     char pool[RBD_MAX_POOL_NAME_SIZE];
     char snap_buf[RBD_MAX_SNAP_NAME_SIZE];
     char conf[RBD_MAX_CONF_SIZE];
+    char clientname_buf[RBD_MAX_CONF_SIZE];
+    char *clientname;
     int r;
 
     if (qemu_rbd_parsename(filename, pool, sizeof(pool),
@@ -398,7 +433,8 @@  static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags)
         s->snap = qemu_strdup(snap_buf);
     }
 
-    r = rados_create(&s->cluster, NULL);
+    clientname = qemu_rbd_parse_clientname(conf, clientname_buf);
+    r = rados_create(&s->cluster, clientname);
     if (r < 0) {
         error_report("error initializing");
         return r;