From patchwork Tue Jun 22 17:40:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 56547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B919B6F0C for ; Wed, 23 Jun 2010 03:47:31 +1000 (EST) Received: from localhost ([127.0.0.1]:49468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR7ZI-0007sq-QM for incoming@patchwork.ozlabs.org; Tue, 22 Jun 2010 13:47:28 -0400 Received: from [140.186.70.92] (port=55663 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR7Th-0004gS-8h for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OR7TV-0000fE-T0 for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1028) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OR7TV-0000f8-LF for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:29 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MHfSnl026249 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Jun 2010 13:41:28 -0400 Received: from localhost (vpn-10-15.rdu.redhat.com [10.11.10.15]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5MHfQNf026860; Tue, 22 Jun 2010 13:41:27 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 22 Jun 2010 14:40:50 -0300 Message-Id: <1277228451-7741-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com> References: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 12/13] QMP: Introduce qmp_check_input_obj() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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);