mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-23 02:44:41 +03:00
Add recursive dataset mounting and unmounting support to pam_zfs_key (#16857)
Introduced functionality to recursively mount datasets with a new config option `mount_recursively`. Adjusted existing functions to handle the recursive behavior and added tests to validate the feature. This enhances support for managing hierarchical ZFS datasets within a PAM context. Signed-off-by: Jerzy Kołosowski <jerzy@kolosowscy.pl> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov>
This commit is contained in:
committed by
Ameer Hamza
parent
0e21e473a7
commit
1aa4351c1f
@@ -27,8 +27,8 @@ tests = ['zfs_jail_001_pos']
|
||||
tags = ['functional', 'cli_root', 'zfs_jail']
|
||||
|
||||
[tests/functional/pam:FreeBSD]
|
||||
tests = ['pam_basic', 'pam_change_unmounted', 'pam_nounmount', 'pam_recursive',
|
||||
'pam_short_password']
|
||||
tests = ['pam_basic', 'pam_change_unmounted', 'pam_mount_recursively',
|
||||
'pam_nounmount', 'pam_recursive', 'pam_short_password']
|
||||
tags = ['functional', 'pam']
|
||||
|
||||
[tests/functional/direct:FreeBSD]
|
||||
|
||||
@@ -169,8 +169,8 @@ tests = ['umount_unlinked_drain']
|
||||
tags = ['functional', 'mount']
|
||||
|
||||
[tests/functional/pam:Linux]
|
||||
tests = ['pam_basic', 'pam_change_unmounted', 'pam_nounmount', 'pam_recursive',
|
||||
'pam_short_password']
|
||||
tests = ['pam_basic', 'pam_change_unmounted', 'pam_mount_recursively',
|
||||
'pam_nounmount', 'pam_recursive', 'pam_short_password']
|
||||
tags = ['functional', 'pam']
|
||||
|
||||
[tests/functional/procfs:Linux]
|
||||
|
||||
@@ -1695,6 +1695,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
|
||||
functional/pam/cleanup.ksh \
|
||||
functional/pam/pam_basic.ksh \
|
||||
functional/pam/pam_change_unmounted.ksh \
|
||||
functional/pam/pam_mount_recursively.ksh \
|
||||
functional/pam/pam_nounmount.ksh \
|
||||
functional/pam/pam_recursive.ksh \
|
||||
functional/pam/pam_short_password.ksh \
|
||||
|
||||
@@ -26,5 +26,6 @@ rmconfig
|
||||
destroy_pool $TESTPOOL
|
||||
del_user ${username}
|
||||
del_user ${username}rec
|
||||
del_user ${username}mrec
|
||||
del_group pamtestgroup
|
||||
log_must rm -rf "$runstatedir"
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
#!/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}mrec"
|
||||
|
||||
# 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/mrec"
|
||||
log_must zfs create -o mountpoint="$TESTDIR/mrec" "$TESTPOOL/mrec/pam"
|
||||
echo "recurpass" | zfs create -o encryption=aes-256-gcm -o keyformat=passphrase \
|
||||
-o keylocation=prompt "$TESTPOOL/mrec/pam/${username}"
|
||||
log_must zfs create "$TESTPOOL/mrec/pam/${username}/deep"
|
||||
log_must zfs create "$TESTPOOL/mrec/pam/${username}/deep/deeper"
|
||||
log_must zfs create -o mountpoint=none "$TESTPOOL/mrec/pam/${username}/deep/none"
|
||||
log_must zfs create -o canmount=noauto "$TESTPOOL/mrec/pam/${username}/deep/noauto"
|
||||
log_must zfs create -o canmount=off "$TESTPOOL/mrec/pam/${username}/deep/off"
|
||||
log_must zfs unmount "$TESTPOOL/mrec/pam/${username}"
|
||||
log_must zfs unload-key "$TESTPOOL/mrec/pam/${username}"
|
||||
log_must add_user pamtestgroup ${username} "$TESTDIR/mrec"
|
||||
|
||||
function keystatus {
|
||||
log_must [ "$(get_prop keystatus "$TESTPOOL/mrec/pam/${username}")" = "$1" ]
|
||||
}
|
||||
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}"
|
||||
keystatus unavailable
|
||||
|
||||
function test_session {
|
||||
echo "recurpass" | pamtester ${pamservice} ${username} open_session
|
||||
references 1
|
||||
log_must ismounted "$TESTPOOL/mrec/pam/${username}"
|
||||
log_must ismounted "$TESTPOOL/mrec/pam/${username}/deep"
|
||||
log_must ismounted "$TESTPOOL/mrec/pam/${username}/deep/deeper"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/none"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/noauto"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/off"
|
||||
keystatus available
|
||||
|
||||
log_must pamtester ${pamservice} ${username} close_session
|
||||
references 0
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/deeper"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/none"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/noauto"
|
||||
log_mustnot ismounted "$TESTPOOL/mrec/pam/${username}/deep/off"
|
||||
keystatus unavailable
|
||||
}
|
||||
|
||||
genconfig "homes=$TESTPOOL/mrec/pam mount_recursively runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=$TESTPOOL/mrec/pam prop_mountpoint mount_recursively runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=$TESTPOOL/mrec recursive_homes prop_mountpoint mount_recursively runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=$TESTPOOL recursive_homes prop_mountpoint mount_recursively runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
genconfig "homes=* recursive_homes prop_mountpoint mount_recursively runstatedir=${runstatedir}"
|
||||
test_session
|
||||
|
||||
log_pass "done."
|
||||
Reference in New Issue
Block a user