diff options
| author | Markus Armbruster | 2019-09-13 22:13:39 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2019-09-24 14:07:22 +0200 |
| commit | 56a8caff922df8d597895a49f55f2150bff3adb7 (patch) | |
| tree | 4f8d571a86db608c595d55d36c5fd0d687631626 /tests/qapi-schema | |
| parent | tests/qapi-schema: Demonstrate bad reporting of funny characters (diff) | |
| download | qemu-56a8caff922df8d597895a49f55f2150bff3adb7.tar.gz qemu-56a8caff922df8d597895a49f55f2150bff3adb7.tar.xz qemu-56a8caff922df8d597895a49f55f2150bff3adb7.zip | |
qapi: Restrict strings to printable ASCII
RFC 8259 on string contents:
All Unicode characters may be placed within the quotation marks,
except for the characters that MUST be escaped: quotation mark,
reverse solidus, and the control characters (U+0000 through
U+001F).
The QAPI schema parser accepts both less and more than JSON: it
accepts only ASCII with \u (less), and accepts control characters
other than LF (new line) unescaped. How it treats unescaped non-ASCII
input differs between Python 2 and Python 3.
Make it accept strictly less: require printable ASCII. Drop support
for \b, \f, \n, \r, \t.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190913201349.24332-7-armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema')
| -rw-r--r-- | tests/qapi-schema/string-code-point-127.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-127.exit (renamed from tests/qapi-schema/unicode-str.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-127.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-127.out (renamed from tests/qapi-schema/unicode-str.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-31.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-31.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-31.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/string-code-point-31.out | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/unicode-str.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/unicode-str.json | 2 |
10 files changed, 7 insertions, 3 deletions
diff --git a/tests/qapi-schema/string-code-point-127.err b/tests/qapi-schema/string-code-point-127.err new file mode 100644 index 0000000000..c310910c23 --- /dev/null +++ b/tests/qapi-schema/string-code-point-127.err @@ -0,0 +1 @@ +tests/qapi-schema/string-code-point-127.json:2:14: Funny character in string diff --git a/tests/qapi-schema/unicode-str.exit b/tests/qapi-schema/string-code-point-127.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/unicode-str.exit +++ b/tests/qapi-schema/string-code-point-127.exit diff --git a/tests/qapi-schema/string-code-point-127.json b/tests/qapi-schema/string-code-point-127.json new file mode 100644 index 0000000000..480318a69f --- /dev/null +++ b/tests/qapi-schema/string-code-point-127.json @@ -0,0 +1,2 @@ +# We accept printable ASCII: code points 32..126. Test code point 127: +{ 'command': '' } diff --git a/tests/qapi-schema/unicode-str.out b/tests/qapi-schema/string-code-point-127.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/unicode-str.out +++ b/tests/qapi-schema/string-code-point-127.out diff --git a/tests/qapi-schema/string-code-point-31.err b/tests/qapi-schema/string-code-point-31.err new file mode 100644 index 0000000000..45797928d9 --- /dev/null +++ b/tests/qapi-schema/string-code-point-31.err @@ -0,0 +1 @@ +tests/qapi-schema/string-code-point-31.json:2:14: Funny character in string diff --git a/tests/qapi-schema/string-code-point-31.exit b/tests/qapi-schema/string-code-point-31.exit new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/qapi-schema/string-code-point-31.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/string-code-point-31.json b/tests/qapi-schema/string-code-point-31.json new file mode 100644 index 0000000000..f186cbd720 --- /dev/null +++ b/tests/qapi-schema/string-code-point-31.json @@ -0,0 +1,2 @@ +# We accept printable ASCII: code points 32..126. Test code point 127: +{ 'command': ' ' } diff --git a/tests/qapi-schema/string-code-point-31.out b/tests/qapi-schema/string-code-point-31.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/qapi-schema/string-code-point-31.out diff --git a/tests/qapi-schema/unicode-str.err b/tests/qapi-schema/unicode-str.err deleted file mode 100644 index f621cd6448..0000000000 --- a/tests/qapi-schema/unicode-str.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/unicode-str.json:2: 'command' uses invalid name 'é' diff --git a/tests/qapi-schema/unicode-str.json b/tests/qapi-schema/unicode-str.json deleted file mode 100644 index 5253a1b9f3..0000000000 --- a/tests/qapi-schema/unicode-str.json +++ /dev/null @@ -1,2 +0,0 @@ -# we don't support full Unicode strings, yet -{ 'command': 'é' } |