libvirt/tests/storagepoolxml2xmlout
Eric Blake 6cc4d6a3fe storage: use valid XML for awkward volume names
$ touch /var/lib/libvirt/images/'a<b>c'
$ virsh pool-refresh default
$ virsh vol-dumpxml 'a<b>c' default | head -n2
<volume>
  <name>a<b>c</name>

Oops.  That's not valid XML.  And when we fix the XML
generation, it fails RelaxNG validation.

I'm also tired of seeing <key>(null)</key> in the example
output for volume xml; while we used NULLSTR() to avoid
a NULL deref rather than relying on glibc's printf
extension behavior, it's even better if we avoid the issue
in the first place.  But this requires being careful that
we don't invalidate any storage backends that were relying
on key being unassigned during virStoragVolCreateXML[From].

I would have split this into two patches (one for escaping,
one for avoiding <key>(null)</key>), but since they both
end up touching a lot of the same test files, I ended up
merging it into one.

Note that this patch allows pretty much any volume name
that can appear in a directory (excluding . and .. because
those are special), but does nothing to change the current
(unenforced) RelaxNG claim that pool names will consist
only of letters, numbers, _, -, and +.  Tightening the C
code to match RelaxNG patterns and/or relaxing the grammar
to match the C code for pool names is a task for another
day (but remember, we DID recently tighten C code for
domain names to exclude a leading '.').

* src/conf/storage_conf.c (virStoragePoolSourceFormat)
(virStoragePoolDefFormat, virStorageVolTargetDefFormat)
(virStorageVolDefFormat): Escape user-controlled strings.
(virStorageVolDefParseXML): Parse key, for use in unit tests.
* src/storage/storage_driver.c (storageVolCreateXML)
(storageVolCreateXMLFrom): Ensure parsed key doesn't confuse
volume creation.
* docs/schemas/basictypes.rng (volName): Relax definition.
* tests/storagepoolxml2xmltest.c (mymain): Test it.
* tests/storagevolxml2xmltest.c (mymain): Likewise.
* tests/storagepoolxml2xmlin/pool-dir-naming.xml: New file.
* tests/storagepoolxml2xmlout/pool-dir-naming.xml: Likewise.
* tests/storagevolxml2xmlin/vol-file-naming.xml: Likewise.
* tests/storagevolxml2xmlout/vol-file-naming.xml: Likewise.
* tests/storagevolxml2xmlout/vol-*.xml: Fix fallout.

Signed-off-by: Eric Blake <eblake@redhat.com>
2013-11-21 17:29:47 -07:00
..
pool-dir-naming.xml storage: use valid XML for awkward volume names 2013-11-21 17:29:47 -07:00
pool-dir.xml Update xml schemas according to libvirt source 2012-08-02 14:36:23 -06:00
pool-disk.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-fs.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-iscsi-auth.xml storage_pool: Rework chap XML to mimic ceph 2013-07-15 12:41:12 -04:00
pool-iscsi-multiiqn.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-iscsi-vendor-product.xml storage_pool: Rework chap XML to mimic ceph 2013-07-15 12:41:12 -04:00
pool-iscsi.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-logical-create.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-logical-nopath.xml Make logical pools independent on target path 2013-07-16 12:16:37 +02:00
pool-logical.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-mpath.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-netfs-gluster.xml storage: fix RNG validation of gluster via netfs 2013-11-13 12:10:00 -07:00
pool-netfs.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
pool-rbd.xml storage_pool: Rework chap XML to mimic ceph 2013-07-15 12:41:12 -04:00
pool-scsi-type-fc-host.xml New XML attributes for storage pool source adapter 2013-04-08 18:41:06 +08:00
pool-scsi-type-scsi-host.xml New XML attributes for storage pool source adapter 2013-04-08 18:41:06 +08:00
pool-scsi.xml New XML attributes for storage pool source adapter 2013-04-08 18:41:06 +08:00
pool-sheepdog.xml Add a sheepdog backend for the storage driver 2012-07-18 20:08:27 +01:00