mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-23 10:54:35 +03:00
PAM: add 'recursive_homes' flag to use with 'prop_mountpoint'
It's not always desirable to have a fixed flat homes directory. With the 'recursive_homes' flag, 'prop_mountpoint' search would traverse the whole tree starting at 'homes' (which can now be '*' to mean all pools) to find a dataset with a mountpoint matching the home directory. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Felix Dörre <felix@dogcraft.de> Signed-off-by: Val Packett <val@packett.cool> Closes #14834
This commit is contained in:
committed by
Brian Behlendorf
parent
bd4962b5ac
commit
850bccd3bc
@@ -140,7 +140,7 @@ tests = ['umount_unlinked_drain']
|
||||
tags = ['functional', 'mount']
|
||||
|
||||
[tests/functional/pam:Linux]
|
||||
tests = ['pam_basic', 'pam_nounmount', 'pam_short_password']
|
||||
tests = ['pam_basic', 'pam_nounmount', 'pam_recursive', 'pam_short_password']
|
||||
tags = ['functional', 'pam']
|
||||
|
||||
[tests/functional/procfs:Linux]
|
||||
|
||||
@@ -25,5 +25,6 @@
|
||||
rmconfig
|
||||
destroy_pool $TESTPOOL
|
||||
del_user ${username}
|
||||
del_user ${username}rec
|
||||
del_group pamtestgroup
|
||||
log_must rm -rf "$runstatedir" $TESTDIRS
|
||||
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
#!/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 https://opensource.org/licenses/CDDL-1.0.
|
||||
# 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/tests/functional/pam/utilities.kshlib
|
||||
|
||||
if [ -n "$ASAN_OPTIONS" ]; then
|
||||
export LD_PRELOAD=$(ldd "$(command -v zfs)" | awk '/libasan\.so/ {print $3}')
|
||||
fi
|
||||
|
||||
username="${username}rec"
|
||||
|
||||
# Set up a deeper hierarchy, a mountpoint that doesn't interfere with other tests,
|
||||
# and a user which references that mountpoint
|
||||
log_must zfs create "$TESTPOOL/pampam"
|
||||
log_must zfs create -o mountpoint="$TESTDIR/rec" "$TESTPOOL/pampam/pam"
|
||||
echo "recurpass" | zfs create -o encryption=aes-256-gcm -o keyformat=passphrase \
|
||||
-o keylocation=prompt "$TESTPOOL/pampam/pam/${username}"
|
||||
log_must zfs unmount "$TESTPOOL/pampam/pam/${username}"
|
||||
log_must zfs unload-key "$TESTPOOL/pampam/pam/${username}"
|
||||
log_must add_user pamtestgroup ${username} "$TESTDIR/rec"
|
||||
|
||||
function keystatus {
|
||||
log_must [ "$(get_prop keystatus "$TESTPOOL/pampam/pam/${username}")" = "$1" ]
|
||||
}
|
||||
|
||||
log_mustnot ismounted "$TESTPOOL/pampam/pam/${username}"
|
||||
keystatus unavailable
|
||||
|
||||
function test_session {
|
||||
echo "recurpass" | pamtester ${pamservice} ${username} open_session
|
||||
references 1
|
||||
log_must ismounted "$TESTPOOL/pampam/pam/${username}"
|
||||
keystatus available
|
||||
|
||||
log_must pamtester ${pamservice} ${username} close_session
|
||||
references 0
|
||||
log_mustnot ismounted "$TESTPOOL/pampam/pam/${username}"
|
||||
keystatus unavailable
|
||||
}
|
||||
|
||||
genconfig "homes=$TESTPOOL/pampam/pam prop_mountpoint runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=$TESTPOOL/pampam recursive_homes prop_mountpoint runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=$TESTPOOL recursive_homes prop_mountpoint runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=* recursive_homes prop_mountpoint runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
log_pass "done."
|
||||
Reference in New Issue
Block a user