ui: support for authorization control on TLS connections
cover ui: support for authorization control on TLS connections
This series provides the VNC parts of the authorization control series previously posted as:
v1: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg04482.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg05727.html
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01639.html
v4: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04319.html
The core authz framework is now merged & these patches have all had positive review. Thus these VNC parts are ready to go into the VNC maintainer's tree, should the maintainer consider them acceptable.
Note the 2nd patch is modifying the HMP, but I considered it part of ui/vnc, since that's the only bit of QEMU which ever used these HMP commands, and it has a dependancy on the first patch merging first.
Daniel P. Berrangé (2):
vnc: allow specifying a custom authorization object name
monitor: deprecate acl_show, acl_reset, acl_policy, acl_add,
acl_remove
monitor.c | 23 ++++++++++++++++++ qemu-deprecated.texi | 11 +++++++++ qemu-options.hx | 35 ++++++++++++++++++-------- ui/vnc.c | 58 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 108 insertions(+), 19 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 vnc: allow specifying a custom authorization object name
From: "Daniel P. Berrange" <[email protected]>
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-authz' option takes the ID of a QAuthZ object to use for checking TLS x509 distinguished names, and the 'sasl-authz' option takes the ID of another object to use for checking SASL usernames.
In this example, we setup two authorization rules. 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 '[email protected]' or '[email protected]' kerberos usernames. Both checks 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=authz0,policy=deny,\
rules.0.match=O=RedHat,,L=London,rules.0.policy=allow \
-object authz-simple,id=authz1,policy=deny,\
[email protected],rules.0.policy=allow \
[email protected],rules.0.policy=allow \
-vnc 0.0.0.0:1,tls-creds=tls0,tls-authz=authz0,
sasl,sasl-authz=authz1 \
...other QEMU args...--- qemu-deprecated.texi | 5 ++++ qemu-options.hx | 35 ++++++++++++++++++-------- ui/vnc.c | 58 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 79 insertions(+), 19 deletions(-)
qemu-deprecated.texi +5 -0
@@ -60,6 +60,11 @@ Support for invalid topologies will be removed, the user must ensure topologies described with -smp include all possible cpus, i.e. @math{@var{sockets} * @var{cores} * @var{threads} = @var{maxcpus}}. +@subsection -vnc acl (since 4.0.0) + +The @code{acl} option to the @code{-vnc} argument has been replaced +by the @code{tls-authz} and @code{sasl-authz} options. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
qemu-options.hx +25 -10
@@ -1624,6 +1624,14 @@ will cause the VNC server socket to enable the VeNCrypt auth mechanism. The credentials should have been previously created using the @option{-object tls-creds} argument. +@item tls-authz=@var{ID} + +Provides 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 VNC server is active. If missing, it will default +to denying access. + @item sasl Require that the client use SASL to authenticate with the VNC server.
@@ -1639,18 +1647,25 @@ ensures a data encryption preventing compromise of authentication credentials. See the @ref{vnc_security} section for details on using SASL authentication. +@item sasl-authz=@var{ID} + +Provides the ID of the QAuthZ authorization object against which +the client's SASL username will validated. This object is +only resolved at time of use, so can be deleted and recreated on the +fly while the VNC server is active. If missing, it will default +to denying access. + @item acl -Turn on access control lists for checking of the x509 client certificate -and SASL party. For x509 certs, the ACL check is made against the -certificate's distinguished name. This is something that looks like -@code{C=GB,O=ACME,L=Boston,CN=bob}. For SASL party, the ACL check is -made against the username, which depending on the SASL plugin, may -include a realm component, eg @code{bob} or @code{bob@@EXAMPLE.COM}. -When the @option{acl} flag is set, the initial access list will be -empty, with a @code{deny} policy. Thus no one will be allowed to -use the VNC server until the ACLs have been loaded. This can be -achieved using the @code{acl} monitor command. +Legacy method for enabling authorization of clients against the +x509 distinguished name and SASL username. It results in the creation +of two @code{authz-list} objects with IDs of @code{vnc.username} and +@code{vnc.x509dname}. The rules for these objects must be configured +with the HMP ACL commands. + +This option is deprecated and should no longer be used. The new +@option{sasl-authz} and @option{tls-authz} options are a +replacement. @item lossy
ui/vnc.c +49 -9
90 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/2 monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove
In reply to Daniel P. BerrangéThe various ACL related commands are obsolete now that the QAuthZ framework for authorization is fully integrated throughout QEMU network services. These only ever worked with VNC and were never used by libvirt. Mark it as deprecated with no direct 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.
--- monitor.c | 23 +++++++++++++++++++++++ qemu-deprecated.texi | 6 ++++++ 2 files changed, 29 insertions(+)
monitor.c +23 -0
@@ -2032,6 +2032,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" );
@@ -2039,6 +2052,8 @@ static void hmp_acl_show(Monitor *mon, const QDict *qdict)QAuthZListRuleList *rules;size_t i =0 ; +hmp_warn_acl (); +if (!auth) {return ; }
@@ -2062,6 +2077,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 ; }
@@ -2080,6 +2097,8 @@ static void hmp_acl_policy(Monitor *mon, const QDict *qdict)int val;Error *err =NULL ; +hmp_warn_acl (); +if (!auth) {return ; }
@@ -2124,6 +2143,8 @@ static void hmp_acl_add(Monitor *mon, const QDict *qdict)QAuthZListFormat format;size_t i =0 ; +hmp_warn_acl (); +if (!auth) {return ; }
@@ -2169,6 +2190,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 ; }
qemu-deprecated.texi +6 -0
@@ -104,6 +104,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)
Signature · 1 line
2.20.1
ping - soft freeze is less than a week away & i'd like this to get into a ui queue pull request in time for 4.0 if there's no review objections
Quoted 22 lines · Daniel P. Berrangé
This series provides the VNC parts of the authorization control series previously posted as:
v1: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg04482.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg05727.html
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01639.html
v4: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04319.htmlThe core authz framework is now merged & these patches have all had positive review. Thus these VNC parts are ready to go into the VNC maintainer's tree, should the maintainer consider them acceptable.
Note the 2nd patch is modifying the HMP, but I considered it part of ui/vnc, since that's the only bit of QEMU which ever used these HMP commands, and it has a dependancy on the first patch merging first.
Daniel P. Berrangé (2):
vnc: allow specifying a custom authorization object name
monitor: deprecateacl_show,acl_reset,acl_policy,acl_add,
acl_remove
Quoted 9 lines
monitor.c | 23 ++++++++++++++++++ qemu-deprecated.texi | 11 +++++++++ qemu-options.hx | 35 ++++++++++++++++++-------- ui/vnc.c | 58 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 108 insertions(+), 19 deletions(-)Signature · 1 line
2.20.1
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 2 lines · Daniel P. Berrangé
ping - soft freeze is less than a week away & i'd like this to get into a ui queue pull request in time for 4.0 if there's no review objections
I'm aware, I'm busy preparing the pre-freeze pulls. USB is on the list already, busy with UI right now. VGA comes next.
Series queued.
cheers,
Gerd
Quoted 8 lines · Gerd Hoffmann
Quoted 2 lines · Daniel P. Berrangé
ping - soft freeze is less than a week away & i'd like this to get into a ui queue pull request in time for 4.0 if there's no review objections
I'm aware, I'm busy preparing the pre-freeze pulls. USB is on the list already, busy with UI right now. VGA comes next.
Series queued.
Thanks for the quick reply !
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|