mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Take user namespaces into account in policy checks
Change file related checks to use user namespaces and make sure involved uids/gids are mappable in the current namespace. Note that checks without file ownership information will still not take user namespaces into account, as some of these should be handled via 'zfs allow' (otherwise root in a user namespace could issue commands such as `zpool export`). This also adds an initial user namespace regression test for the setgid bit loss, with a user_ns_exec helper usable in further tests. Additionally, configure checks for the required user namespace related features are added for: * ns_capable * kuid/kgid_has_mapping() * user_ns in cred_t Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Closes #6800 Closes #7270
This commit is contained in:
Wolfgang Bumiller
committed by
Tony Hutter
Tony Hutter
parent
c17922b8a9
commit
3808006edf
@@ -648,6 +648,10 @@ tags = ['functional', 'truncate']
|
||||
tests = [ 'upgrade_userobj_001_pos' ]
|
||||
tags = ['functional', 'upgrade']
|
||||
|
||||
[tests/functional/user_namespace]
|
||||
tests = ['user_namespace_001']
|
||||
tags = ['functional', 'user_namespace']
|
||||
|
||||
[tests/functional/userquota]
|
||||
tests = [
|
||||
'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos',
|
||||
|
||||
@@ -2,6 +2,7 @@ EXTRA_DIST = file_common.h
|
||||
|
||||
SUBDIRS = \
|
||||
chg_usr_exec \
|
||||
user_ns_exec \
|
||||
devname2devid \
|
||||
dir_rd_update \
|
||||
file_check \
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/user_ns_exec
|
||||
@@ -0,0 +1,6 @@
|
||||
include $(top_srcdir)/config/Rules.am
|
||||
|
||||
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin
|
||||
|
||||
pkgexec_PROGRAMS = user_ns_exec
|
||||
user_ns_exec_SOURCES = user_ns_exec.c
|
||||
@@ -0,0 +1,179 @@
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sched.h>
|
||||
|
||||
#define EXECSHELL "/bin/sh"
|
||||
#define UIDMAP "0 100000 65536"
|
||||
|
||||
static int
|
||||
child_main(int argc, char *argv[], int sync_pipe)
|
||||
{
|
||||
char sync_buf;
|
||||
char cmds[BUFSIZ] = { 0 };
|
||||
char sep[] = " ";
|
||||
int i, len;
|
||||
|
||||
if (unshare(CLONE_NEWUSER | CLONE_NEWNS) != 0) {
|
||||
perror("unshare");
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* tell parent we entered the new namespace */
|
||||
if (write(sync_pipe, "1", 1) != 1) {
|
||||
perror("write");
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* wait for parent to setup the uid mapping */
|
||||
if (read(sync_pipe, &sync_buf, 1) != 1) {
|
||||
(void) fprintf(stderr, "user namespace setup failed\n");
|
||||
return (1);
|
||||
}
|
||||
|
||||
close(sync_pipe);
|
||||
|
||||
if (setuid(0) != 0) {
|
||||
perror("setuid");
|
||||
return (1);
|
||||
}
|
||||
if (setgid(0) != 0) {
|
||||
perror("setgid");
|
||||
return (1);
|
||||
}
|
||||
|
||||
len = 0;
|
||||
for (i = 1; i < argc; i++) {
|
||||
(void) snprintf(cmds+len, sizeof (cmds)-len,
|
||||
"%s%s", argv[i], sep);
|
||||
len += strlen(argv[i]) + strlen(sep);
|
||||
}
|
||||
|
||||
if (execl(EXECSHELL, "sh", "-c", cmds, (char *)NULL) != 0) {
|
||||
perror("execl: " EXECSHELL);
|
||||
return (1);
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
set_idmap(pid_t pid, const char *file)
|
||||
{
|
||||
int result = 0;
|
||||
int mapfd;
|
||||
char path[PATH_MAX];
|
||||
|
||||
(void) snprintf(path, sizeof (path), "/proc/%d/%s", (int)pid, file);
|
||||
|
||||
mapfd = open(path, O_WRONLY);
|
||||
if (mapfd < 0) {
|
||||
result = errno;
|
||||
perror("open");
|
||||
return (errno);
|
||||
}
|
||||
|
||||
if (write(mapfd, UIDMAP, sizeof (UIDMAP)-1) != sizeof (UIDMAP)-1) {
|
||||
perror("write");
|
||||
result = (errno);
|
||||
}
|
||||
|
||||
close(mapfd);
|
||||
|
||||
return (result);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
char sync_buf;
|
||||
int result, wstatus;
|
||||
int syncfd[2];
|
||||
pid_t child;
|
||||
|
||||
if (argc < 2 || strlen(argv[1]) == 0) {
|
||||
(void) printf("\tUsage: %s <commands> ...\n", argv[0]);
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (socketpair(AF_UNIX, SOCK_STREAM, 0, syncfd) != 0) {
|
||||
perror("socketpair");
|
||||
return (1);
|
||||
}
|
||||
|
||||
child = fork();
|
||||
if (child == (pid_t)-1) {
|
||||
perror("fork");
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (child == 0) {
|
||||
close(syncfd[0]);
|
||||
return (child_main(argc, argv, syncfd[1]));
|
||||
}
|
||||
|
||||
close(syncfd[1]);
|
||||
|
||||
result = 0;
|
||||
/* wait for the child to have unshared its namespaces */
|
||||
if (read(syncfd[0], &sync_buf, 1) != 1) {
|
||||
perror("read");
|
||||
kill(child, SIGKILL);
|
||||
result = 1;
|
||||
goto reap;
|
||||
}
|
||||
|
||||
/* write uid mapping */
|
||||
if (set_idmap(child, "uid_map") != 0 ||
|
||||
set_idmap(child, "gid_map") != 0) {
|
||||
result = 1;
|
||||
kill(child, SIGKILL);
|
||||
goto reap;
|
||||
}
|
||||
|
||||
/* tell the child to proceed */
|
||||
if (write(syncfd[0], "1", 1) != 1) {
|
||||
perror("write");
|
||||
kill(child, SIGKILL);
|
||||
result = 1;
|
||||
goto reap;
|
||||
}
|
||||
close(syncfd[0]);
|
||||
|
||||
reap:
|
||||
while (waitpid(child, &wstatus, 0) != child)
|
||||
kill(child, SIGKILL);
|
||||
if (result == 0)
|
||||
result = WEXITSTATUS(wstatus);
|
||||
|
||||
return (result);
|
||||
}
|
||||
@@ -164,4 +164,5 @@ export ZFSTEST_FILES='chg_usr_exec
|
||||
rename_dir
|
||||
rm_lnkcnt_zero_file
|
||||
threadsappend
|
||||
user_ns_exec
|
||||
xattrtest'
|
||||
|
||||
@@ -58,6 +58,7 @@ SUBDIRS = \
|
||||
tmpfile \
|
||||
truncate \
|
||||
upgrade \
|
||||
user_namespace \
|
||||
userquota \
|
||||
vdev_zaps \
|
||||
write_dirs \
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/user_namespace
|
||||
dist_pkgdata_SCRIPTS = \
|
||||
setup.ksh \
|
||||
cleanup.ksh \
|
||||
user_namespace_common.kshlib \
|
||||
user_namespace.cfg \
|
||||
user_namespace_001.ksh
|
||||
@@ -0,0 +1,25 @@
|
||||
#!/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
|
||||
|
||||
default_cleanup
|
||||
@@ -0,0 +1,32 @@
|
||||
#!/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
|
||||
|
||||
if ! [ -f /proc/self/uid_map ]; then
|
||||
log_unsupported "The kernel doesn't support user namespaces."
|
||||
fi
|
||||
|
||||
verify_runnable "both"
|
||||
|
||||
DISK=${DISKS%% *}
|
||||
default_setup $DISK
|
||||
@@ -0,0 +1,23 @@
|
||||
#
|
||||
# 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
|
||||
#
|
||||
|
||||
export ROOT_UID=100000
|
||||
export OTHER_UID=101000
|
||||
@@ -0,0 +1,89 @@
|
||||
#!/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/tests/functional/user_namespace/user_namespace_common.kshlib
|
||||
|
||||
#
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# Regression test for secpolicy_vnode_setids_setgids
|
||||
#
|
||||
#
|
||||
# STRATEGY:
|
||||
# 1. Create files with various owners.
|
||||
# 2. Try to set setgid bit.
|
||||
#
|
||||
|
||||
verify_runnable "both"
|
||||
|
||||
# rroot: real root,
|
||||
# uroot: root within user namespace
|
||||
# uother: other user within user namespace
|
||||
set -A files rroot_rroot uroot_uroot uroot_other uother_uroot uother_uother
|
||||
|
||||
function cleanup
|
||||
{
|
||||
for i in ${files[*]}; do
|
||||
log_must rm -f $TESTDIR/$i
|
||||
done
|
||||
}
|
||||
|
||||
log_onexit cleanup
|
||||
|
||||
log_assert "Check root in user namespaces"
|
||||
|
||||
TOUCH=$(readlink -e $(which touch))
|
||||
CHMOD=$(readlink -e $(which chmod))
|
||||
|
||||
for i in ${files[*]}; do
|
||||
log_must $TOUCH $TESTDIR/$i
|
||||
log_must $CHMOD 0644 $TESTDIR/$i
|
||||
done
|
||||
|
||||
log_must chown 0:0 $TESTDIR/rroot_rroot
|
||||
log_must chown $ROOT_UID:$ROOT_UID $TESTDIR/uroot_uroot
|
||||
log_must chown $ROOT_UID:$OTHER_UID $TESTDIR/uroot_other
|
||||
log_must chown $OTHER_UID:$ROOT_UID $TESTDIR/uother_uroot
|
||||
log_must chown $OTHER_UID:$OTHER_UID $TESTDIR/uother_uother
|
||||
|
||||
log_mustnot user_ns_exec $CHMOD 02755 $TESTDIR/rroot_rroot
|
||||
log_mustnot test -g $TESTDIR/rroot_rroot
|
||||
|
||||
log_must user_ns_exec $CHMOD 02755 $TESTDIR/uroot_uroot
|
||||
log_must test -g $TESTDIR/uroot_uroot
|
||||
|
||||
log_must user_ns_exec $CHMOD 02755 $TESTDIR/uroot_other
|
||||
log_must test -g $TESTDIR/uroot_other
|
||||
|
||||
log_must user_ns_exec $CHMOD 02755 $TESTDIR/uother_uroot
|
||||
log_must test -g $TESTDIR/uother_uroot
|
||||
|
||||
log_must user_ns_exec $CHMOD 02755 $TESTDIR/uother_uother
|
||||
log_must test -g $TESTDIR/uother_uother
|
||||
|
||||
log_mustnot user_ns_exec $TOUCH $TESTDIR/rroot_rroot
|
||||
log_must $CHMOD 0666 $TESTDIR/rroot_rroot
|
||||
for i in ${files[*]}; do
|
||||
log_must user_ns_exec $TOUCH $TESTDIR/$i
|
||||
done
|
||||
|
||||
log_pass "Check root in user namespaces"
|
||||
@@ -0,0 +1,23 @@
|
||||
#
|
||||
# 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
|
||||
. $STF_SUITE/tests/functional/user_namespace/user_namespace.cfg
|
||||
Reference in New Issue
Block a user