vnc: add qmp to support change authz
PATCH 1/1 vnc: add qmp to support change authz
This patch add a new qmp 'change-vnc-authz' to support change the tls/sasl authz of vm. If index='', unset tlsauthzid/sasl.authzid {
"execute":"change-vnc-authz",
"arguments":{
"index":"object-authz-id",
"type":"tls/sasl" }
}
--- include/ui/console.h | 3 +++ monitor/qmp-cmds.c | 10 ++++++++++ qapi/ui.json | 16 ++++++++++++++++ ui/vnc.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+)
include/ui/console.h +3 -0
@@ -441,6 +441,9 @@ int vnc_display_password(const char *id, const char *password);int vnc_display_pw_expire (const char *id,time_t expires);QemuOpts *vnc_parse (const char *str,Error **errp);int vnc_init_func (void *opaque,QemuOpts *opts,Error **errp); +#ifdef CONFIG_VNC_SASL +int vnc_change_authz (const char *id,const char *type,const char *index); +#endif /* input.c */ int index_from_key (const char *key,size_t key_length);
monitor/qmp-cmds.c +10 -0
@@ -289,6 +289,16 @@ static void qmp_change_vnc(const char *target, bool has_arg, const char *arg, }#endif /* !CONFIG_VNC */ +#ifdef CONFIG_VNC_SASL +void qmp_change_vnc_authz (const char *type,const char *index,Error **errp) +{ +if (vnc_change_authz (NULL , type, index) <0 ) { +error_setg (errp,"Could not set authz, type:%s, index:%s" , + type, index); + } +} +#endif +void qmp_change (const char *device,const char *target,bool has_arg,const char *arg,Error **errp) {
qapi/ui.json +16 -0
@@ -1179,3 +1179,19 @@ ## { 'command': 'query-display-options', 'returns': 'DisplayOptions' } + +## +# @change-vnc-authz: +# +# Change the VNC server authz. +# +# @type: the new authz type to use with VNC authentication +# @index: the new authz object index to use with VNC authentication +# +# Since: 5.2 +# +## +{ 'command': 'change-vnc-authz', + 'data': { 'type' : 'str', + 'index': 'str'}, + 'if': 'defined(CONFIG_VNC_SASL)' }
ui/vnc.c +32 -0
@@ -3276,6 +3276,38 @@ int vnc_display_password(const char *id, const char *password)return 0 ; } +#ifdef CONFIG_VNC_SASL +int vnc_change_authz (const char *id,const char *type,const char *index) +{ +VncDisplay *vd =vnc_display_find (id); + +if (!vd) { +return -EINVAL ; + } + +if (strcmp (type,"sasl" ) ==0 ) { +g_free (vd->sasl.authzid); + vd->sasl.authzid =NULL ; + +if (strcmp (index,"" ) !=0 ) { + vd->sasl.authzid =g_strdup (index); + } + }else if (strcmp (type,"tls" ) ==0 ) { +g_free (vd->tlsauthzid); + vd->tlsauthzid =NULL ; + +if (strcmp (index,"" ) !=0 ) { + vd->tlsauthzid =g_strdup (index); + } + }else { +error_printf_unless_qmp ("unsupport authz type: %s" , type); +return -EOPNOTSUPP ; + } + +return 0 ; +} +#endif +int vnc_display_pw_expire (const char *id,time_t expires) {VncDisplay *vd =vnc_display_find (id);
Signature · 1 line
2.23.0
Hi,
Quoted 15 lines
This patch add a new qmp 'change-vnc-authz' to support change the tls/sasl authz of vm. If index='', unset tlsauthzid/sasl.authzid
{ "execute":"change-vnc-authz", "arguments":{ "index":"object-authz-id", "type":"tls/sasl" } }qapi/ui.json +5
-0+## +# @change-vnc-authz: +# +# Change the VNC server authz. +#
qapi/ui.json line 1197
Quoted 10 lines
qapi/ui.json +10
-0+# @type: the new authz type to use with VNC authentication +# @index: the new authz object index to use with VNC authentication +# +# Since: 5.2 +# +## +{ 'command': 'change-vnc-authz', + 'data': { 'type' : 'str', + 'index': 'str'}, + 'if': 'defined(CONFIG_VNC_SASL)' }
type should be an enum I think.
Also index should be an int (and possibly an optional argument so you can just not specify index to unset).
take care,
Gerd
Hi,
Quoted 21 lines · Gerd Hoffmann
Hi,
Quoted 19 lines
This patch add a new qmp 'change-vnc-authz' to support change the tls/sasl authz of vm. If index='', unset tlsauthzid/sasl.authzid
{ "execute":"change-vnc-authz", "arguments":{ "index":"object-authz-id", "type":"tls/sasl" } }qapi/ui.json +9
-0+## +# @change-vnc-authz: +# +# Change the VNC server authz. +# +# @type: the new authz type to use with VNC authentication +# @index: the new authz object index to use with VNC authentication +# +# Since: 5.2
Quoted 8 lines
qapi/ui.json line 1197
Quoted 6 lines
qapi/ui.json +6
-0+# +## +{ 'command': 'change-vnc-authz', + 'data': { 'type' : 'str', + 'index': 'str'}, + 'if': 'defined(CONFIG_VNC_SASL)' }type should be an enum I think.
It is a good idea to set type to enum, I will fix it in the next version.
Quoted 3 lines
Also index should be an int (and possibly an optional argument so you can just not specify index to unset).
Index is the id of authz object(myauthz, user can set it as they wanted), may not use int. -object authz-simple,id=myauthz,identity=test1
Quoted 5 lines
take care,
Gerd.
BTW, Daniel P . Berrangé suggests that all property set QMP commands should be integrated as an general purpose "display_update" QMP command. That's really a good idea. This may take longer time to design and code. Will we not think about adding new property set QMP until the general purpose "display_update" QMP is ready?
https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg00941.html
Thanks,
Zihao
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
qapi/ui.json +4
-0+{ 'command': 'change-vnc-authz', + 'data': { 'type' : 'str', + 'index': 'str'}, + 'if': 'defined(CONFIG_VNC_SASL)' }
Quoted 8 lines
Quoted 1 line
type should be an enum I think.
It is a good idea to set type to enum, I will fix it in the next version.
Quoted 3 lines
Also index should be an int (and possibly an optional argument so you can just not specify index to unset).
Index is the id of authz
object(myauthz, user can set it as they wanted), may not use int. -object authz-simple,id=myauthz,identity=test1
Name it "auth-id" then? "index" sounds like a number ...
Quoted 2 lines
BTW, Daniel P . Berrangé suggests that all property set QMP commands should be integrated as an general purpose "
display_update" QMP command. That's really a good idea.
Makes sense indeed.
take care,
Gerd
Quoted 9 lines · Zihao Chang
This patch add a new qmp 'change-vnc-authz' to support change the tls/sasl authz of vm. If index='', unset tlsauthzid/sasl.authzid
{ "execute":"change-vnc-authz", "arguments":{ "index":"object-authz-id", "type":"tls/sasl" } }
I'm not a fan of adding adhoc new commands for specific properties.
It feels like that is just repeating the design mistakes we made for years with the CLI where we added countless -set-this-feature-too args. We realized this mistake and now have the general purpose "-display" arg.
If we want to support changing properties on the fly in QMP, then I think we should do a general purpose "display_update" QMP command, to replace the existing 'set_pasword', 'expire_password', 'change-vnc-password' commands, and also enable this authz change.
It can also enable changing the TLS credentials object, and the authentication scheme, and be extensible to any number of other VNC properties we might like to make configurable in the future. Similarly it would then be extensible for SPICE and other graphics backends.
Quoted 115 lines
Signed-off-by Zihao Chang <[email protected]>--- include/ui/console.h | 3 +++ monitor/qmp-cmds.c | 10 ++++++++++ qapi/ui.json | 16 ++++++++++++++++ ui/vnc.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+)include/ui/console.h +3
-0@@ -441,6 +441,9 @@ int vnc_display_password(const char *id, const char *password);int vnc_display_pw_expire (const char *id,time_t expires);QemuOpts *vnc_parse (const char *str,Error **errp);int vnc_init_func (void *opaque,QemuOpts *opts,Error **errp); +#ifdef CONFIG_VNC_SASL +int vnc_change_authz (const char *id,const char *type,const char *index); +#endif /* input.c */ int index_from_key (const char *key,size_t key_length);monitor/qmp-cmds.c +10
-0@@ -289,6 +289,16 @@ static void qmp_change_vnc(const char *target, bool has_arg, const char *arg, }#endif /* !CONFIG_VNC */ +#ifdef CONFIG_VNC_SASL +void qmp_change_vnc_authz (const char *type,const char *index,Error **errp) +{ +if (vnc_change_authz (NULL , type, index) <0 ) { +error_setg (errp,"Could not set authz, type:%s, index:%s" , + type, index); + } +} +#endif +void qmp_change (const char *device,const char *target,bool has_arg,const char *arg,Error **errp) {qapi/ui.json +16
-0@@ -1179,3 +1179,19 @@ ## { 'command': 'query-display-options', 'returns': 'DisplayOptions' } + +## +# @change-vnc-authz: +# +# Change the VNC server authz. +# +# @type: the new authz type to use with VNC authentication +# @index: the new authz object index to use with VNC authentication +# +# Since: 5.2 +# +## +{ 'command': 'change-vnc-authz', + 'data': { 'type' : 'str', + 'index': 'str'}, + 'if': 'defined(CONFIG_VNC_SASL)' }ui/vnc.c +32
-0@@ -3276,6 +3276,38 @@ int vnc_display_password(const char *id, const char *password)return 0 ; } +#ifdef CONFIG_VNC_SASL +int vnc_change_authz (const char *id,const char *type,const char *index) +{ +VncDisplay *vd =vnc_display_find (id); + +if (!vd) { +return -EINVAL ; + } + +if (strcmp (type,"sasl" ) ==0 ) { +g_free (vd->sasl.authzid); + vd->sasl.authzid =NULL ; + +if (strcmp (index,"" ) !=0 ) { + vd->sasl.authzid =g_strdup (index); + } + }else if (strcmp (type,"tls" ) ==0 ) { +g_free (vd->tlsauthzid); + vd->tlsauthzid =NULL ; + +if (strcmp (index,"" ) !=0 ) { + vd->tlsauthzid =g_strdup (index); + } + }else { +error_printf_unless_qmp ("unsupport authz type: %s" , type); +return -EOPNOTSUPP ; + } + +return 0 ; +} +#endif +int vnc_display_pw_expire (const char *id,time_t expires) {VncDisplay *vd =vnc_display_find (id);Signature · 1 line
2.23.0
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 :|