From patchwork Fri Feb 19 16:47:43 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: 8362911 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 D57D99F2F0 for ; Fri, 19 Feb 2016 16:51:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EDFC20504 for ; Fri, 19 Feb 2016 16:51:59 +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 2EF13204D8 for ; Fri, 19 Feb 2016 16:51:58 +0000 (UTC) Received: from localhost ([::1]:53736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWoHd-0001pG-JQ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 11:51:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWoDz-0003oq-0L for qemu-devel@nongnu.org; Fri, 19 Feb 2016 11:48:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWoDw-0000Im-8k for qemu-devel@nongnu.org; Fri, 19 Feb 2016 11:48:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWoDw-0000Ie-1Q for qemu-devel@nongnu.org; Fri, 19 Feb 2016 11:48:08 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A1773C0005D3; Fri, 19 Feb 2016 16:48:07 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-60.ams2.redhat.com [10.36.6.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1JGlm4Z015781; Fri, 19 Feb 2016 11:48:06 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 16:47:43 +0000 Message-Id: <1455900463-16007-11-git-send-email-berrange@redhat.com> In-Reply-To: <1455900463-16007-1-git-send-email-berrange@redhat.com> References: <1455900463-16007-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v1 10/10] vnc: allow specifying a custom ACL object name 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 The VNC server has historically had support for ACLs to check both the SASL username and the TLS x509 distinguished name. The VNC server was responsible for creating the initial ACL, and the client app was then responsible for populating it with rules using the HMP 'acl_add' command. This is not satisfactory for a variety of reasons. There is no way to populate the ACLs from the command line, users are forced to use the HMP. With multiple network services all supporting TLS and ACLs now, it is desirable to be able to define a single ACL that is referenced by all services. To address these limitations, two new options are added to the VNC server CLI. The 'tls-acl' option takes the ID of a QAuthZ object to use for checking TLS x509 distinguished names, and the 'sasl-acl' option takes the ID of another object to use for checking SASL usernames. In this example, we setup two ACLs. The first allows any client with a certificate issued by the 'RedHat' organization in the 'London' locality. The second ACL allows clients with either the 'joe@REDHAT.COM' or 'fred@REDHAT.COM' kerberos usernames. Both ACLs must pass for the user to be allowed. $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=O=RedHat,,L=London,rules.0.policy=allow \ -object authz-simple,id=acl0,policy=deny,\ rules.0.match=fred@REDHAT.COM,rules.0.policy=allow \ rules.0.match=joe@REDHAT.COM,rules.0.policy=allow \ -vnc 0.0.0.0:1,tls-creds=tls0,tls-acl=tlsacl0, sasl,sasl-acl=saslacl0 \ ...other QEMU args... Signed-off-by: Daniel P. Berrange --- ui/vnc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 13 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 9971dfc..1a922cf 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3258,6 +3258,12 @@ static QemuOptsList qemu_vnc_opts = { .name = "acl", .type = QEMU_OPT_BOOL, },{ + .name = "tls-acl", + .type = QEMU_OPT_STRING, + },{ + .name = "sasl-acl", + .type = QEMU_OPT_STRING, + },{ .name = "lossy", .type = QEMU_OPT_BOOL, },{ @@ -3480,6 +3486,10 @@ void vnc_display_open(const char *id, Error **errp) int saslErr; #endif int acl = 0; + const char *tlsacl; +#ifdef CONFIG_VNC_SASL + const char *saslacl; +#endif int lock_key_sync = 1; if (!vs) { @@ -3666,6 +3676,21 @@ void vnc_display_open(const char *id, Error **errp) } } acl = qemu_opt_get_bool(opts, "acl", false); + tlsacl = qemu_opt_get(opts, "tls-acl"); + if (acl && tlsacl) { + error_setg(errp, "'acl' option is mutually exclusive with the " + "'tls-acl' options"); + goto fail; + } + +#ifdef CONFIG_VNC_SASL + saslacl = qemu_opt_get(opts, "sasl-acl"); + if (acl && saslacl) { + error_setg(errp, "'acl' option is mutually exclusive with the " + "'sasl-acl' options"); + goto fail; + } +#endif share = qemu_opt_get(opts, "share"); if (share) { @@ -3695,7 +3720,9 @@ void vnc_display_open(const char *id, Error **errp) vs->non_adaptive = true; } - if (acl) { + if (tlsacl) { + vs->tlsaclname = g_strdup(tlsacl); + } else if (acl) { if (strcmp(vs->id, "default") == 0) { vs->tlsaclname = g_strdup("vnc.x509dname"); } else { @@ -3706,19 +3733,39 @@ void vnc_display_open(const char *id, Error **errp) &error_abort); } #ifdef CONFIG_VNC_SASL - if (acl && sasl) { - char *aclname; + if (sasl) { + if (saslacl) { + Object *container, *acl; + container = object_get_objects_root(); + acl = object_resolve_path_component(container, saslacl); + if (!acl) { + error_setg(errp, "Cannot find ACL %s", saslacl); + goto fail; + } - if (strcmp(vs->id, "default") == 0) { - aclname = g_strdup("vnc.username"); - } else { - aclname = g_strdup_printf("vnc.%s.username", vs->id); - } - vs->sasl.acl = - QAUTHZ(qauthz_simple_new(aclname, - QAUTHZ_SIMPLE_POLICY_DENY, - &error_abort)); - g_free(aclname); + if (!object_dynamic_cast(acl, TYPE_QAUTHZ)) { + error_setg(errp, "Object '%s' is not a QAuthZ subclass", + saslacl); + goto fail; + } + vs->sasl.acl = QAUTHZ(acl); + } else if (acl) { + char *aclname; + + if (strcmp(vs->id, "default") == 0) { + aclname = g_strdup("vnc.username"); + } else { + aclname = g_strdup_printf("vnc.%s.username", vs->id); + } + vs->sasl.acl = + QAUTHZ(qauthz_simple_new(aclname, + QAUTHZ_SIMPLE_POLICY_DENY, + &error_abort)); + g_free(aclname); + } + } else if (saslacl) { + error_setg(errp, "SASL ACL provided when SASL is disabled"); + goto fail; } #endif