Commit b35203b2 authored Feb 05, 2019 by Marc-André Lureau Committed by Eduardo Habkost Mar 11, 2019

qmp-shell: fix nested json regression



Commit fcfab754 ("qmp-shell: learn to send commands with quoted
arguments") introduces the usage of Python 'shlex' to handle quoted
arguments, but it accidentally broke generation of nested JSON
structs.

shlex drops quotes, which breaks parsing of the nested struct.

cmd='blockdev-create job-id="job0 foo" options={"driver":"qcow2","size":16384,"file":{"driver":"file","filename":"foo.qcow2"}}'

shlex.split(cmd)
['blockdev-create',
 'job-id=job0 foo',
 'options={driver:qcow2,size:16384,file:{driver:file,filename:foo.qcow2}}']

Replace with a regexp to split while respecting quoted strings and preserving quotes:

re.findall(r'''(?:[^\s"']|"(?:\\.|[^"])*"|'(?:\\.|[^'])*')+''', cmd)
['blockdev-create',
 'job-id="job0 foo"',
 'options={"driver":"qcow2","size":16384,"file":{"driver":"file","filename":"foo.qcow2"}}']

Fixes: fcfab754 ("qmp-shell: learn to send commands with quoted arguments")
Reported-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190205134926.8312-1-marcandre.lureau@redhat.com>
Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

parent 336cfef4

scripts/qmp/qmp-shell

+2 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ import sys
		import os
		import errno
		import atexit
		import shlex
		import re

		sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
		from qemu import qmp
		@@ -222,7 +222,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):

		< command-name > [ arg-name1=arg1 ] ... [ arg-nameN=argN ]
		"""
		cmdargs = shlex.split(cmdline)
		cmdargs = re.findall(r'''(?:[^\s"']\|"(?:\\.\|[^"])"\|'(?:\\.\|[^'])')+''', cmdline)

		# Transactional CLI entry/exit:
		if cmdargs[0] == 'transaction(':