From nobody Mon Feb 9 16:34:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552325770994914.4879076912955; Mon, 11 Mar 2019 10:36:10 -0700 (PDT) Received: from localhost ([127.0.0.1]:37410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3OqK-0006Hb-O4 for importer@patchew.org; Mon, 11 Mar 2019 13:36:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ODo-0007LA-Ho for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ODm-0003ht-Kd for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ODk-0003df-Oa for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:14 -0400 Received: by mail-wm1-x342.google.com with SMTP id f65so5323328wma.2 for ; Mon, 11 Mar 2019 09:56:12 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id e12sm6484836wrs.91.2019.03.11.09.56.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 09:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bCGrPA9zYOvkiY2i+yO0fS2Xzy5kNaot6A4WzcjEy4Q=; b=W61cbmkIMoQMMKyXk9flvGFVqxqWPLGidfPFSrKnrjY+Px6TdH2nr9fBrBjKUNcUTK +o8XXIpY2IPGO0uhYzhANFelhnb2RhHLy1E6l+AZPhOvCBh4sbHrF17Pw3xLecLrtYgL +WkghjChUsyDMJdHA1q3UISIBnMp86JMzd7AU51xAeiAQdqBUyFD4jIfErCJS61L3fNh VQv4S4Pbg9t6eXyy+Ec0KzAv81sUS7ziLlkzBFTWlyzIdQ4252uLex6oSN12BFqD4ITM 3ipJ+pntIUV6lRGKFNQmgIz+p98jgM63gJmNWCXFCXFPLusIZ7nWPiyz/chIvZyssQXX dCxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bCGrPA9zYOvkiY2i+yO0fS2Xzy5kNaot6A4WzcjEy4Q=; b=Ab+fuFlKvyAKhn82pOwG04fiDihDcYWk2uNF+NNheGqJzJ2d8bUtFJaRSc2vcklOk3 QCX3JaS9ebyyZDqx38eTuVz58iPQ7fo+SxosBEvd614690KCmDGAsj+cQd7uT94hrqfc twlFxXkNI7/dDamH8X3YeDd6ri0XJwtGa21IyxNE7x5PEFY0Fs1wE4VACfVjoItzghAv oJVkNL4+1y+Y++ZLdzbDnSeuebqOTpyake1HrTpzo18rnAwUYp75WdOJa9LEq3rt3VMH frE+fGH/Msv0Rf1gMJtl1N8CthLqh5pprzj/eSEiT12tvj8fkdP6J5QQ1DSt+EB6prd4 k0LA== X-Gm-Message-State: APjAAAX76NbMi0JyIPZUy6xEtmHqC1t8hWgrzJ7PEmR5Q3Km8El7/ulD mZfcH1m6zzkfyPBfOzpmlaPG61qA X-Google-Smtp-Source: APXvYqwSJG+AxffryOMaQNec8lLiDh0W9G1q/wmyZ2fgMBgsKOT9hlge53CdtLhJF3iZrGi2iZ65hw== X-Received: by 2002:a1c:228b:: with SMTP id i133mr433781wmi.105.1552323370919; Mon, 11 Mar 2019 09:56:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 17:55:34 +0100 Message-Id: <1552323335-46779-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> References: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL v2 30/31] chardev: add support for authorization for TLS clients 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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: Marc-Andr=C3=A9 Lureau --- chardev/char-socket.c | 12 +++++++++++- chardev/char.c | 3 +++ qapi/char.json | 6 ++++++ qemu-options.hx | 10 ++++++++-- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 6d287ba..3916505 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -59,6 +59,7 @@ typedef struct { QIONetListener *listener; GSource *hup_source; QCryptoTLSCreds *tls_creds; + char *tls_authz; TCPChardevState state; int max_size; int do_telnetopt; @@ -807,7 +808,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( @@ -1055,6 +1056,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); } @@ -1242,6 +1244,11 @@ static bool qmp_chardev_validate_socket(ChardevSocke= t *sock, break; } =20 + if (sock->has_tls_authz && !sock->has_tls_creds) { + error_setg(errp, "'tls_authz' option requires 'tls_creds' option"); + return false; + } + /* Validate any options which have a dependancy on client vs server */ if (!sock->has_server || sock->server) { if (sock->has_reconnect) { @@ -1320,6 +1327,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 @@ -1399,6 +1407,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, sock->reconnect =3D qemu_opt_get_number(opts, "reconnect", 0); sock->has_tls_creds =3D qemu_opt_get(opts, "tls-creds"); sock->tls_creds =3D g_strdup(qemu_opt_get(opts, "tls-creds")); + sock->has_tls_authz =3D qemu_opt_get(opts, "tls-authz"); + sock->tls_authz =3D g_strdup(qemu_opt_get(opts, "tls-authz")); =20 addr =3D g_new0(SocketAddressLegacy, 1); if (path) { diff --git a/chardev/char.c b/chardev/char.c index f6d61fa..514cd6b 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -881,6 +881,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 "websocket", .type =3D QEMU_OPT_BOOL, },{ diff --git a/qapi/char.json b/qapi/char.json index 77ed847..a6e81ac 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -248,6 +248,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 be 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 4.0) # @server: create server socket (default: true) # @wait: wait for incoming connection on server # sockets (default: false). @@ -268,6 +273,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 c74f99b..7118d90 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2428,7 +2428,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][,websocket][,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][,webso= cket][,reconnect=3Dseconds]\n" " [,mux=3Don|off][,logfile=3DPATH][,logappend=3Don|off] (unix)= \n" "-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr= ]\n" @@ -2557,7 +2557,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][,websocket][,reconnect=3D@var{seconds}][,tls= -creds=3D@var{id}] +@item -chardev socket,id=3D@var{id}[,@var{TCP options} or @var{unix option= s}][,server][,nowait][,telnet][,websocket][,reconnect=3D@var{seconds}][,tls= -creds=3D@var{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 @@ -2583,6 +2583,12 @@ 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 be 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 1.8.3.1