From patchwork Thu Mar 10 18:59:55 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: 8559481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 23CDD9F38C for ; Thu, 10 Mar 2016 19:04:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BCDE2034E for ; Thu, 10 Mar 2016 19:04:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 973212034B for ; Thu, 10 Mar 2016 19:04:54 +0000 (UTC) Received: from localhost ([::1]:50722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae5tG-0002yY-0k for patchwork-qemu-devel@patchwork.kernel.org; Thu, 10 Mar 2016 14:04:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae5oz-0004GF-Od for qemu-devel@nongnu.org; Thu, 10 Mar 2016 14:00:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae5ov-0003V8-0x for qemu-devel@nongnu.org; Thu, 10 Mar 2016 14:00:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae5op-0003SJ-N9; Thu, 10 Mar 2016 14:00:19 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 43E9696A2; Thu, 10 Mar 2016 19:00:19 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-4-172.ams2.redhat.com [10.36.4.172]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2AJ01Mx002433; Thu, 10 Mar 2016 14:00:17 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 10 Mar 2016 18:59:55 +0000 Message-Id: <1457636396-24983-9-git-send-email-berrange@redhat.com> In-Reply-To: <1457636396-24983-1-git-send-email-berrange@redhat.com> References: <1457635927-23045-1-git-send-email-berrange@redhat.com> <1457636396-24983-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v3 09/10] chardev: add support for ACLs for TLS clients X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently any client which can complete the TLS handshake is able to use a chardev server. The server admin can turn on the 'verify-peer' option for the x509 creds to require the client to provide a x509 certificate. This means the client will have to acquire a certificate from the CA before they are permitted to use the chardev server. This is still a fairly weak bar. This adds a 'tls-acl=ACL-ID' option to the socket chardev backend which takes the ID of a previously added 'QAuthZ' object instance. This ACL will be used to validate the client's x509 distinguished name. Clients failing the ACL will not be permitted to use the chardev server. For example to setup an ACL that only allows connection from a client whose x509 certificate distinguished name contains 'CN=fred', you would use: $QEMU -object tls-creds-x509,id=tls0,dir=/home/berrange/qemutls,\ endpoint=server,verify-peer=yes \ -object authz-simple,id=acl0,policy=deny,\ rules.0.match=*CN=fred,rules.0.policy=allow \ -chardev socket,host=127.0.0.1,port=9000,server,\ tls-creds=tls0,tls-acl=acl0 \ ...other qemud args... Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- qapi-schema.json | 2 ++ qemu-char.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index b6769de..a6a7205 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3202,6 +3202,7 @@ # @addr: socket address to listen on (server=true) # or connect to (server=false) # @tls-creds: #optional the ID of the TLS credentials object (since 2.6) +# @tls-acl: #optional the ID of the QAuthZ authorization object (since 2.6) # @server: #optional create server socket (default: true) # @wait: #optional wait for incoming connection on server # sockets (default: false). @@ -3217,6 +3218,7 @@ ## { 'struct': 'ChardevSocket', 'data': { 'addr' : 'SocketAddress', '*tls-creds' : 'str', + '*tls-acl' : 'str', '*server' : 'bool', '*wait' : 'bool', '*nodelay' : 'bool', diff --git a/qemu-char.c b/qemu-char.c index e0147f3..9533e7e 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2533,6 +2533,7 @@ typedef struct { QIOChannelSocket *listen_ioc; guint listen_tag; QCryptoTLSCreds *tls_creds; + char *tls_acl; int connected; int max_size; int do_telnetopt; @@ -2963,7 +2964,7 @@ static void tcp_chr_tls_init(CharDriverState *chr) if (s->is_listen) { tioc = qio_channel_tls_new_server( s->ioc, s->tls_creds, - NULL, /* XXX Use an ACL */ + s->tls_acl, &err); } else { tioc = qio_channel_tls_new_client( @@ -3084,6 +3085,7 @@ static void tcp_chr_close(CharDriverState *chr) if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); } + g_free(s->tls_acl); if (s->write_msgfds_num) { g_free(s->write_msgfds); } @@ -3623,6 +3625,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *tls_creds = qemu_opt_get(opts, "tls-creds"); + const char *tls_acl = qemu_opt_get(opts, "tls-acl"); SocketAddress *addr; ChardevSocket *sock; @@ -3656,6 +3659,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_reconnect = true; sock->reconnect = reconnect; sock->tls_creds = g_strdup(tls_creds); + sock->tls_acl = g_strdup(tls_acl); addr = g_new0(SocketAddress, 1); if (path) { @@ -4094,6 +4098,9 @@ QemuOptsList qemu_chardev_opts = { .name = "tls-creds", .type = QEMU_OPT_STRING, },{ + .name = "tls-acl", + .type = QEMU_OPT_STRING, + },{ .name = "width", .type = QEMU_OPT_NUMBER, },{ @@ -4341,6 +4348,7 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, } } } + s->tls_acl = g_strdup(sock->tls_acl); qapi_copy_SocketAddress(&s->addr, sock->addr); @@ -4386,6 +4394,7 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); } + g_free(s->tls_acl); g_free(s); qemu_chr_free_common(chr); return NULL;