From nobody Mon Feb 9 07:05:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149062158640190.62410067365829; Mon, 27 Mar 2017 06:33:06 -0700 (PDT) Received: from localhost ([::1]:46833 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csUld-0007AX-1o for importer@patchew.org; Mon, 27 Mar 2017 09:33:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csUfW-00026u-PD for qemu-devel@nongnu.org; Mon, 27 Mar 2017 09:26:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csUfQ-0006Pf-Ls for qemu-devel@nongnu.org; Mon, 27 Mar 2017 09:26:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csUfQ-0006OU-9X for qemu-devel@nongnu.org; Mon, 27 Mar 2017 09:26:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C942D7127 for ; Mon, 27 Mar 2017 13:26:39 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 890AB80696; Mon, 27 Mar 2017 13:26:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 883F61138606; Mon, 27 Mar 2017 15:26:35 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1C942D7127 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1C942D7127 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 27 Mar 2017 15:26:32 +0200 Message-Id: <1490621195-2228-9-git-send-email-armbru@redhat.com> In-Reply-To: <1490621195-2228-1-git-send-email-armbru@redhat.com> References: <1490621195-2228-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 27 Mar 2017 13:26:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH RFC v3 for-2.9 08/11] rbd: Revert -blockdev and -drive parameter auth-supported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jdurgin@redhat.com, jcody@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts half of commit 0a55679. We're having second thoughts on the QAPI schema (and thus the external interface), and haven't reached consensus, yet. Issues include: * The implementation uses deprecated rados_conf_set() key "auth_supported". No biggie. * The implementation makes -drive silently ignore invalid parameters "auth" and "auth-supported.*.X" where X isn't "auth". Fixable (in fact I'm going to fix similar bugs around parameter server), so again no biggie. * BlockdevOptionsRbd member @password-secret applies only to authentication method cephx. Should it be a variant member of RbdAuthMethod? * BlockdevOptionsRbd member @user could apply to both methods cephx and none, but I'm not sure it's actually used with none. If it isn't, should it be a variant member of RbdAuthMethod? * The client offers a *set* of authentication methods, not a list. Should the methods be optional members of BlockdevOptionsRbd instead of members of list @auth-supported? The latter begs the question what multiple entries for the same method mean. Trivial question now that RbdAuthMethod contains nothing but @type, but less so when RbdAuthMethod acquires other members, such the ones discussed above. * How BlockdevOptionsRbd member @auth-supported interacts with settings from a configuration file specified with @conf is undocumented. I suspect it's untested, too. Let's avoid painting ourselves into a corner now, and revert the feature for 2.9. Note that users can still configure authentication methods with a configuration file. They probably do that anyway if they use Ceph outside QEMU as well. qemu_rbd_array_opts()'s parameter @type now must be RBD_MON_HOST, which is silly. This will be cleaned up shortly. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Jeff Cody Reviewed-by: Max Reitz --- block/rbd.c | 31 +++---------------------------- qapi/block-core.json | 24 ------------------------ 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index cf0bab0..103ce44 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -320,8 +320,7 @@ static QemuOptsList runtime_opts =3D { .help =3D "Rados id name", }, /* - * server.* and auth-supported.* extracted manually, see - * qemu_rbd_array_opts() + * server.* extracted manually, see qemu_rbd_array_opts() */ { .name =3D "password-secret", @@ -356,11 +355,6 @@ static QemuOptsList runtime_opts =3D { .name =3D "port", .type =3D QEMU_OPT_STRING, }, - { - .name =3D "auth", - .type =3D QEMU_OPT_STRING, - .help =3D "Supported authentication method, either cephx or no= ne", - }, { /* end of list */ } }, }; @@ -512,7 +506,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) } =20 #define RBD_MON_HOST 0 -#define RBD_AUTH_SUPPORTED 1 =20 static char *qemu_rbd_array_opts(QDict *options, const char *prefix, int t= ype, Error **errp) @@ -527,7 +520,7 @@ static char *qemu_rbd_array_opts(QDict *options, const = char *prefix, int type, Error *local_err =3D NULL; int i; =20 - assert(type =3D=3D RBD_MON_HOST || type =3D=3D RBD_AUTH_SUPPORTED); + assert(type =3D=3D RBD_MON_HOST); =20 num_entries =3D qdict_array_entries(options, prefix); =20 @@ -573,10 +566,9 @@ static char *qemu_rbd_array_opts(QDict *options, const= char *prefix, int type, value =3D strbuf; } } else { - value =3D qemu_opt_get(opts, "auth"); + abort(); } =20 - /* each iteration in the for loop will build upon the string, and = if * rados_str is NULL then it is our first pass */ if (rados_str) { @@ -608,7 +600,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, QemuOpts *opts; Error *local_err =3D NULL; char *mon_host =3D NULL; - char *auth_supported =3D NULL; int r; =20 opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); @@ -619,14 +610,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *= options, int flags, return -EINVAL; } =20 - auth_supported =3D qemu_rbd_array_opts(options, "auth-supported.", - RBD_AUTH_SUPPORTED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - r =3D -EINVAL; - goto failed_opts; - } - mon_host =3D qemu_rbd_array_opts(options, "server.", RBD_MON_HOST, &local_err); if (local_err) { @@ -678,13 +661,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *= options, int flags, } } =20 - if (auth_supported) { - r =3D rados_conf_set(s->cluster, "auth_supported", auth_supported); - if (r < 0) { - goto failed_shutdown; - } - } - if (qemu_rbd_set_auth(s->cluster, secretid, errp) < 0) { r =3D -EIO; goto failed_shutdown; @@ -735,7 +711,6 @@ failed_shutdown: failed_opts: qemu_opts_del(opts); g_free(mon_host); - g_free(auth_supported); return r; } =20 diff --git a/qapi/block-core.json b/qapi/block-core.json index 5d2efe4..6a7ca0b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2601,27 +2601,6 @@ =20 =20 ## -# @RbdAuthSupport: -# -# An enumeration of RBD auth support -# -# Since: 2.9 -## -{ 'enum': 'RbdAuthSupport', - 'data': [ 'cephx', 'none' ] } - - -## -# @RbdAuthMethod: -# -# An enumeration of rados auth_supported types -# -# Since: 2.9 -## -{ 'struct': 'RbdAuthMethod', - 'data': { 'auth': 'RbdAuthSupport' } } - -## # @BlockdevOptionsRbd: # # @pool: Ceph pool name. @@ -2639,8 +2618,6 @@ # @server: Monitor host address and port. This maps # to the "mon_host" Ceph option. # -# @auth-supported: Authentication supported. -# # @password-secret: The ID of a QCryptoSecret object providing # the password for the login. # @@ -2653,7 +2630,6 @@ '*snapshot': 'str', '*user': 'str', '*server': ['InetSocketAddressBase'], - '*auth-supported': ['RbdAuthMethod'], '*password-secret': 'str' } } =20 ## --=20 2.7.4