openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage: Add default mount options for fs/netfs storage pools 

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

Modify the command generation to add some default options to the
fs/netfs storage pools based on the OS type. For Linux, it'll be
the "nodev, nosuid, noexec". For FreeBSD, it'll be "nosuid, noexec".
For others, just leave the options alone.

Modify the storagepoolxml2argvtest to handle the fact that the
same input XML could generate different output XML based on whether
Linux, FreeBSD, or other was being built.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
John Ferlan 2019-01-11 10:53:35 -05:00
parent d0ba8d6553
commit f00cde7f11
12 changed files with 84 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/storage/storage_util.c
View File

@ -34,6 +34,11 @@
# ifndef FS_NOCOW_FL
# define FS_NOCOW_FL 0x00800000 /* Do not cow file */
# endif
# define default_mount_opts "nodev,nosuid,noexec"
#elif defined(__FreeBSD__)
# define default_mount_opts "nosuid,noexec"
#else
# define default_mount_opts ""
#endif
#if WITH_BLKID
@ -4261,12 +4266,34 @@ virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool)
}
static void
virStorageBackendFileSystemMountAddOptions(virCommandPtr cmd,
const char *providedOpts)
{
VIR_AUTOFREE(char *) mountOpts = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
if (*default_mount_opts != '\0')
virBufferAsprintf(&buf, "%s,", default_mount_opts);
if (providedOpts)
virBufferAsprintf(&buf, "%s,", providedOpts);
virBufferTrim(&buf, ",", -1);
mountOpts = virBufferContentAndReset(&buf);
if (mountOpts)
virCommandAddArgList(cmd, "-o", mountOpts, NULL);
}
static void
virStorageBackendFileSystemMountNFSArgs(virCommandPtr cmd,
const char *src,
virStoragePoolDefPtr def)
{
virCommandAddArgList(cmd, src, def->target.path, NULL);
virStorageBackendFileSystemMountAddOptions(cmd, NULL);
}
@ -4278,8 +4305,8 @@ virStorageBackendFileSystemMountGlusterArgs(virCommandPtr cmd,
const char *fmt;
fmt = virStoragePoolFormatFileSystemNetTypeToString(def->source.format);
virCommandAddArgList(cmd, "-t", fmt, src, "-o", "direct-io-mode=1",
def->target.path, NULL);
virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL);
virStorageBackendFileSystemMountAddOptions(cmd, "direct-io-mode=1");
}
@ -4291,8 +4318,8 @@ virStorageBackendFileSystemMountCIFSArgs(virCommandPtr cmd,
const char *fmt;
fmt = virStoragePoolFormatFileSystemNetTypeToString(def->source.format);
virCommandAddArgList(cmd, "-t", fmt, src, def->target.path,
"-o", "guest", NULL);
virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL);
virStorageBackendFileSystemMountAddOptions(cmd, "guest");
}
@ -4308,6 +4335,7 @@ virStorageBackendFileSystemMountDefaultArgs(virCommandPtr cmd,
else
fmt = virStoragePoolFormatFileSystemNetTypeToString(def->source.format);
virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL);
virStorageBackendFileSystemMountAddOptions(cmd, NULL);
}

1
tests/storagepoolxml2argvdata/pool-fs-freebsd.argv Normal file
View File

@ -0,0 +1 @@
mount -t ext3 /dev/sda6 /mnt -o nosuid,noexec

1
tests/storagepoolxml2argvdata/pool-fs-linux.argv Normal file
View File

@ -0,0 +1 @@
mount -t ext3 /dev/sda6 /mnt -o nodev,nosuid,noexec

1
tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv Normal file
View File

@ -0,0 +1 @@
mount localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec

1
tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv Normal file
View File

@ -0,0 +1 @@
mount localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec

1
tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv Normal file
View File

@ -0,0 +1 @@
mount -t cifs //example.com/samba_share /mnt/cifs -o nosuid,noexec,guest

1
tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv Normal file
View File

@ -0,0 +1 @@
mount -t cifs //example.com/samba_share /mnt/cifs -o nodev,nosuid,noexec,guest

1
tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv Normal file
View File

