From nobody Thu Nov 6 03:22:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1539091464571890.3524078636253; Tue, 9 Oct 2018 06:24:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A5A3311C3D3; Tue, 9 Oct 2018 13:24:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF149798AC; Tue, 9 Oct 2018 13:24:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 966594CA94; Tue, 9 Oct 2018 13:24:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w99DOKw0002650 for ; Tue, 9 Oct 2018 09:24:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6A7A6A96D; Tue, 9 Oct 2018 13:24:20 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA516A964; Tue, 9 Oct 2018 13:24:11 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 9 Oct 2018 14:23:28 +0100 Message-Id: <20181009132330.7549-5-berrange@redhat.com> In-Reply-To: <20181009132330.7549-1-berrange@redhat.com> References: <20181009132330.7549-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , "Dr. David Alan Gilbert" Subject: [libvirt] [PATCH v3 4/6] chardev: add support for authorization for TLS clients X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 09 Oct 2018 13:24:23 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" 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 low bar. This adds a 'tls-authz=3DOBJECT-ID' option to the socket chardev backend which takes the ID of a previously added 'QAuthZ' object instance. This will be used to validate the client's x509 distinguished name. Clients failing the check will not be permitted to use the chardev server. For example to setup authorization that only allows connection from a client whose x509 certificate distinguished name contains 'CN=3Dfred', you would use: $QEMU -object tls-creds-x509,id=3Dtls0,dir=3D/home/berrange/qemutls,\ endpoint=3Dserver,verify-peer=3Dyes \ -object authz-simple,id=3Dauthz0,identity=3DCN=3Dlaptop.example.com= ,,\ O=3DExample Org,,L=3DLondon,,ST=3DLondon,,C=3DGB \ -chardev socket,host=3D127.0.0.1,port=3D9000,server,\ tls-creds=3Dtls0,tls-authz=3Dauthz0 \ ...other qemu args... Signed-off-by: Daniel P. Berrange Reviewed-by: Juan Quintela --- chardev/char-socket.c | 11 ++++++++++- chardev/char.c | 3 +++ qapi/char.json | 6 ++++++ qemu-options.hx | 9 +++++++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index a75b46d9fe..ab121e1e30 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -52,6 +52,7 @@ typedef struct { QIONetListener *listener; GSource *hup_source; QCryptoTLSCreds *tls_creds; + char *tls_authz; int connected; int max_size; int do_telnetopt; @@ -737,7 +738,7 @@ static void tcp_chr_tls_init(Chardev *chr) if (s->is_listen) { tioc =3D qio_channel_tls_new_server( s->ioc, s->tls_creds, - NULL, /* XXX Use an ACL */ + s->tls_authz, &err); } else { tioc =3D qio_channel_tls_new_client( @@ -889,6 +890,7 @@ static void char_socket_finalize(Object *obj) if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); } + g_free(s->tls_authz); =20 qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } @@ -994,6 +996,7 @@ static void qmp_chardev_open_socket(Chardev *chr, } } } + s->tls_authz =3D g_strdup(sock->tls_authz); =20 s->addr =3D addr =3D socket_address_flatten(sock->addr); =20 @@ -1075,6 +1078,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, const char *fd =3D qemu_opt_get(opts, "fd"); const char *tls_creds =3D qemu_opt_get(opts, "tls-creds"); SocketAddressLegacy *addr; + const char *tls_authz =3D qemu_opt_get(opts, "tls-authz"); ChardevSocket *sock; =20 if ((!!path + !!fd + !!host) !=3D 1) { @@ -1103,6 +1107,10 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Ch= ardevBackend *backend, } else { g_assert_not_reached(); } + if (tls_authz && !tls_creds) { + error_setg(errp, "Authorization can only be used when TLS is enabl= ed"); + return; + } =20 sock =3D backend->u.socket.data =3D g_new0(ChardevSocket, 1); qemu_chr_parse_common(opts, qapi_ChardevSocket_base(sock)); @@ -1120,6 +1128,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, sock->has_reconnect =3D true; sock->reconnect =3D reconnect; sock->tls_creds =3D g_strdup(tls_creds); + sock->tls_authz =3D g_strdup(tls_authz); =20 addr =3D g_new0(SocketAddressLegacy, 1); if (path) { diff --git a/chardev/char.c b/chardev/char.c index e115166995..987474a950 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -860,6 +860,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "tls-creds", .type =3D QEMU_OPT_STRING, + },{ + .name =3D "tls-authz", + .type =3D QEMU_OPT_STRING, },{ .name =3D "width", .type =3D QEMU_OPT_NUMBER, diff --git a/qapi/char.json b/qapi/char.json index b7b2a05766..244213c075 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -243,6 +243,11 @@ # @addr: socket address to listen on (server=3Dtrue) # or connect to (server=3Dfalse) # @tls-creds: the ID of the TLS credentials object (since 2.6) +# @tls-authz: the ID of the QAuthZ authorization object against which +# the client's x509 distinguished name will validated. This +# object is only resolved at time of use, so can be deleted +# and recreated on the fly while the chardev server is active. +# If missing, it will default to denying access (since 3.1) # @server: create server socket (default: true) # @wait: wait for incoming connection on server # sockets (default: false). @@ -260,6 +265,7 @@ ## { 'struct': 'ChardevSocket', 'data': { 'addr' : 'SocketAddressLegacy= ', '*tls-creds' : 'str', + '*tls-authz' : 'str', '*server' : 'bool', '*wait' : 'bool', '*nodelay' : 'bool', diff --git a/qemu-options.hx b/qemu-options.hx index cc61512db7..5079074088 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2410,7 +2410,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev null,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend=3Don= |off]\n" "-chardev socket,id=3Did[,host=3Dhost],port=3Dport[,to=3Dto][,ipv4][,i= pv6][,nodelay][,reconnect=3Dseconds]\n" " [,server][,nowait][,telnet][,reconnect=3Dseconds][,mux=3Don|= off]\n" - " [,logfile=3DPATH][,logappend=3Don|off][,tls-creds=3DID] (tcp= )\n" + " [,logfile=3DPATH][,logappend=3Don|off][,tls-creds=3DID][,tls= -authz=3DID], (tcp)\n" "-chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet][,recon= nect=3Dseconds]\n" " [,mux=3Don|off][,logfile=3DPATH][,logappend=3Don|off] (unix)= \n" "-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr= ]\n" @@ -2539,7 +2539,7 @@ The available backends are: A void device. This device will not emit any data, and will drop any data = it receives. The null backend does not take any options. =20 -@item -chardev socket,id=3D@var{id}[,@var{TCP options} or @var{unix option= s}][,server][,nowait][,telnet][,reconnect=3D@var{seconds}][,tls-creds=3D@va= r{id}] +@item -chardev socket,id=3D@var{id}[,@var{TCP options} or @var{unix option= s}][,server][,nowait][,telnet][,reconnect=3D@var{seconds}][,tls-creds=3D@va= r{id}][,tls-authz=3D@var{id}] =20 Create a two-way stream socket, which can be either a TCP or a unix socket= . A unix socket will be created if @option{path} is specified. Behaviour is @@ -2562,6 +2562,11 @@ and specifies the id of the TLS credentials to use f= or the handshake. The credentials must be previously created with the @option{-object tls-creds} argument. =20 +@option{tls-auth} provides the ID of the QAuthZ authorization object again= st +which the client's x509 distinguished name will validated. This object is = only +resolved at time of use, so can be deleted and recreated on the fly while = the +chardev server is active. If missing, it will default to denying access. + TCP and unix socket options are given below: =20 @table @option --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list