From patchwork Thu Jun 2 16:46:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 629386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rLDVX6fX7z9t5W for ; Fri, 3 Jun 2016 03:19:32 +1000 (AEST) Received: from localhost ([::1]:49398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8WHK-0006tM-Vo for incoming@patchwork.ozlabs.org; Thu, 02 Jun 2016 13:19:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Vlx-0004re-Cn for qemu-devel@nongnu.org; Thu, 02 Jun 2016 12:47:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8Vlv-0003aD-C0 for qemu-devel@nongnu.org; Thu, 02 Jun 2016 12:47:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Vlj-0003Ry-UW; Thu, 02 Jun 2016 12:46:52 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A38B7109A; Thu, 2 Jun 2016 16:46:51 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-7-181.ams2.redhat.com [10.36.7.181]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u52GkVdQ023498; Thu, 2 Jun 2016 12:46:48 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 2 Jun 2016 17:46:24 +0100 Message-Id: <1464885987-4039-9-git-send-email-berrange@redhat.com> In-Reply-To: <1464885987-4039-1-git-send-email-berrange@redhat.com> References: <1464885987-4039-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 02 Jun 2016 16:46:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 08/11] nbd: allow an ACL to be set with nbd-server-start QMP command 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: qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As with the previous patch to qemu-nbd, the nbd-server-start QMP command also needs to be able to specify an ACL when enabling TLS encryption. First the client must create a QAuthZ object instance using the 'object-add' command: { 'execute': 'object-add', 'arguments': { 'qom-type': 'authz-simple', 'id': 'tls0', 'parameters': { 'policy': 'deny', 'rules': [ { 'match': '*CN=fred', 'policy': 'allow' } ] } } } They can then reference this in the new 'tls-acl' parameter when executing the 'nbd-server-start' command. { 'execute': 'nbd-server-start', 'arguments': { 'addr': { 'type': 'inet', 'host': '127.0.0.1', 'port': '9000' }, 'tls-creds': 'tls0', 'tls-acl': 'tlsacl0' } } Signed-off-by: Daniel P. Berrange --- blockdev-nbd.c | 10 +++++++++- hmp.c | 2 +- qapi/block.json | 4 +++- qmp-commands.hx | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 12cae0e..ae5335e 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -24,6 +24,7 @@ typedef struct NBDServerData { QIOChannelSocket *listen_ioc; int watch; QCryptoTLSCreds *tlscreds; + char *tlsacl; } NBDServerData; static NBDServerData *nbd_server; @@ -45,7 +46,8 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition, } nbd_client_new(NULL, cioc, - nbd_server->tlscreds, NULL, + nbd_server->tlscreds, + nbd_server->tlsacl, nbd_client_put); object_unref(OBJECT(cioc)); return TRUE; @@ -65,6 +67,7 @@ static void nbd_server_free(NBDServerData *server) if (server->tlscreds) { object_unref(OBJECT(server->tlscreds)); } + g_free(server->tlsacl); g_free(server); } @@ -101,6 +104,7 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) void qmp_nbd_server_start(SocketAddress *addr, bool has_tls_creds, const char *tls_creds, + bool has_tls_acl, const char *tls_acl, Error **errp) { if (nbd_server) { @@ -128,6 +132,10 @@ void qmp_nbd_server_start(SocketAddress *addr, } } + if (has_tls_acl) { + nbd_server->tlsacl = g_strdup(tls_acl); + } + nbd_server->watch = qio_channel_add_watch( QIO_CHANNEL(nbd_server->listen_ioc), G_IO_IN, diff --git a/hmp.c b/hmp.c index 1972bef..e0d0d8c 100644 --- a/hmp.c +++ b/hmp.c @@ -1846,7 +1846,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) goto exit; } - qmp_nbd_server_start(addr, false, NULL, &local_err); + qmp_nbd_server_start(addr, false, NULL, false, NULL, &local_err); qapi_free_SocketAddress(addr); if (local_err != NULL) { goto exit; diff --git a/qapi/block.json b/qapi/block.json index 937337d..a674865 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -147,6 +147,7 @@ # # @addr: Address on which to listen. # @tls-creds: (optional) ID of the TLS credentials object. Since 2.6 +# @tls-acl: (optional) ID of the QAuthZ authorization object. Since 2.6 # # Returns: error if the server is already running. # @@ -154,7 +155,8 @@ ## { 'command': 'nbd-server-start', 'data': { 'addr': 'SocketAddress', - '*tls-creds': 'str'} } + '*tls-creds': 'str', + '*tls-acl': 'str'} } ## # @nbd-server-add: diff --git a/qmp-commands.hx b/qmp-commands.hx index 28801a2..ad10b1e 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3859,7 +3859,7 @@ EQMP { .name = "nbd-server-start", - .args_type = "addr:q,tls-creds:s?", + .args_type = "addr:q,tls-creds:s?,tls-acl:s?", .mhandler.cmd_new = qmp_marshal_nbd_server_start, }, {