Add authorization support to all network services
v4 cover Add authorization support to all network services
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
This series builds on the core authorization framework:
v8: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04253.html
enabling its use with the VNC, chardev, NBD and migration network servers.
In combination with TLS x509 client certificates, this allows these services to whitelist specific clients, which avoids the need to setup restricted child certificate authorities.
In VNC it also allows whitelisting based on SASL user names.
Changed in v4:
- Update deprecation versions to 4.0
- Rebased to latest git
Changed in v3:
- Rebased to latest git master
Changed in v2:
- Document that authz objects are resolved at time of use, not time of network service activation
- Improve docs for tls-authz parameters on services
- Fix 2.13 -> 3.0 version tags
- Remove redundant conditionals around g_strdup
- Fix arg syntax for qemu-nbd s/-/--/
- Remove QAPI (optional) annotation
- Fix some outdated usage example
Based-on: <[email protected]>
Daniel P. Berrangé (6):
qemu-nbd: add support for authorization of TLS clients
nbd: allow authorization with nbd-server-start QMP command
migration: add support for a "tls-authz" migration parameter
chardev: add support for authorization for TLS clients
vnc: allow specifying a custom authorization object name
monitor: deprecate acl_show, acl_reset, acl_policy, acl_add,
acl_remove
blockdev-nbd.c | 11 ++++++-- chardev/char-socket.c | 12 +++++++- chardev/char.c | 3 ++ hmp.c | 11 +++++++- include/block/nbd.h | 4 +-- migration/migration.c | 8 ++++++ migration/tls.c | 2 +- monitor.c | 23 +++++++++++++++ nbd/server.c | 10 +++---- qapi/block.json | 8 +++++- qapi/char.json | 6 ++++ qapi/migration.json | 14 ++++++++- qemu-deprecated.texi | 11 ++++++++ qemu-nbd.c | 14 ++++++++- qemu-nbd.texi | 4 +++ qemu-options.hx | 44 +++++++++++++++++++++-------- tests/qemu-iotests/233 | 31 ++++++++++++++++++-- tests/qemu-iotests/233.out | 11 ++++++++ ui/vnc.c | 58 ++++++++++++++++++++++++++++++++------ 19 files changed, 245 insertions(+), 40 deletions(-)
Signature · 1 line
2.20.1
PATCH v4 1/6 qemu-nbd: add support for authorization of TLS clients
From: "Daniel P. Berrange" <[email protected]>
Currently any client which can complete the TLS handshake is able to use the NBD 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 NBD server. This is still a fairly low bar to cross.
This adds a '--tls-authz OBJECT-ID' option to the qemu-nbd command 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 authorization check will not be permitted to use the NBD server.
For example to setup authorization that only allows connection from a client whose x509 certificate distinguished name is
CN=laptop.example.com,O=Example Org,L=London,ST=London,C=GB
escape the commas in the name and use:
qemu-nbd --object tls-creds-x509,id=tls0,dir=/home/berrange/qemutls,\
endpoint=server,verify-peer=yes \
--object 'authz-simple,id=auth0,identity=CN=laptop.example.com,,\
O=Example Org,,L=London,,ST=London,,C=GB' \
--tls-creds tls0 \
--tls-authz authz0 \
....other qemu-nbd args...NB: a real shell command line would not have leading whitespace after the line continuation, it is just included here for clarity.
--- include/block/nbd.h | 2 +- nbd/server.c | 10 +++++----- qemu-nbd.c | 14 +++++++++++++- qemu-nbd.texi | 4 ++++ tests/qemu-iotests/233 | 31 ++++++++++++++++++++++++++++--- tests/qemu-iotests/233.out | 11 +++++++++++ 6 files changed, 62 insertions(+), 10 deletions(-)
include/block/nbd.h +1 -1
@@ -325,7 +325,7 @@ void nbd_export_close_all(void);void nbd_client_new (QIOChannelSocket *sioc,QCryptoTLSCreds *tlscreds, -const char *tlsaclname, +const char *tlsauthz,void (*close_fn)(NBDClient *,bool ));void nbd_client_get (NBDClient *client);void nbd_client_put (NBDClient *client);
nbd/server.c +5 -5
@@ -111,7 +111,7 @@ struct NBDClient {NBDExport *exp;QCryptoTLSCreds *tlscreds; -char *tlsaclname; +char *tlsauthz;QIOChannelSocket *sioc;/* The underlying data channel */ QIOChannel *ioc;/* The current I/O channel which may differ (eg TLS) */
@@ -686,7 +686,7 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client, tioc =qio_channel_tls_new_server (ioc, client->tlscreds, - client->tlsaclname, + client->tlsauthz, errp);if (!tioc) {return NULL ;
@@ -1348,7 +1348,7 @@ void nbd_client_put(NBDClient *client)if (client->tlscreds) {object_unref (OBJECT (client->tlscreds)); } -g_free (client->tlsaclname); +g_free (client->tlsauthz);if (client->exp) {QTAILQ_REMOVE (&client->exp->clients, client, next);nbd_export_put (client->exp);
@@ -2425,7 +2425,7 @@ static coroutine_fn void nbd_co_client_start(void *opaque)*/ void nbd_client_new (QIOChannelSocket *sioc,QCryptoTLSCreds *tlscreds, -const char *tlsaclname, +const char *tlsauthz,void (*close_fn)(NBDClient *,bool )) {NBDClient *client;
@@ -2437,7 +2437,7 @@ void nbd_client_new(QIOChannelSocket *sioc,if (tlscreds) {object_ref (OBJECT (client->tlscreds)); } - client->tlsaclname =g_strdup (tlsaclname); + client->tlsauthz =g_strdup (tlsauthz); client->sioc = sioc;object_ref (OBJECT (client->sioc)); client->ioc =QIO_CHANNEL (sioc);
qemu-nbd.c +13 -1
@@ -58,6 +58,7 @@#define QEMU_NBD_OPT_TLSCREDS 261#define QEMU_NBD_OPT_IMAGE_OPTS 262#define QEMU_NBD_OPT_FORK 263 +#define QEMU_NBD_OPT_TLSAUTHZ 264#define MBR_SIZE 512
@@ -71,6 +72,7 @@ static int shared = 1;static int nb_fds;static QIONetListener *server;static QCryptoTLSCreds *tlscreds; +static const char *tlsauthz;static void usage (const char *name) {
@@ -103,6 +105,7 @@ static void usage(const char *name)" --object type,id=ID,... define an object such as 'secret' for providing\n" " passwords and/or encryption keys\n" " --tls-creds=ID use id of an earlier --object to provide TLS\n" +" --tls-authz=ID use id of an earlier --object to provide authorization\n" " -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n" " specify tracing options\n" " --fork fork off the server process and exit the parent\n"
@@ -452,7 +455,7 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc, nb_fds++;nbd_update_server_watch (); -nbd_client_new (cioc, tlscreds,NULL , nbd_client_closed); +nbd_client_new (cioc, tlscreds, tlsauthz, nbd_client_closed); }static void nbd_update_server_watch (void )
@@ -643,6 +646,7 @@ int main(int argc, char **argv) { "export-name", required_argument, NULL, 'x' }, { "description", required_argument, NULL, 'D' }, { "tls-creds", required_argument, NULL, QEMU_NBD_OPT_TLSCREDS }, + { "tls-authz", required_argument, NULL, QEMU_NBD_OPT_TLSAUTHZ }, { "image-opts", no_argument, NULL, QEMU_NBD_OPT_IMAGE_OPTS }, { "trace", required_argument, NULL, 'T' }, { "fork", no_argument, NULL, QEMU_NBD_OPT_FORK },
@@ -862,6 +866,9 @@ int main(int argc, char **argv)g_free (trace_file); trace_file =trace_opt_parse (optarg);break ; +case QEMU_NBD_OPT_TLSAUTHZ : + tlsauthz = optarg; +break ;case QEMU_NBD_OPT_FORK : fork_process = true;break ;
@@ -940,6 +947,11 @@ int main(int argc, char **argv) error_get_pretty(local_err));exit (EXIT_FAILURE ); } + }else { +if (tlsauthz) { +error_report ("--tls-authz is not permitted without --tls-creds" ); +exit (EXIT_FAILURE ); + } }if (list) {
qemu-nbd.texi +4 -0
@@ -117,6 +117,10 @@ option; or provide the credentials needed for connecting as a client in list mode. @item --fork Fork off the server process and exit the parent once the server is running. +@item --tls-authz=ID +Specify the ID of a qauthz object previously created with the +--object option. This will be used to authorize connecting users +against their x509 distinguished name. @item -v, --verbose Display extra debugging information. @item -h, --help
tests/qemu-iotests/233 +28 -3
@@ -59,6 +59,7 @@ tls_x509_create_root_ca "ca2" tls_x509_create_server "ca1" "server1" tls_x509_create_client "ca1" "client1" tls_x509_create_client "ca2" "client2" +tls_x509_create_client "ca1" "client3" echo echo "== preparing image =="
@@ -91,11 +92,15 @@ $QEMU_NBD_PROG -L -b $nbd_tcp_addr -p $nbd_tcp_port echo echo "== check TLS works ==" -obj=tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 -$QEMU_IMG info --image-opts --object $obj \ +obj1=tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 +obj2=tls-creds-x509,dir=${tls_dir}/client3,endpoint=client,id=tls0 +$QEMU_IMG info --image-opts --object $obj1 \ driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \ 2>&1 | sed "s/$nbd_tcp_port/PORT/g" -$QEMU_NBD_PROG -L -b $nbd_tcp_addr -p $nbd_tcp_port --object $obj \ +$QEMU_IMG info --image-opts --object $obj2 \ + driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \ + 2>&1 | sed "s/$nbd_tcp_port/PORT/g" +$QEMU_NBD_PROG -L -b $nbd_tcp_addr -p $nbd_tcp_port --object $obj1 \ --tls-creds=tls0 echo
@@ -117,6 +122,26 @@ $QEMU_IO -c 'r -P 0x11 1m 1m' -c 'w -P 0x22 1m 1m' --image-opts \ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io +echo +echo "== check TLS with authorization ==" + +nbd_server_stop + +nbd_server_start_tcp_socket \ + --object tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes \ + --object "authz-simple,identity=CN=localhost,,O=Cthulu Dark Lord Enterprises client1,,L=R'lyeh,,C=South Pacific,id=authz0" \ + --tls-authz authz0 \ + --tls-creds tls0 \ + -f $IMGFMT "$TEST_IMG" 2>> "$TEST_DIR/server.log" + +$QEMU_IMG info --image-opts \ + --object tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 \ + driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 + +$QEMU_IMG info --image-opts \ + --object tls-creds-x509,dir=${tls_dir}/client3,endpoint=client,id=tls0 \ + driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 + echo echo "== final server log ==" cat "$TEST_DIR/server.log"
tests/qemu-iotests/233.out +11 -0
@@ -6,6 +6,7 @@ Generating a self signed certificate... Generating a signed certificate... Generating a signed certificate... Generating a signed certificate... +Generating a signed certificate... == preparing image == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -29,6 +30,10 @@ image: nbd://127.0.0.1:PORT file format: nbd virtual size: 64M (67108864 bytes) disk size: unavailable +image: nbd://127.0.0.1:PORT +file format: nbd +virtual size: 64M (67108864 bytes) +disk size: unavailable exports available: 1 export: '' size: 67108864
@@ -51,7 +56,13 @@ wrote 1048576/1048576 bytes at offset 1048576 read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== check TLS with authorization == +qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=10809,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort +qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=10809,tls-creds=tls0': Failed to read option reply: Cannot read from TLS channel: Software caused connection abort + == final server log == qemu-nbd: option negotiation failed: Verify failed: No certificate was found. qemu-nbd: option negotiation failed: Verify failed: No certificate was found. +qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client1,L=R'lyeh,C=South Pacific is denied +qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client3,L=R'lyeh,C=South Pacific is denied *** done
Signature · 1 line
2.20.1
PATCH v4 2/6 nbd: allow authorization with nbd-server-start QMP command
In reply to Daniel P. BerrangéFrom: "Daniel P. Berrange" <[email protected]>
As with the previous patch to qemu-nbd, the nbd-server-start QMP command also needs to be able to specify authorization when enabling TLS encryption.
First the client must create a QAuthZ object instance using the 'object-add' command:
{
'execute': 'object-add',
'arguments': {
'qom-type': 'authz-list',
'id': 'authz0',
'parameters': {
'policy': 'deny',
'rules': [
{
'match': '*CN=fred',
'policy': 'allow'
}
]
}
}
}They can then reference this in the new 'tls-authz' parameter when executing the 'nbd-server-start' command:
{
'execute': 'nbd-server-start',
'arguments': {
'addr': {
'type': 'inet',
'host': '127.0.0.1',
'port': '9000'
},
'tls-creds': 'tls0',
'tls-authz': 'authz0'
}
}--- blockdev-nbd.c | 11 ++++++++--- hmp.c | 2 +- include/block/nbd.h | 2 +- qapi/block.json | 8 +++++++- 4 files changed, 17 insertions(+), 6 deletions(-)
blockdev-nbd.c +8 -3
@@ -23,6 +23,7 @@typedef struct NBDServerData {QIONetListener *listener;QCryptoTLSCreds *tlscreds; +char *tlsauthz; }NBDServerData ;static NBDServerData *nbd_server;
@@ -36,7 +37,7 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc, gpointer opaque) {qio_channel_set_name (QIO_CHANNEL (cioc),"nbd-server" ); -nbd_client_new (cioc, nbd_server->tlscreds,NULL , +nbd_client_new (cioc, nbd_server->tlscreds, nbd_server->tlsauthz, nbd_blockdev_client_closed); }
@@ -52,6 +53,7 @@ static void nbd_server_free(NBDServerData *server)if (server->tlscreds) {object_unref (OBJECT (server->tlscreds)); } +g_free (server->tlsauthz);g_free (server); }
@@ -87,7 +89,7 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)void nbd_server_start (SocketAddress *addr,const char *tls_creds, -Error **errp) +const char *tls_authz,Error **errp) {if (nbd_server) {error_setg (errp,"NBD server already running" );
@@ -117,6 +119,8 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds, } } + nbd_server->tlsauthz =g_strdup (tls_authz); + qio_net_listener_set_client_func(nbd_server->listener, nbd_accept, NULL,
@@ -131,11 +135,12 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds,void qmp_nbd_server_start (SocketAddressLegacy *addr,bool has_tls_creds,const char *tls_creds, +bool has_tls_authz,const char *tls_authz,Error **errp) {SocketAddress *addr_flat =socket_address_flatten (addr); -nbd_server_start (addr_flat, tls_creds, errp); +nbd_server_start (addr_flat, tls_creds, tls_authz, errp);qapi_free_SocketAddress (addr_flat); }
hmp.c +1 -1
@@ -2307,7 +2307,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) goto exit; } -nbd_server_start (addr,NULL , &local_err); +nbd_server_start (addr,NULL ,NULL , &local_err);qapi_free_SocketAddress (addr);if (local_err !=NULL ) { goto exit;
include/block/nbd.h +1 -1
@@ -331,7 +331,7 @@ void nbd_client_get(NBDClient *client);void nbd_client_put (NBDClient *client);void nbd_server_start (SocketAddress *addr,const char *tls_creds, -Error **errp); +const char *tls_authz,Error **errp);/* nbd_read * Reads @size bytes from @ioc. Returns 0 on success.
qapi/block.json +7 -1
@@ -225,6 +225,11 @@ # # @addr: Address on which to listen. # @tls-creds: (optional) ID of the TLS credentials object. Since 2.6 +# @tls-authz: ID of the QAuthZ authorization object used to validate +# the client's x509 distinguished name. This object is +# is only resolved at time of use, so can be deleted and +# recreated on the fly while the NBD server is active. +# If missing, it will default to denying access. Since 3.1 # # Returns: error if the server is already running. #
@@ -232,7 +237,8 @@ ## { 'command': 'nbd-server-start', 'data': { 'addr': 'SocketAddressLegacy', - '*tls-creds': 'str'} } + '*tls-creds': 'str', + '*tls-authz': 'str'} } ## # @nbd-server-add:
Signature · 1 line
2.20.1
PATCH v4 3/6 migration: add support for a "tls-authz" migration parameter
In reply to Daniel P. BerrangéFrom: "Daniel P. Berrange" <[email protected]>
The QEMU instance that runs as the server for the migration data transport (ie the target QEMU) needs to be able to configure access control so it can prevent unauthorized clients initiating an incoming migration. This adds a new 'tls-authz' migration parameter that is used to provide the QOM ID of a QAuthZ subclass instance that provides the access control check. This is checked against the x509 certificate obtained during the TLS handshake.
For example, when starting a QEMU for incoming migration, it is possible to give an example identity of the source QEMU that is intended to be connecting later:
$QEMU \
-monitor stdio \
-incoming defer \
...other args...
(qemu) object_add tls-creds-x509,id=tls0,dir=/home/berrange/qemutls,\
endpoint=server,verify-peer=yes \
(qemu) object_add authz-simple,id=auth0,identity=CN=laptop.example.com,,\
O=Example Org,,L=London,,ST=London,,C=GB \
(qemu) migrate_incoming tcp:localhost:9000--- hmp.c | 9 +++++++++ migration/migration.c | 8 ++++++++ migration/tls.c | 2 +- qapi/migration.json | 14 +++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-)
hmp.c +9 -0
@@ -398,6 +398,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)monitor_printf (mon,"%s: %" PRIu64"\n" ,MigrationParameter_str (MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH ), params->max_postcopy_bandwidth); +monitor_printf (mon," %s: '%s'\n" , +MigrationParameter_str (MIGRATION_PARAMETER_TLS_AUTHZ ), + params->has_tls_authz ? params->tls_authz :"" ); }qapi_free_MigrationParameters (params);
@@ -1709,6 +1712,12 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) p->tls_hostname->type =QTYPE_QSTRING ;visit_type_str (v, param, &p->tls_hostname->u.s, &err);break ; +case MIGRATION_PARAMETER_TLS_AUTHZ : + p->has_tls_authz = true; + p->tls_authz =g_new0 (StrOrNull,1 ); + p->tls_authz->type =QTYPE_QSTRING ; +visit_type_str (v, param, &p->tls_authz->u.s, &err); +break ;case MIGRATION_PARAMETER_MAX_BANDWIDTH : p->has_max_bandwidth = true;/*
migration/migration.c +8 -0
@@ -721,6 +721,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) params->tls_creds =g_strdup (s->parameters.tls_creds); params->has_tls_hostname = true; params->tls_hostname =g_strdup (s->parameters.tls_hostname); + params->has_tls_authz = true; + params->tls_authz =g_strdup (s->parameters.tls_authz); params->has_max_bandwidth = true; params->max_bandwidth = s->parameters.max_bandwidth; params->has_downtime_limit = true;
@@ -1234,6 +1236,12 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) s->parameters.tls_hostname =g_strdup (params->tls_hostname->u.s); } +if (params->has_tls_authz) { +g_free (s->parameters.tls_authz); +assert (params->tls_authz->type ==QTYPE_QSTRING ); + s->parameters.tls_authz =g_strdup (params->tls_authz->u.s); + } +if (params->has_max_bandwidth) { s->parameters.max_bandwidth = params->max_bandwidth;if (s->to_dst_file) {
migration/tls.c +1 -1
@@ -94,7 +94,7 @@ void migration_tls_channel_process_incoming(MigrationState *s, tioc =qio_channel_tls_new_server ( ioc, creds, -NULL ,/* XXX pass ACL name */ + s->parameters.tls_authz, errp);if (!tioc) {return ;
qapi/migration.json +13 -1
@@ -522,6 +522,12 @@ # hostname must be provided so that the server's x509 # certificate identity can be validated. (Since 2.7) # +# @tls-authz: ID of the 'authz' object subclass that provides access control +# checking of the TLS x509 certificate distinguished name. +# This object is only resolved at time of use, so can be deleted +# and recreated on the fly while the migration server is active. +# If missing, it will default to denying access (Since 3.1) +# # @max-bandwidth: to set maximum speed for migration. maximum speed in # bytes per second. (Since 2.8) #
@@ -563,7 +569,7 @@ 'data': ['compress-level', 'compress-threads', 'decompress-threads', 'compress-wait-thread', 'cpu-throttle-initial', 'cpu-throttle-increment', - 'tls-creds', 'tls-hostname', 'max-bandwidth', + 'tls-creds', 'tls-hostname', 'tls-authz', 'max-bandwidth', 'downtime-limit', 'x-checkpoint-delay', 'block-incremental', 'x-multifd-channels', 'x-multifd-page-count', 'xbzrle-cache-size', 'max-postcopy-bandwidth',
@@ -661,6 +667,7 @@ '*cpu-throttle-increment': 'int', '*tls-creds': 'StrOrNull', '*tls-hostname': 'StrOrNull', + '*tls-authz': 'StrOrNull', '*max-bandwidth': 'int', '*downtime-limit': 'int', '*x-checkpoint-delay': 'int',
@@ -730,6 +737,10 @@ # associated with the migration URI, if any. (Since 2.9) # Note: 2.8 reports this by omitting tls-hostname instead. # +# @tls-authz: ID of the 'authz' object subclass that provides access control +# checking of the TLS x509 certificate distinguished name. (Since +# 3.1) +# # @max-bandwidth: to set maximum speed for migration. maximum speed in # bytes per second. (Since 2.8) #
@@ -777,6 +788,7 @@ '*cpu-throttle-increment': 'uint8', '*tls-creds': 'str', '*tls-hostname': 'str', + '*tls-authz': 'str', '*max-bandwidth': 'size', '*downtime-limit': 'uint64', '*x-checkpoint-delay': 'uint32',
Signature · 1 line
2.20.1
PATCH v4 4/6 chardev: add support for authorization for TLS clients
In reply to Daniel P. BerrangéFrom: "Daniel P. Berrange" <[email protected]>
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=OBJECT-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=fred', you would use:
$QEMU -object tls-creds-x509,id=tls0,dir=/home/berrange/qemutls,\
endpoint=server,verify-peer=yes \
-object authz-simple,id=authz0,identity=CN=laptop.example.com,,\
O=Example Org,,L=London,,ST=London,,C=GB \
-chardev socket,host=127.0.0.1,port=9000,server,\
tls-creds=tls0,tls-authz=authz0 \
...other qemu args...--- chardev/char-socket.c | 12 +++++++++++- chardev/char.c | 3 +++ qapi/char.json | 6 ++++++ qemu-options.hx | 9 +++++++-- 4 files changed, 27 insertions(+), 3 deletions(-)
chardev/char-socket.c +11 -1
@@ -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 =qio_channel_tls_new_server ( s->ioc, s->tls_creds, -NULL ,/* XXX Use an ACL */ + s->tls_authz, &err); }else { tioc = 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);qemu_chr_be_event (chr,CHR_EVENT_CLOSED ); }
@@ -1320,6 +1322,7 @@ static void qmp_chardev_open_socket(Chardev *chr, } } } + s->tls_authz =g_strdup (sock->tls_authz); s->addr = addr =socket_address_flatten (sock->addr);
@@ -1358,6 +1361,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,const char *port =qemu_opt_get (opts,"port" );const char *fd =qemu_opt_get (opts,"fd" );SocketAddressLegacy *addr; +const char *tls_authz =qemu_opt_get (opts,"tls-authz" );ChardevSocket *sock;if ((!!path + !!fd + !!host) !=1 ) {
@@ -1370,6 +1374,10 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,error_setg (errp,"chardev: socket: no port given" );return ; } +if (tls_authz && !tls_creds) { +error_setg (errp,"Authorization can only be used when TLS is enabled" ); +return ; + } backend->type =CHARDEV_BACKEND_KIND_SOCKET ; sock = backend->u.socket.data =g_new0 (ChardevSocket,1 );
@@ -1399,6 +1407,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->reconnect =qemu_opt_get_number (opts,"reconnect" ,0 ); sock->has_tls_creds =qemu_opt_get (opts,"tls-creds" ); sock->tls_creds =g_strdup (qemu_opt_get (opts,"tls-creds" )); + sock->has_tls_authz =qemu_opt_get (opts,"tls-authz" ); + sock->tls_authz =g_strdup (qemu_opt_get (opts,"tls-authz" )); addr =g_new0 (SocketAddressLegacy,1 );if (path) {
chardev/char.c +3 -0
@@ -880,6 +880,9 @@ QemuOptsList qemu_chardev_opts = { },{ .name = "tls-creds", .type = QEMU_OPT_STRING, + },{ + .name = "tls-authz", + .type = QEMU_OPT_STRING, },{ .name = "websocket", .type = QEMU_OPT_BOOL,
qapi/char.json +6 -0
@@ -248,6 +248,11 @@ # @addr: socket address to listen on (server=true) # or connect to (server=false) # @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 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',
qemu-options.hx +7 -2
@@ -2408,7 +2408,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev null,id=id[,mux=on|off][,logfile=PATH][,logappend=on|off]\n" "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4][,ipv6][,nodelay][,reconnect=seconds]\n" " [,server][,nowait][,telnet][,websocket][,reconnect=seconds][,mux=on|off]\n" - " [,logfile=PATH][,logappend=on|off][,tls-creds=ID] (tcp)\n" + " [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n" "-chardev socket,id=id,path=path[,server][,nowait][,telnet][,websocket][,reconnect=seconds]\n" " [,mux=on|off][,logfile=PATH][,logappend=on|off] (unix)\n" "-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr]\n"
@@ -2537,7 +2537,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. -@item -chardev socket,id=@var{id}[,@var{TCP options} or @var{unix options}][,server][,nowait][,telnet][,websocket][,reconnect=@var{seconds}][,tls-creds=@var{id}] +@item -chardev socket,id=@var{id}[,@var{TCP options} or @var{unix options}][,server][,nowait][,telnet][,websocket][,reconnect=@var{seconds}][,tls-creds=@var{id}][,tls-authz=@var{id}] 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
@@ -2563,6 +2563,11 @@ and specifies the id of the TLS credentials to use for the handshake. The credentials must be previously created with the @option{-object tls-creds} argument. +@option{tls-auth} 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 +chardev server is active. If missing, it will default to denying access. + TCP and unix socket options are given below: @table @option
Signature · 1 line
2.20.1
PATCH v4 5/6 vnc: allow specifying a custom authorization object name
In reply to Daniel P. Berrangé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
@@ -1619,6 +1619,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.
@@ -1634,18 +1642,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 v4 6/6 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. 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.
--- monitor.c | 23 +++++++++++++++++++++++ qemu-deprecated.texi | 6 ++++++ 2 files changed, 29 insertions(+)
monitor.c +23 -0
@@ -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 ; }
qemu-deprecated.texi +6 -0
@@ -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)
Signature · 1 line
2.20.1