External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStorageSourceNetCookieValidate: Accept quoted cookie value

Browse Source 
The quotes are forbidden only inside the value, but the value itself may
be enclosed in quotes. Fix the RNG schema and validator and add a test
case.

https://bugzilla.redhat.com/show_bug.cgi?id=1804750

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-25 16:06:39 +01:00
parent c34ec56aba
commit b9166baebe
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/schemas/domaincommon.rng
View File

@ -1852,7 +1852,7 @@
</data>
</attribute>
<data type="string">
<param name="pattern">[!#$%&amp;'()*+\-./0-9:&gt;=&lt;?@A-Z\^_`\[\]a-z|~]+</param>
<param name="pattern">"?[!#$%&amp;'()*+\-./0-9:&gt;=&lt;?@A-Z\^_`\[\]a-z|~]+"?</param>
</data>
</element>
</oneOrMore>

19
src/util/virstoragefile.c
View File

@ -2217,6 +2217,10 @@ static const char virStorageSourceCookieNameInvalidChars[] =
static int
virStorageSourceNetCookieValidate(virStorageNetCookieDefPtr def)
{
g_autofree char *val = g_strdup(def->value);
const char *checkval = val;
size_t len = strlen(val);
/* name must have at least 1 character */
if (*(def->name) == '\0') {
virReportError(VIR_ERR_XML_ERROR, "%s",
@ -2233,8 +2237,21 @@ virStorageSourceNetCookieValidate(virStorageNetCookieDefPtr def)
return -1;
}
/* check for optional quotes around the cookie value string */
if (val[0] == '"') {
if (val[len - 1] != '"') {
virReportError(VIR_ERR_XML_ERROR,
_("value of cookie '%s' contains invalid characters"),
def->name);
return -1;
}
val[len - 1] = '\0';
checkval++;
}
/* check invalid characters in value */
if (virStringHasChars(def->value, virStorageSourceCookieValueInvalidChars)) {
if (virStringHasChars(checkval, virStorageSourceCookieValueInvalidChars)) {
virReportError(VIR_ERR_XML_ERROR,
_("value of cookie '%s' contains invalid characters"),
def->name);

4
tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
View File

@ -43,7 +43,7 @@ id=virtio-disk0,bootindex=1 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
id=virtio-disk1 \
-object secret,id=libvirt-2-storage-httpcookie-secret0,\
data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\
"cookie-secret":"libvirt-2-storage-httpcookie-secret0",\
@ -53,7 +53,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
id=virtio-disk2 \
-object secret,id=libvirt-1-storage-httpcookie-secret0,\
data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
"sslverify":false,"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\

4
tests/qemuxml2argvdata/disk-network-http.xml
View File

@ -35,7 +35,7 @@
<host name='example.org' port='1234'/>
<cookies>
<cookie name='test'>testcookievalue</cookie>
<cookie name='test2'>blurb</cookie>
<cookie name='test2'>"blurb"</cookie>
</cookies>
</source>
<target dev='vdc' bus='virtio'/>
@ -47,7 +47,7 @@
<ssl verify='no'/>
<cookies>
<cookie name='test'>testcookievalue</cookie>
<cookie name='test2'>blurb</cookie>
<cookie name='test2'>&quot;blurb&quot;</cookie>
</cookies>
</source>
<target dev='vdd' bus='virtio'/>

4
tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
View File

@ -41,7 +41,7 @@
<host name='example.org' port='1234'/>
<cookies>
<cookie name='test'>testcookievalue</cookie>
<cookie name='test2'>blurb</cookie>
<cookie name='test2'>&quot;blurb&quot;</cookie>
</cookies>
</source>
<target dev='vdc' bus='virtio'/>
@ -54,7 +54,7 @@
<ssl verify='no'/>
<cookies>
<cookie name='test'>testcookievalue</cookie>
<cookie name='test2'>blurb</cookie>
<cookie name='test2'>&quot;blurb&quot;</cookie>
</cookies>
</source>
<target dev='vdd' bus='virtio'/>