mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
738dc3f4ad
Commit a7fb2258 added sanitization of storage pool target paths,
however source dir paths were left unsanitized.
A netfs pool with:
<source>
<host name='10.20.30.40'/>
<dir path='/nfs/'/>
</source>
will not be correctly detected as mounted by
virStorageBackendFileSystemIsMounted, because it shows up in the
mount list without the trailing slash.
Sanitize the source dir as well.
https://bugzilla.redhat.com/show_bug.cgi?id=1723247
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
111 lines
2.8 KiB
C
111 lines
2.8 KiB
C
#include <config.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "internal.h"
|
|
#include "testutils.h"
|
|
#include "storage_conf.h"
|
|
#include "testutilsqemu.h"
|
|
#include "virstring.h"
|
|
|
|
#include "storage/storage_util.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
static int
|
|
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
|
|
{
|
|
VIR_AUTOFREE(char *) actual = NULL;
|
|
VIR_AUTOPTR(virStoragePoolDef) dev = NULL;
|
|
|
|
if (!(dev = virStoragePoolDefParseFile(inxml)))
|
|
return -1;
|
|
|
|
if (!(actual = virStoragePoolDefFormat(dev)))
|
|
return -1;
|
|
|
|
if (virTestCompareToFile(actual, outxml) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
testCompareXMLToXMLHelper(const void *data)
|
|
{
|
|
VIR_AUTOFREE(char *) inxml = NULL;
|
|
VIR_AUTOFREE(char *) outxml = NULL;
|
|
|
|
if (virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml",
|
|
abs_srcdir, (const char*)data) < 0 ||
|
|
virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml",
|
|
abs_srcdir, (const char*)data) < 0)
|
|
return -1;
|
|
|
|
return testCompareXMLToXMLFiles(inxml, outxml);
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
#define DO_TEST(name) \
|
|
if (virTestRun("Storage Pool XML-2-XML " name, \
|
|
testCompareXMLToXMLHelper, (name)) < 0) \
|
|
ret = -1
|
|
|
|
if (storageRegisterAll() < 0)
|
|
return EXIT_FAILURE;
|
|
|
|
DO_TEST("pool-dir");
|
|
DO_TEST("pool-dir-naming");
|
|
DO_TEST("pool-fs");
|
|
DO_TEST("pool-logical");
|
|
DO_TEST("pool-logical-nopath");
|
|
DO_TEST("pool-logical-create");
|
|
DO_TEST("pool-logical-noname");
|
|
DO_TEST("pool-disk");
|
|
DO_TEST("pool-disk-device-nopartsep");
|
|
DO_TEST("pool-iscsi");
|
|
DO_TEST("pool-iscsi-auth");
|
|
DO_TEST("pool-netfs");
|
|
DO_TEST("pool-netfs-slash");
|
|
DO_TEST("pool-netfs-auto");
|
|
DO_TEST("pool-netfs-protocol-ver");
|
|
DO_TEST("pool-netfs-gluster");
|
|
DO_TEST("pool-netfs-cifs");
|
|
#ifdef WITH_STORAGE_FS
|
|
DO_TEST("pool-netfs-ns-mountopts");
|
|
#endif
|
|
DO_TEST("pool-scsi");
|
|
DO_TEST("pool-scsi-type-scsi-host");
|
|
DO_TEST("pool-scsi-type-fc-host");
|
|
DO_TEST("pool-scsi-type-fc-host-managed");
|
|
DO_TEST("pool-mpath");
|
|
DO_TEST("pool-iscsi-multiiqn");
|
|
DO_TEST("pool-iscsi-vendor-product");
|
|
DO_TEST("pool-sheepdog");
|
|
DO_TEST("pool-gluster");
|
|
DO_TEST("pool-gluster-sub");
|
|
DO_TEST("pool-scsi-type-scsi-host-stable");
|
|
DO_TEST("pool-zfs");
|
|
DO_TEST("pool-zfs-sourcedev");
|
|
DO_TEST("pool-rbd");
|
|
#ifdef WITH_STORAGE_RBD
|
|
DO_TEST("pool-rbd-ipv6");
|
|
DO_TEST("pool-rbd-refresh-volume-allocation");
|
|
DO_TEST("pool-rbd-ns-configopts");
|
|
#endif
|
|
DO_TEST("pool-vstorage");
|
|
DO_TEST("pool-iscsi-direct-auth");
|
|
DO_TEST("pool-iscsi-direct");
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIR_TEST_MAIN(mymain)
|