From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com
Subject: [Qemu-devel] [PATCH 12/13] QMP: Introduce qmp_check_input_obj()
Date: Tue, 22 Jun 2010 14:40:50 -0300 [thread overview]
Message-ID: <1277228451-7741-13-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com>
This is similar to qmp_check_client_args(), but it checks if
the input object follows the specification (QMP/qmp-spec.txt
section 2.3).
As we're limited to three keys, the work here is quite simple:
we iterate over the input object, checking each time if the
current argument complies to the specification.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/monitor.c b/monitor.c
index 2a29095..a24a152 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4163,6 +4163,46 @@ out:
return err;
}
+/*
+ * Input object checking rules
+ *
+ * 1. "execute" key must exist (not checked here)
+ * 2. "execute" key must be a string
+ * 3. "arguments" key must be a dict
+ * 4. "id" key can be anything (ie. json-value)
+ * 5. Any argument not listed above is considered unexpected
+ */
+static int qmp_check_input_obj(const QDict *input_obj)
+{
+ const QDictEntry *ent;
+
+ for (ent = qdict_first(input_obj); ent; ent = qdict_next(input_obj, ent)) {
+ const char *arg_name = qdict_entry_key(ent);
+ const QObject *arg_obj = qdict_entry_value(ent);
+
+ if (!strcmp(arg_name, "execute")) {
+ if (qobject_type(arg_obj) != QTYPE_QSTRING) {
+ qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
+ "string");
+ return -1;
+ }
+ } else if (!strcmp(arg_name, "arguments")) {
+ if (qobject_type(arg_obj) != QTYPE_QDICT) {
+ qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments",
+ "object");
+ return -1;
+ }
+ } else if (!strcmp(arg_name, "id")) {
+ /* FIXME: check duplicated IDs for async commands */
+ } else {
+ qerror_report(QERR_QMP_UNEXPECTED_INPUT_OBJECT_MEMBER, arg_name);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
{
int err;
@@ -4187,6 +4227,11 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
input = qobject_to_qdict(obj);
+ err = qmp_check_input_obj(input);
+ if (err < 0) {
+ goto err_input;
+ }
+
mon->mc->id = qdict_get(input, "id");
qobject_incref(mon->mc->id);
--
1.7.1.359.gd0b8d
next prev parent reply other threads:[~2010-06-22 17:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-22 17:40 [Qemu-devel] [PATCH v2 00/13]: QMP: Replace client argument checker Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 01/13] QDict: Rename 'err_value' Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 02/13] QDict: Small terminology change Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 03/13] QDict: Introduce functions to retrieve QDictEntry values Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 04/13] QDict: Introduce new iteration API Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 05/13] check-qdict: Introduce test for the " Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 06/13] QDict: Introduce qdict_get_try_bool() Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 07/13] Monitor: handle optional '-' arg as a bool Luiz Capitulino
2010-06-23 15:05 ` Markus Armbruster
2010-06-23 16:14 ` Luiz Capitulino
2010-06-23 16:31 ` Markus Armbruster
2010-06-23 16:43 ` Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 08/13] QMP: New argument checker (first part) Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 09/13] QMP: New argument checker (second part) Luiz Capitulino
2010-06-23 15:21 ` Markus Armbruster
2010-06-23 16:28 ` Luiz Capitulino
2010-06-23 17:16 ` Markus Armbruster
2010-06-22 17:40 ` [Qemu-devel] [PATCH 10/13] QMP: Drop old client argument checker Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 11/13] QError: Introduce QERR_QMP_UNEXPECTED_INPUT_OBJECT_MEMBER Luiz Capitulino
2010-06-22 17:40 ` Luiz Capitulino [this message]
2010-06-23 15:23 ` [Qemu-devel] [PATCH 12/13] QMP: Introduce qmp_check_input_obj() Markus Armbruster
2010-06-23 16:29 ` Luiz Capitulino
2010-06-23 17:20 ` Markus Armbruster
2010-06-22 17:40 ` [Qemu-devel] [PATCH 13/13] QMP: Drop old input object checking Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1277228451-7741-13-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).