[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 6/6] monitor: deprecate acl_show, acl_reset, acl_
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PATCH v4 6/6] monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove |
Date: |
Fri, 15 Feb 2019 17:14:36 +0000 |
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 <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
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.
address@hidden 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)
--
2.20.1
- [Qemu-devel] [PATCH v4 0/6] Add authorization support to all network services, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 1/6] qemu-nbd: add support for authorization of TLS clients, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 2/6] nbd: allow authorization with nbd-server-start QMP command, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 3/6] migration: add support for a "tls-authz" migration parameter, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 5/6] vnc: allow specifying a custom authorization object name, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 4/6] chardev: add support for authorization for TLS clients, Daniel P . Berrangé, 2019/02/15
- [Qemu-devel] [PATCH v4 6/6] monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove,
Daniel P . Berrangé <=