Skip to content

Commit

Permalink
tests: add zfs_unshare_008_pos checking whitespace escaping
Browse files Browse the repository at this point in the history
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
  • Loading branch information
nabijaczleweli committed Mar 6, 2022
1 parent d8be327 commit 7142361
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/runfiles/common.run
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ tags = ['functional', 'cli_root', 'zfs_unmount']
[tests/functional/cli_root/zfs_unshare]
tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos',
'zfs_unshare_004_neg', 'zfs_unshare_005_neg', 'zfs_unshare_006_pos',
'zfs_unshare_007_pos']
'zfs_unshare_007_pos', 'zfs_unshare_008_pos']
tags = ['functional', 'cli_root', 'zfs_unshare']

[tests/functional/cli_root/zfs_upgrade]
Expand Down
12 changes: 12 additions & 0 deletions tests/zfs-tests/include/libtest.shlib
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,18 @@ function datasetnonexists
return 0
}

# FreeBSD breaks exports(5) at whitespace and doesn't process escapes
# Solaris just breaks
#
# cf. https://github.com/openzfs/zfs/pull/13165#issuecomment-1059845807
#
# Linux can have spaces (which are \OOO-escaped),
# but can't have backslashes because they're parsed recursively
function shares_can_have_whitespace
{
is_linux
}

function is_shared_freebsd
{
typeset fs=$1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ dist_pkgdata_SCRIPTS = \
zfs_unshare_004_neg.ksh \
zfs_unshare_005_neg.ksh \
zfs_unshare_006_pos.ksh \
zfs_unshare_007_pos.ksh
zfs_unshare_007_pos.ksh \
zfs_unshare_008_pos.ksh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/ksh -p
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#

. $STF_SUITE/include/libtest.shlib

#
# DESCRIPTION:
# Verify that datasets mounted at directories with space are properly escaped
# both going in (for mountd consumption) and going out (for removing from export list)
#
# STRATEGY:
# 1. Create and share a dataset with spaces, tabs, and newlines
# 2. Verify it's shared
# 3. Unshare it
# 4. Verify it's not shared
#
# This relies heavily on proper escape handling in libtest.shlib
#

shares_can_have_whitespace || log_unsupported "Platform doesn't permit whitespace in NFS shares"
basename='a + b
c d'

verify_runnable "global"

function cleanup
{
datasetexists "$TESTPOOL/$TESTFS/shared1" && \
destroy_dataset "$TESTPOOL/$TESTFS/shared1" -f
}

log_assert "Datasets with spaces are properly shared and unshared."
log_onexit cleanup

log_must zfs create -o sharenfs=on -o mountpoint="$TESTDIR/$basename" "$TESTPOOL/$TESTFS/shared1"
log_must is_shared "$TESTDIR/$basename"
log_must zfs unshare "$TESTPOOL/$TESTFS/shared1"
log_mustnot is_shared "$TESTDIR/$basename"

log_pass "Datasets with spaces are properly shared and unshared."

0 comments on commit 7142361

Please sign in to comment.