From nobody Wed Nov 5 13:00:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534520696958894.4356681381767; Fri, 17 Aug 2018 08:44:56 -0700 (PDT) Received: from localhost ([::1]:34839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgvf-0005uH-6C for importer@patchew.org; Fri, 17 Aug 2018 11:44:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgKG-00034B-7v for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqgKE-0001jW-2H for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56216 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqgKD-0001h5-3O for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C14E5A756; Fri, 17 Aug 2018 15:06:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4827A16874; Fri, 17 Aug 2018 15:06:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1951F110E7FA; Fri, 17 Aug 2018 17:06:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 17:05:13 +0200 Message-Id: <20180817150559.16243-15-armbru@redhat.com> In-Reply-To: <20180817150559.16243-1-armbru@redhat.com> References: <20180817150559.16243-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 15:06:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 15:06:04 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 14/60] check-qjson qmp-test: Cover control characters more thoroughly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" RFC 7159 requires control characters in strings to be escaped. Demonstrate the JSON parser accepts U+0001 .. U+001F unescaped. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- tests/check-qjson.c | 36 ++++++++++++++++++++++++++++++------ tests/qmp-test.c | 14 ++++++++++++++ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index e81fbb95a3..1581fbf170 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -192,6 +192,26 @@ static void utf8_string(void) * We may choose to define this as feature */ =20 + /* 0 Control characters */ + { + /* + * Note: \x00 is impossible, other representations of + * U+0000 are covered under 4.3 + */ + "\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x10\x11\x12\x13\x14\x15\x16\x17" + "\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F", + /* bug: not corrected (valid UTF-8, but invalid JSON) */ + "\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x10\x11\x12\x13\x14\x15\x16\x17" + "\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F", + "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007" + "\\b\\t\\n\\u000B\\f\\r\\u000E\\u000F" + "\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017" + "\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001E\\u001F", + }, /* 1 Some correct UTF-8 text */ { /* a bit of German */ @@ -211,14 +231,14 @@ static void utf8_string(void) /* 2 Boundary condition test cases */ /* 2.1 First possible sequence of a certain length */ /* - * 2.1.1 1 byte U+0001 - * \x00 is impossible, test \x01 instead. Other - * representations of U+0000 are covered under 4.3. + * 2.1.1 1 byte U+0020 + * Control characters are already covered by their own test + * case under 0. Test the first 1 byte non-control character + * here. */ { - "\x01", - "\x01", - "\\u0001", + " ", + " ", }, /* 2.1.2 2 bytes U+0080 */ { @@ -1333,6 +1353,10 @@ static void junk_input(void) g_assert(!err); /* BUG */ g_assert(obj =3D=3D NULL); =20 + obj =3D qobject_from_json("{\x01", &err); + g_assert(!err); /* BUG */ + g_assert(obj =3D=3D NULL); + obj =3D qobject_from_json("[0\xFF]", &err); error_free_or_abort(&err); g_assert(obj =3D=3D NULL); diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 17153192fe..5edc97f63f 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -71,6 +71,13 @@ static void test_malformed(QTestState *qts) qobject_unref(resp); g_assert(recovered(qts)); =20 + /* lexical error: funny control character outside string */ + qtest_qmp_send_raw(qts, "{\x01"); + resp =3D qtest_qmp_receive(qts); + g_assert_cmpstr(get_error_class(resp), =3D=3D, "GenericError"); + qobject_unref(resp); + g_assert(recovered(qts)); + /* lexical error: impossible byte in string */ qtest_qmp_send_raw(qts, "{'bad \xFF"); resp =3D qtest_qmp_receive(qts); @@ -78,6 +85,13 @@ static void test_malformed(QTestState *qts) qobject_unref(resp); g_assert(recovered(qts)); =20 + /* lexical error: control character in string */ + qtest_qmp_send_raw(qts, "{'execute': 'nonexistent', 'id':'\n'}"); + resp =3D qtest_qmp_receive(qts); + g_assert_cmpstr(get_error_class(resp), =3D=3D, "CommandNotFound"); /* = BUG */ + qobject_unref(resp); + g_assert(recovered(qts)); + /* lexical error: interpolation */ qtest_qmp_send_raw(qts, "%%p\n"); resp =3D qtest_qmp_receive(qts); --=20 2.17.1