@ -0,0 +1 @@
mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec

2
tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv Normal file
View File

@ -0,0 +1,2 @@
mount -t glusterfs example.com:/volume /mnt/gluster -o nosuid,noexec,\
direct-io-mode=1

2
tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv Normal file
View File

@ -0,0 +1,2 @@
mount -t glusterfs example.com:/volume /mnt/gluster -o nodev,nosuid,noexec,\
direct-io-mode=1

1
tests/storagepoolxml2argvdata/pool-netfs-linux.argv Normal file
View File

@ -0,0 +1 @@
mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec

48
tests/storagepoolxml2argvtest.c
View File

@ -96,6 +96,8 @@ testCompareXMLToArgvFiles(bool shouldFail,
struct testInfo {
bool shouldFail;
const char *pool;
bool linuxOut;
bool freebsdOut;
};
static int
@ -110,9 +112,19 @@ testCompareXMLToArgvHelper(const void *data)
abs_srcdir, info->pool) < 0)
goto cleanup;
if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s.argv",
abs_srcdir, info->pool) < 0 && !info->shouldFail)
goto cleanup;
if (info->linuxOut) {
if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s-linux.argv",
abs_srcdir, info->pool) < 0 && !info->shouldFail)
goto cleanup;
} else if (info->freebsdOut) {
if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s-freebsd.argv",
abs_srcdir, info->pool) < 0 && !info->shouldFail)
goto cleanup;
} else {
if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s.argv",
abs_srcdir, info->pool) < 0 && !info->shouldFail)
goto cleanup;
}
result = testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline);
@ -129,9 +141,9 @@ mymain(void)
{
int ret = 0;
#define DO_TEST_FULL(shouldFail, pool) \
#define DO_TEST_FULL(shouldFail, pool, linuxOut, freebsdOut) \
do { \
struct testInfo info = { shouldFail, pool }; \
struct testInfo info = { shouldFail, pool, linuxOut, freebsdOut }; \
if (virTestRun("Storage Pool XML-2-argv " pool, \
testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \
@ -139,14 +151,19 @@ mymain(void)
while (0);
#define DO_TEST(pool, ...) \
DO_TEST_FULL(false, pool)
DO_TEST_FULL(false, pool, false, false)
#define DO_TEST_FAIL(pool, ...) \
DO_TEST_FULL(true, pool)
DO_TEST_FULL(true, pool, false, false)
#define DO_TEST_LINUX(pool, ...) \
DO_TEST_FULL(false, pool, true, false)
#define DO_TEST_FREEBSD(pool, ...) \
DO_TEST_FULL(false, pool, false, true)
DO_TEST_FAIL("pool-dir");
DO_TEST_FAIL("pool-dir-naming");
DO_TEST("pool-fs");
DO_TEST("pool-logical");
DO_TEST("pool-logical-nopath");
DO_TEST("pool-logical-create");
@ -155,10 +172,25 @@ mymain(void)
DO_TEST_FAIL("pool-disk-device-nopartsep");
DO_TEST_FAIL("pool-iscsi");
DO_TEST_FAIL("pool-iscsi-auth");
#ifdef __linux__
DO_TEST_LINUX("pool-fs");
DO_TEST_LINUX("pool-netfs");
DO_TEST_LINUX("pool-netfs-auto");
DO_TEST_LINUX("pool-netfs-gluster");
DO_TEST_LINUX("pool-netfs-cifs");
#elif defined(__FreeBSD__)
DO_TEST_FREEBSD("pool-fs");
DO_TEST_FREEBSD("pool-netfs");
DO_TEST_FREEBSD("pool-netfs-auto");
DO_TEST_FREEBSD("pool-netfs-gluster");
DO_TEST_FREEBSD("pool-netfs-cifs");
#else
DO_TEST("pool-fs");
DO_TEST("pool-netfs");
DO_TEST("pool-netfs-auto");
DO_TEST("pool-netfs-gluster");
DO_TEST("pool-netfs-cifs");
#endif
DO_TEST_FAIL("pool-scsi");
DO_TEST_FAIL("pool-scsi-type-scsi-host");
DO_TEST_FAIL("pool-scsi-type-fc-host");