From nobody Mon Apr 29 02:01:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1634661346152219.64959279047093; Tue, 19 Oct 2021 09:35:46 -0700 (PDT) Received: from localhost ([::1]:58600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcs5Z-0007Y6-3v for importer@patchew.org; Tue, 19 Oct 2021 12:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSH-00042R-U8 for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:09 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]:50751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSE-0002KU-6l for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:09 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0F2CF46908; Tue, 19 Oct 2021 17:54:55 +0200 (CEST) From: Stefan Reiter To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , Eric Blake , Gerd Hoffmann , Wolfgang Bumiller , Thomas Lamprecht Subject: [PATCH v5 1/4] monitor/hmp: add support for flag argument with value Date: Tue, 19 Oct 2021 17:54:40 +0200 Message-Id: <20211019155443.1447372-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019155443.1447372-1-s.reiter@proxmox.com> References: <20211019155443.1447372-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=s.reiter@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1634661348681100001 Content-Type: text/plain; charset="utf-8" Adds support for the "-xS" parameter type, where "-x" denotes a flag name and the "S" suffix indicates that this flag is supposed to take an arbitrary string parameter. These parameters are always optional, the entry in the qdict will be omitted if the flag is not given. Reviewed-by: Eric Blake Signed-off-by: Stefan Reiter --- monitor/hmp.c | 17 ++++++++++++++++- monitor/monitor-internal.h | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index d50c3124e1..a32dce7a35 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -980,6 +980,7 @@ static QDict *monitor_parse_arguments(Monitor *mon, { const char *tmp =3D p; int skip_key =3D 0; + int ret; /* option */ =20 c =3D *typestr++; @@ -1002,8 +1003,22 @@ static QDict *monitor_parse_arguments(Monitor *mon, } if (skip_key) { p =3D tmp; + } else if (*typestr =3D=3D 'S') { + /* has option with string value */ + typestr++; + tmp =3D p++; + while (qemu_isspace(*p)) { + p++; + } + ret =3D get_str(buf, sizeof(buf), &p); + if (ret < 0) { + monitor_printf(mon, "%s: value expected for -%= c\n", + cmd->name, *tmp); + goto fail; + } + qdict_put_str(qdict, key, buf); } else { - /* has option */ + /* has boolean option */ p++; qdict_put_bool(qdict, key, true); } diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 9c3a09cb01..c848ba5bcf 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -63,7 +63,8 @@ * '.' other form of optional type (for 'i' and 'l') * 'b' boolean * user mode accepts "on" or "off" - * '-' optional parameter (eg. '-f') + * '-' optional parameter (eg. '-f'); if followed by an 'S', it + * specifies an optional string param (e.g. '-fS' allows '-f = foo') * */ =20 --=20 2.30.2 From nobody Mon Apr 29 02:01:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1634660075976464.1836718936695; Tue, 19 Oct 2021 09:14:35 -0700 (PDT) Received: from localhost ([::1]:33350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcrl4-0004cv-SB for importer@patchew.org; Tue, 19 Oct 2021 12:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSG-0003xw-Kb for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:08 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]:8826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSD-0002Km-Tg for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:08 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8AADD468FF; Tue, 19 Oct 2021 17:54:55 +0200 (CEST) From: Stefan Reiter To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , Eric Blake , Gerd Hoffmann , Wolfgang Bumiller , Thomas Lamprecht Subject: [PATCH v5 2/4] qapi/monitor: refactor set/expire_password with enums Date: Tue, 19 Oct 2021 17:54:41 +0200 Message-Id: <20211019155443.1447372-3-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019155443.1447372-1-s.reiter@proxmox.com> References: <20211019155443.1447372-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=s.reiter@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1634660078075100001 Content-Type: text/plain; charset="utf-8" 'protocol' and 'connected' are better suited as enums than as strings, make use of that. No functional change intended. Suggested-by: Markus Armbruster Signed-off-by: Stefan Reiter --- monitor/hmp-cmds.c | 17 +++++++++++++++-- monitor/qmp-cmds.c | 35 ++++++++++------------------------- qapi/ui.json | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 60 insertions(+), 29 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index bcaa41350e..0ff18ebb3c 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1453,8 +1453,17 @@ void hmp_set_password(Monitor *mon, const QDict *qdi= ct) const char *password =3D qdict_get_str(qdict, "password"); const char *connected =3D qdict_get_try_str(qdict, "connected"); Error *err =3D NULL; + DisplayProtocol proto; + SetPasswordAction conn; =20 - qmp_set_password(protocol, password, !!connected, connected, &err); + proto =3D qapi_enum_parse(&DisplayProtocol_lookup, protocol, + DISPLAY_PROTOCOL_VNC, &err); + if (!!connected) { + conn =3D qapi_enum_parse(&SetPasswordAction_lookup, connected, + SET_PASSWORD_ACTION_KEEP, &err); + } + + qmp_set_password(proto, password, !!connected, conn, &err); hmp_handle_error(mon, err); } =20 @@ -1463,8 +1472,12 @@ void hmp_expire_password(Monitor *mon, const QDict *= qdict) const char *protocol =3D qdict_get_str(qdict, "protocol"); const char *whenstr =3D qdict_get_str(qdict, "time"); Error *err =3D NULL; + DisplayProtocol proto; =20 - qmp_expire_password(protocol, whenstr, &err); + proto =3D qapi_enum_parse(&DisplayProtocol_lookup, protocol, + DISPLAY_PROTOCOL_VNC, &err); + + qmp_expire_password(proto, whenstr, &err); hmp_handle_error(mon, err); } =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 5c0d5e116b..f1746a31fb 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -163,33 +163,26 @@ void qmp_system_wakeup(Error **errp) qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, errp); } =20 -void qmp_set_password(const char *protocol, const char *password, - bool has_connected, const char *connected, Error **e= rrp) +void qmp_set_password(DisplayProtocol protocol, const char *password, + bool has_connected, SetPasswordAction connected, + Error **errp) { int disconnect_if_connected =3D 0; int fail_if_connected =3D 0; int rc; =20 if (has_connected) { - if (strcmp(connected, "fail") =3D=3D 0) { - fail_if_connected =3D 1; - } else if (strcmp(connected, "disconnect") =3D=3D 0) { - disconnect_if_connected =3D 1; - } else if (strcmp(connected, "keep") =3D=3D 0) { - /* nothing */ - } else { - error_setg(errp, QERR_INVALID_PARAMETER, "connected"); - return; - } + fail_if_connected =3D connected =3D=3D SET_PASSWORD_ACTION_FAIL; + disconnect_if_connected =3D connected =3D=3D SET_PASSWORD_ACTION_D= ISCONNECT; } =20 - if (strcmp(protocol, "spice") =3D=3D 0) { + if (protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { if (!qemu_using_spice(errp)) { return; } rc =3D qemu_spice.set_passwd(password, fail_if_connected, disconnect_if_connected); - } else if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (protocol =3D=3D DISPLAY_PROTOCOL_VNC) { if (fail_if_connected || disconnect_if_connected) { /* vnc supports "connected=3Dkeep" only */ error_setg(errp, QERR_INVALID_PARAMETER, "connected"); @@ -198,10 +191,6 @@ void qmp_set_password(const char *protocol, const char= *password, /* Note that setting an empty password will not disable login thro= ugh * this interface. */ rc =3D vnc_display_password(NULL, password); - } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", - "'vnc' or 'spice'"); - return; } =20 if (rc !=3D 0) { @@ -209,7 +198,7 @@ void qmp_set_password(const char *protocol, const char = *password, } } =20 -void qmp_expire_password(const char *protocol, const char *whenstr, +void qmp_expire_password(DisplayProtocol protocol, const char *whenstr, Error **errp) { time_t when; @@ -225,17 +214,13 @@ void qmp_expire_password(const char *protocol, const = char *whenstr, when =3D strtoull(whenstr, NULL, 10); } =20 - if (strcmp(protocol, "spice") =3D=3D 0) { + if (protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { if (!qemu_using_spice(errp)) { return; } rc =3D qemu_spice.set_pw_expire(when); - } else if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (protocol =3D=3D DISPLAY_PROTOCOL_VNC) { rc =3D vnc_display_pw_expire(NULL, when); - } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", - "'vnc' or 'spice'"); - return; } =20 if (rc !=3D 0) { diff --git a/qapi/ui.json b/qapi/ui.json index d7567ac866..15cc19dcc5 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -9,6 +9,35 @@ { 'include': 'common.json' } { 'include': 'sockets.json' } =20 +## +# @DisplayProtocol: +# +# Display protocols which support changing password options. +# +# Since: 6.2 +# +## +{ 'enum': 'DisplayProtocol', + 'data': [ { 'name': 'vnc', 'if': 'CONFIG_VNC' }, + { 'name': 'spice', 'if': 'CONFIG_SPICE' } ] } + +## +# @SetPasswordAction: +# +# An action to take on changing a password on a connection with active cli= ents. +# +# @fail: fail the command if clients are connected +# +# @disconnect: disconnect existing clients +# +# @keep: maintain existing clients +# +# Since: 6.2 +# +## +{ 'enum': 'SetPasswordAction', + 'data': [ 'fail', 'disconnect', 'keep' ] } + ## # @set_password: # @@ -38,7 +67,9 @@ # ## { 'command': 'set_password', - 'data': {'protocol': 'str', 'password': 'str', '*connected': 'str'} } + 'data': { 'protocol': 'DisplayProtocol', + 'password': 'str', + '*connected': 'SetPasswordAction' } } =20 ## # @expire_password: @@ -71,7 +102,9 @@ # <- { "return": {} } # ## -{ 'command': 'expire_password', 'data': {'protocol': 'str', 'time': 'str'}= } +{ 'command': 'expire_password', + 'data': { 'protocol': 'DisplayProtocol', + 'time': 'str' } } =20 ## # @screendump: --=20 2.30.2 From nobody Mon Apr 29 02:01:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16346633743201020.0971459477523; Tue, 19 Oct 2021 10:09:34 -0700 (PDT) Received: from localhost ([::1]:54994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcscH-0003Bn-AD for importer@patchew.org; Tue, 19 Oct 2021 13:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSI-00044a-Eu for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:10 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]:35250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSD-0002LS-PK for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:10 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5E9A646907; Tue, 19 Oct 2021 17:54:56 +0200 (CEST) From: Stefan Reiter To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , Eric Blake , Gerd Hoffmann , Wolfgang Bumiller , Thomas Lamprecht Subject: [PATCH v5 3/4] qapi/monitor: allow VNC display id in set/expire_password Date: Tue, 19 Oct 2021 17:54:42 +0200 Message-Id: <20211019155443.1447372-4-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019155443.1447372-1-s.reiter@proxmox.com> References: <20211019155443.1447372-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=s.reiter@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1634663376372100001 It is possible to specify more than one VNC server on the command line, either with an explicit ID or the auto-generated ones =C3=A0 la "default", "vnc2", "vnc3", ... It is not possible to change the password on one of these extra VNC displays though. Fix this by adding a "display" parameter to the "set_password" and "expire_password" QMP and HMP commands. For HMP, the display is specified using the "-d" value flag. For QMP, the schema is updated to explicitly express the supported variants of the commands with protocol-discriminated unions. Suggested-by: Markus Armbruster Signed-off-by: Stefan Reiter --- hmp-commands.hx | 24 +++++----- monitor/hmp-cmds.c | 51 ++++++++++++++++++--- monitor/qmp-cmds.c | 44 +++++++++--------- qapi/ui.json | 112 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 170 insertions(+), 61 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index cf723c69ac..d78e4cfc47 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1514,33 +1514,35 @@ ERST =20 { .name =3D "set_password", - .args_type =3D "protocol:s,password:s,connected:s?", - .params =3D "protocol password action-if-connected", + .args_type =3D "protocol:s,password:s,display:-dS,connected:s?", + .params =3D "protocol password [-d display] [action-if-connect= ed]", .help =3D "set spice/vnc password", .cmd =3D hmp_set_password, }, =20 SRST -``set_password [ vnc | spice ] password [ action-if-connected ]`` - Change spice/vnc password. *action-if-connected* specifies what - should happen in case a connection is established: *fail* makes the - password change fail. *disconnect* changes the password and +``set_password [ vnc | spice ] password [ -d display ] [ action-if-connect= ed ]`` + Change spice/vnc password. *display* can be used with 'vnc' to specify + which display to set the password on. *action-if-connected* specifies + what should happen in case a connection is established: *fail* makes + the password change fail. *disconnect* changes the password and disconnects the client. *keep* changes the password and keeps the connection up. *keep* is the default. ERST =20 { .name =3D "expire_password", - .args_type =3D "protocol:s,time:s", - .params =3D "protocol time", + .args_type =3D "protocol:s,time:s,display:-dS", + .params =3D "protocol time [-d display]", .help =3D "set spice/vnc password expire-time", .cmd =3D hmp_expire_password, }, =20 SRST -``expire_password [ vnc | spice ]`` *expire-time* - Specify when a password for spice/vnc becomes - invalid. *expire-time* accepts: +``expire_password [ vnc | spice ] expire-time [ -d display ]`` + Specify when a password for spice/vnc becomes invalid. + *display* behaves the same as in ``set_password``. + *expire-time* accepts: =20 ``now`` Invalidate password instantly. diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0ff18ebb3c..79549596e4 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1451,19 +1451,40 @@ void hmp_set_password(Monitor *mon, const QDict *qd= ict) { const char *protocol =3D qdict_get_str(qdict, "protocol"); const char *password =3D qdict_get_str(qdict, "password"); + const char *display =3D qdict_get_try_str(qdict, "display"); const char *connected =3D qdict_get_try_str(qdict, "connected"); Error *err =3D NULL; DisplayProtocol proto; - SetPasswordAction conn; + + SetPasswordOptions opts =3D { + .password =3D g_strdup(password), + .u.vnc.display =3D NULL, + }; =20 proto =3D qapi_enum_parse(&DisplayProtocol_lookup, protocol, DISPLAY_PROTOCOL_VNC, &err); - if (!!connected) { - conn =3D qapi_enum_parse(&SetPasswordAction_lookup, connected, - SET_PASSWORD_ACTION_KEEP, &err); + if (err) { + goto out; + } + opts.protocol =3D proto; + + if (proto =3D=3D DISPLAY_PROTOCOL_VNC) { + opts.u.vnc.has_display =3D !!display; + opts.u.vnc.display =3D g_strdup(display); + } else if (proto =3D=3D DISPLAY_PROTOCOL_SPICE) { + opts.u.spice.has_connected =3D !!connected; + opts.u.spice.connected =3D + qapi_enum_parse(&SetPasswordAction_lookup, connected, + SET_PASSWORD_ACTION_KEEP, &err); + if (err) { + goto out; + } } =20 - qmp_set_password(proto, password, !!connected, conn, &err); + qmp_set_password(&opts, &err); + +out: + qapi_free_SetPasswordOptions(&opts); hmp_handle_error(mon, err); } =20 @@ -1471,13 +1492,31 @@ void hmp_expire_password(Monitor *mon, const QDict = *qdict) { const char *protocol =3D qdict_get_str(qdict, "protocol"); const char *whenstr =3D qdict_get_str(qdict, "time"); + const char *display =3D qdict_get_try_str(qdict, "display"); Error *err =3D NULL; DisplayProtocol proto; =20 + ExpirePasswordOptions opts =3D { + .time =3D g_strdup(whenstr), + .u.vnc.display =3D NULL, + }; + proto =3D qapi_enum_parse(&DisplayProtocol_lookup, protocol, DISPLAY_PROTOCOL_VNC, &err); + if (err) { + goto out; + } + opts.protocol =3D proto; =20 - qmp_expire_password(proto, whenstr, &err); + if (proto =3D=3D DISPLAY_PROTOCOL_VNC) { + opts.u.vnc.has_display =3D !!display; + opts.u.vnc.display =3D g_strdup(display); + } + + qmp_expire_password(&opts, &err); + +out: + qapi_free_ExpirePasswordOptions(&opts); hmp_handle_error(mon, err); } =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index f1746a31fb..b0630d00ab 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -163,34 +163,35 @@ void qmp_system_wakeup(Error **errp) qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, errp); } =20 -void qmp_set_password(DisplayProtocol protocol, const char *password, - bool has_connected, SetPasswordAction connected, - Error **errp) +void qmp_set_password(SetPasswordOptions *opts, Error **errp) { - int disconnect_if_connected =3D 0; - int fail_if_connected =3D 0; - int rc; + bool disconnect_if_connected =3D false; + bool fail_if_connected =3D false; + int rc =3D 0; =20 - if (has_connected) { - fail_if_connected =3D connected =3D=3D SET_PASSWORD_ACTION_FAIL; - disconnect_if_connected =3D connected =3D=3D SET_PASSWORD_ACTION_D= ISCONNECT; - } - - if (protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { + if (opts->protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { if (!qemu_using_spice(errp)) { return; } - rc =3D qemu_spice.set_passwd(password, fail_if_connected, + if (opts->u.spice.has_connected) { + fail_if_connected =3D + opts->u.spice.connected =3D=3D SET_PASSWORD_ACTION_FAIL; + disconnect_if_connected =3D + opts->u.spice.connected =3D=3D SET_PASSWORD_ACTION_DISCONN= ECT; + } + rc =3D qemu_spice.set_passwd(opts->password, fail_if_connected, disconnect_if_connected); - } else if (protocol =3D=3D DISPLAY_PROTOCOL_VNC) { - if (fail_if_connected || disconnect_if_connected) { + } else if (opts->protocol =3D=3D DISPLAY_PROTOCOL_VNC) { + if (opts->u.vnc.connected !=3D SET_PASSWORD_ACTION_KEEP) { /* vnc supports "connected=3Dkeep" only */ error_setg(errp, QERR_INVALID_PARAMETER, "connected"); return; } /* Note that setting an empty password will not disable login thro= ugh * this interface. */ - rc =3D vnc_display_password(NULL, password); + rc =3D vnc_display_password( + opts->u.vnc.has_display ? opts->u.vnc.display : NULL, + opts->password); } =20 if (rc !=3D 0) { @@ -198,11 +199,11 @@ void qmp_set_password(DisplayProtocol protocol, const= char *password, } } =20 -void qmp_expire_password(DisplayProtocol protocol, const char *whenstr, - Error **errp) +void qmp_expire_password(ExpirePasswordOptions *opts, Error **errp) { time_t when; int rc; + const char* whenstr =3D opts->time; =20 if (strcmp(whenstr, "now") =3D=3D 0) { when =3D 0; @@ -214,13 +215,14 @@ void qmp_expire_password(DisplayProtocol protocol, co= nst char *whenstr, when =3D strtoull(whenstr, NULL, 10); } =20 - if (protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { + if (opts->protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { if (!qemu_using_spice(errp)) { return; } rc =3D qemu_spice.set_pw_expire(when); - } else if (protocol =3D=3D DISPLAY_PROTOCOL_VNC) { - rc =3D vnc_display_pw_expire(NULL, when); + } else if (opts->protocol =3D=3D DISPLAY_PROTOCOL_VNC) { + rc =3D vnc_display_pw_expire( + opts->u.vnc.has_display ? opts->u.vnc.display : NULL, when= ); } =20 if (rc !=3D 0) { diff --git a/qapi/ui.json b/qapi/ui.json index 15cc19dcc5..17939d0dda 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -39,20 +39,61 @@ 'data': [ 'fail', 'disconnect', 'keep' ] } =20 ## -# @set_password: +# @SetPasswordOptions: # -# Sets the password of a remote display session. +# Data required to set a new password on a display server protocol. # # @protocol: - 'vnc' to modify the VNC server password # - 'spice' to modify the Spice server password # # @password: the new password # -# @connected: how to handle existing clients when changing the -# password. If nothing is specified, defaults to 'keep' -# 'fail' to fail the command if clients are connected -# 'disconnect' to disconnect existing clients -# 'keep' to maintain existing clients +# Since: 6.2 +# +## +{ 'union': 'SetPasswordOptions', + 'base': { 'protocol': 'DisplayProtocol', + 'password': 'str' }, + 'discriminator': 'protocol', + 'data': { 'vnc': 'SetPasswordOptionsVnc', + 'spice': 'SetPasswordOptionsSpice' } } + +## +# @SetPasswordOptionsSpice: +# +# Options for set_password specific to the SPICE procotol. +# +# @connected: How to handle existing clients when changing the +# password. If nothing is specified, defaults to 'keep'. +# +# Since: 6.2 +# +## +{ 'struct': 'SetPasswordOptionsSpice', + 'data': { '*connected': 'SetPasswordAction' } } + +## +# @SetPasswordOptionsVnc: +# +# Options for set_password specific to the VNC procotol. +# +# @display: The id of the display where the password should be changed. +# Defaults to the first. +# +# @connected: How to handle existing clients when changing the +# password. +# +# Since: 6.2 +# +## +{ 'struct': 'SetPasswordOptionsVnc', + 'data': { '*display': 'str', + '*connected': 'SetPasswordAction' }} + +## +# @set_password: +# +# Sets the password of a remote display session. # # Returns: - Nothing on success # - If Spice is not enabled, DeviceNotFound @@ -66,18 +107,16 @@ # <- { "return": {} } # ## -{ 'command': 'set_password', - 'data': { 'protocol': 'DisplayProtocol', - 'password': 'str', - '*connected': 'SetPasswordAction' } } +{ 'command': 'set_password', 'boxed': true, 'data': 'SetPasswordOptions' } =20 ## -# @expire_password: +# @ExpirePasswordOptions: # -# Expire the password of a remote display server. -# -# @protocol: the name of the remote display protocol 'vnc' or 'spice' +# Data required to set password expiration on a display server protocol. # +# @protocol: - 'vnc' to modify the VNC server expiration +# - 'spice' to modify the Spice server expiration + # @time: when to expire the password. # # - 'now' to expire the password immediately @@ -85,16 +124,45 @@ # - '+INT' where INT is the number of seconds from now (integer) # - 'INT' where INT is the absolute time in seconds # -# Returns: - Nothing on success -# - If @protocol is 'spice' and Spice is not active, DeviceNotFou= nd -# -# Since: 0.14 -# # Notes: Time is relative to the server and currently there is no way to # coordinate server time with client time. It is not recommended to # use the absolute time version of the @time parameter unless you're # sure you are on the same machine as the QEMU instance. # +# Since: 6.2 +# +## +{ 'union': 'ExpirePasswordOptions', + 'base': { 'protocol': 'DisplayProtocol', + 'time': 'str' }, + 'discriminator': 'protocol', + 'data': { 'vnc': 'ExpirePasswordOptionsVnc' } } + +## +# @ExpirePasswordOptionsVnc: +# +# Options for expire_password specific to the VNC procotol. +# +# @display: The id of the display where the expiration should be changed. +# Defaults to the first. +# +# Since: 6.2 +# +## + +{ 'struct': 'ExpirePasswordOptionsVnc', + 'data': { '*display': 'str' } } + +## +# @expire_password: +# +# Expire the password of a remote display server. +# +# Returns: - Nothing on success +# - If @protocol is 'spice' and Spice is not active, DeviceNotFou= nd +# +# Since: 0.14 +# # Example: # # -> { "execute": "expire_password", "arguments": { "protocol": "vnc", @@ -102,9 +170,7 @@ # <- { "return": {} } # ## -{ 'command': 'expire_password', - 'data': { 'protocol': 'DisplayProtocol', - 'time': 'str' } } +{ 'command': 'expire_password', 'boxed': true, 'data': 'ExpirePasswordOpti= ons' } =20 ## # @screendump: --=20 2.30.2 From nobody Mon Apr 29 02:01:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163465992695567.55394590653543; Tue, 19 Oct 2021 09:12:06 -0700 (PDT) Received: from localhost ([::1]:53180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcrif-0007Sy-Te for importer@patchew.org; Tue, 19 Oct 2021 12:12:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSG-0003wT-EE for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:08 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]:47433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcrSD-0002Kn-Tj for qemu-devel@nongnu.org; Tue, 19 Oct 2021 11:55:07 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 99ECD46903; Tue, 19 Oct 2021 17:54:55 +0200 (CEST) From: Stefan Reiter To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , Eric Blake , Gerd Hoffmann , Wolfgang Bumiller , Thomas Lamprecht Subject: [PATCH v5 4/4] qapi/monitor: only allow 'keep' SetPasswordAction for VNC and deprecate Date: Tue, 19 Oct 2021 17:54:43 +0200 Message-Id: <20211019155443.1447372-5-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019155443.1447372-1-s.reiter@proxmox.com> References: <20211019155443.1447372-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=s.reiter@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1634659929873100001 Content-Type: text/plain; charset="utf-8" VNC only supports 'keep' here, enforce this via a seperate SetPasswordActionVnc enum and mark the option 'deprecated' (as it is useless with only one value possible). Suggested-by: Eric Blake Signed-off-by: Stefan Reiter --- monitor/qmp-cmds.c | 5 ----- qapi/ui.json | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index b0630d00ab..cb229c01f8 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -182,11 +182,6 @@ void qmp_set_password(SetPasswordOptions *opts, Error = **errp) rc =3D qemu_spice.set_passwd(opts->password, fail_if_connected, disconnect_if_connected); } else if (opts->protocol =3D=3D DISPLAY_PROTOCOL_VNC) { - if (opts->u.vnc.connected !=3D SET_PASSWORD_ACTION_KEEP) { - /* vnc supports "connected=3Dkeep" only */ - error_setg(errp, QERR_INVALID_PARAMETER, "connected"); - return; - } /* Note that setting an empty password will not disable login thro= ugh * this interface. */ rc =3D vnc_display_password( diff --git a/qapi/ui.json b/qapi/ui.json index 17939d0dda..70410bb633 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -38,6 +38,20 @@ { 'enum': 'SetPasswordAction', 'data': [ 'fail', 'disconnect', 'keep' ] } =20 +## +# @SetPasswordActionVnc: +# +# See @SetPasswordAction. VNC only supports the keep action. 'connection' +# should just be omitted for VNC, this is kept for backwards compatibility. +# +# @keep: maintain existing clients +# +# Since: 6.2 +# +## +{ 'enum': 'SetPasswordActionVnc', + 'data': [ 'keep' ] } + ## # @SetPasswordOptions: # @@ -83,12 +97,17 @@ # @connected: How to handle existing clients when changing the # password. # +# Features: +# @deprecated: For VNC, @connected will always be 'keep', parameter should= be +# omitted. +# # Since: 6.2 # ## { 'struct': 'SetPasswordOptionsVnc', 'data': { '*display': 'str', - '*connected': 'SetPasswordAction' }} + '*connected': { 'type': 'SetPasswordActionVnc', + 'features': ['deprecated'] } } } =20 ## # @set_password: --=20 2.30.2