From patchwork Fri Feb 15 17:14:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 10815611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B9856C2 for ; Fri, 15 Feb 2019 17:34:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B3822EEC2 for ; Fri, 15 Feb 2019 17:34:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FA702FB82; Fri, 15 Feb 2019 17:34:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6885D2FB5F for ; Fri, 15 Feb 2019 17:34:44 +0000 (UTC) Received: from localhost ([127.0.0.1]:43867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guhNr-0001Gq-AI for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Feb 2019 12:34:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guh5m-0005TT-HC for qemu-devel@nongnu.org; Fri, 15 Feb 2019 12:16:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guh5l-0006cs-L5 for qemu-devel@nongnu.org; Fri, 15 Feb 2019 12:16:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57680) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guh5j-0006YU-Cu; Fri, 15 Feb 2019 12:15:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E28BC0B2A23; Fri, 15 Feb 2019 17:15:58 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2327760C6C; Fri, 15 Feb 2019 17:15:53 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 15 Feb 2019 17:14:36 +0000 Message-Id: <20190215171436.30457-7-berrange@redhat.com> In-Reply-To: <20190215171436.30457-1-berrange@redhat.com> References: <20190215171436.30457-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 15 Feb 2019 17:15:58 +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 v4 6/6] monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove 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: Kevin Wolf , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, Markus Armbruster , Max Reitz , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The various ACL related commands are obsolete now that the QAuthZ framework for authorization is fully integrated throughout QEMU network services. Mark it as deprecated with no replacement to be provided. Authorization is now provided by using 'object_add' together with the 'tls-authz' or 'sasl-authz' parameters to the VNC server, and equivalent for other network services. Reviewed-by: Juan Quintela Signed-off-by: Daniel P. Berrangé --- monitor.c | 23 +++++++++++++++++++++++ qemu-deprecated.texi | 6 ++++++ 2 files changed, 29 insertions(+) diff --git a/monitor.c b/monitor.c index b2a5ae5374..92ea51ed06 100644 --- a/monitor.c +++ b/monitor.c @@ -2068,6 +2068,19 @@ static QAuthZList *find_auth(Monitor *mon, const char *name) return QAUTHZ_LIST(obj); } +static bool warn_acl; +static void hmp_warn_acl(void) +{ + if (warn_acl) { + return; + } + error_report("The acl_show, acl_reset, acl_policy, acl_add, acl_remove " + "commands are deprecated with no replacement. Authorization " + "for VNC should be performed using the pluggable QAuthZ " + "objects"); + warn_acl = true; +} + static void hmp_acl_show(Monitor *mon, const QDict *qdict) { const char *aclname = qdict_get_str(qdict, "aclname"); @@ -2075,6 +2088,8 @@ static void hmp_acl_show(Monitor *mon, const QDict *qdict) QAuthZListRuleList *rules; size_t i = 0; + hmp_warn_acl(); + if (!auth) { return; } @@ -2098,6 +2113,8 @@ static void hmp_acl_reset(Monitor *mon, const QDict *qdict) const char *aclname = qdict_get_str(qdict, "aclname"); QAuthZList *auth = find_auth(mon, aclname); + hmp_warn_acl(); + if (!auth) { return; } @@ -2116,6 +2133,8 @@ static void hmp_acl_policy(Monitor *mon, const QDict *qdict) int val; Error *err = NULL; + hmp_warn_acl(); + if (!auth) { return; } @@ -2160,6 +2179,8 @@ static void hmp_acl_add(Monitor *mon, const QDict *qdict) QAuthZListFormat format; size_t i = 0; + hmp_warn_acl(); + if (!auth) { return; } @@ -2205,6 +2226,8 @@ static void hmp_acl_remove(Monitor *mon, const QDict *qdict) QAuthZList *auth = find_auth(mon, aclname); ssize_t i = 0; + hmp_warn_acl(); + if (!auth) { return; } diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 6139d09793..004daf5ab6 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -99,6 +99,12 @@ The @option{[hub_id name]} parameter tuple of the 'hostfwd_add' and Use ``device_add'' for hotplugging vCPUs instead of ``cpu-add''. See documentation of ``query-hotpluggable-cpus'' for additional details. +@subsection acl_show, acl_reset, acl_policy, acl_add, acl_remove (since 4.0.0) + +The ``acl_show'', ``acl_reset'', ``acl_policy'', ``acl_add'', and +``acl_remove'' commands are deprecated with no replacement. Authorization +for VNC should be performed using the pluggable QAuthZ objects. + @section System emulator devices @subsection bluetooth (since 3.1)