CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: riastradh
Date: Sat Aug 5 13:13:37 UTC 2023
Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh
Log Message:
tests/lib/librumphijack: Avoid trying to run rpcbind as non-root.
Can probably make this work through rumphijack, but there's no sense
in even trying the test if we can't, so let's reduce the unprivileged
false alarms.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/lib/librumphijack/t_tcpip.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.22 src/tests/lib/librumphijack/t_tcpip.sh:1.23
--- src/tests/lib/librumphijack/t_tcpip.sh:1.22 Sun May 28 08:17:00 2023
+++ src/tests/lib/librumphijack/t_tcpip.sh Sat Aug 5 13:13:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.22 2023/05/28 08:17:00 hannken Exp $
+# $NetBSD: t_tcpip.sh,v 1.23 2023/08/05 13:13:37 riastradh Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -229,6 +229,11 @@ atf_test_case nfs cleanup
nfs_head()
{
atf_set "descr" "Test hijacked nfsd and mount_nfs"
+
+ # XXX Can probably make this work as nonroot, but need to
+ # convince rpcbind running in the rump kernel server that it
+ # has uid 0.
+ atf_set "require.user" "root"
}
nfs_body()
@@ -250,6 +255,11 @@ atf_test_case nfs_autoload cleanup
nfs_autoload_head()
{
atf_set "descr" "Test hijacked nfsd with autoload from /stand"
+
+ # XXX Can probably make this work as nonroot, but need to
+ # convince rpcbind running in the rump kernel server that it
+ # has uid 0.
+ atf_set "require.user" "root"
}
nfs_autoload_body()
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: riastradh Date: Sat Aug 5 13:13:37 UTC 2023 Modified Files: src/tests/lib/librumphijack: t_tcpip.sh Log Message: tests/lib/librumphijack: Avoid trying to run rpcbind as non-root. Can probably make this work through rumphijack, but there's no sense in even trying the test if we can't, so let's reduce the unprivileged false alarms. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/tests/lib/librumphijack/t_tcpip.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: gson
Date: Thu Nov 11 07:38:21 UTC 2021
Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh
Log Message:
The nfs_autoload test case has now been broken for more than four years.
Mark it as an expected failure with a reference to PR kern/54184.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/librumphijack/t_tcpip.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.20 src/tests/lib/librumphijack/t_tcpip.sh:1.21
--- src/tests/lib/librumphijack/t_tcpip.sh:1.20 Fri Sep 10 21:21:35 2021
+++ src/tests/lib/librumphijack/t_tcpip.sh Thu Nov 11 07:38:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.20 2021/09/10 21:21:35 christos Exp $
+# $NetBSD: t_tcpip.sh,v 1.21 2021/11/11 07:38:21 gson Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -254,6 +254,7 @@ nfs_autoload_head()
nfs_autoload_body()
{
[ `uname -m` = "i386" ] || atf_skip "test currently valid only on i386"
+ atf_expect_fail "PR lib/54184"
test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net \
-lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif \
-lrumpdev_disk -d key=/dk,hostpath=ffs.img,size=host
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: gson Date: Thu Nov 11 07:38:21 UTC 2021 Modified Files: src/tests/lib/librumphijack: t_tcpip.sh Log Message: The nfs_autoload test case has now been broken for more than four years. Mark it as an expected failure with a reference to PR kern/54184. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tests/lib/librumphijack/t_tcpip.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: christos Date: Tue Sep 21 15:56:55 UTC 2021 Modified Files: src/tests/lib/librumphijack: sshd_config.in Log Message: UsePrivilegeSeparation is no more To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/sshd_config.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/librumphijack/sshd_config.in diff -u src/tests/lib/librumphijack/sshd_config.in:1.1 src/tests/lib/librumphijack/sshd_config.in:1.2 --- src/tests/lib/librumphijack/sshd_config.in:1.1 Mon Feb 14 10:14:00 2011 +++ src/tests/lib/librumphijack/sshd_config.in Tue Sep 21 11:56:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: sshd_config.in,v 1.1 2011/02/14 15:14:00 pooka Exp $ +# $NetBSD: sshd_config.in,v 1.2 2021/09/21 15:56:55 christos Exp $ # Basic settings. Port 22 @@ -22,7 +22,6 @@ StrictModes no # Some settings to allow user runs of sshd. PidFile @WORKDIR@/sshd.pid UsePam no -UsePrivilegeSeparation no # The root user should also be able to run the tests. PermitRootLogin yes
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: christos Date: Tue Sep 21 15:56:55 UTC 2021 Modified Files: src/tests/lib/librumphijack: sshd_config.in Log Message: UsePrivilegeSeparation is no more To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/sshd_config.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: christos
Date: Fri Sep 10 21:21:35 UTC 2021
Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh
Log Message:
fix the ssh rump test
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/lib/librumphijack/t_tcpip.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.19 src/tests/lib/librumphijack/t_tcpip.sh:1.20
--- src/tests/lib/librumphijack/t_tcpip.sh:1.19 Mon May 13 13:55:08 2019
+++ src/tests/lib/librumphijack/t_tcpip.sh Fri Sep 10 17:21:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.19 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: t_tcpip.sh,v 1.20 2021/09/10 21:21:35 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,12 +91,14 @@ start_sshd() {
atf_check -s eq:0 -o empty -e empty chmod 400 ssh_host_key
atf_check -s eq:0 -o empty -e empty chmod 444 ssh_host_key.pub
+# Start in debugging mode so we don't have parent<->child privsep stuff
env LD_PRELOAD=/usr/lib/librumphijack.so \
- /usr/sbin/sshd -e -f ./sshd_config
- while [ ! -f sshd.pid ]; do
- sleep 0.01
- done
- echo "SSH server started (pid $(cat sshd.pid))"
+ /usr/sbin/sshd -d -e -E out -f ./sshd_config &
+# while [ ! -f sshd.pid ]; do
+# sleep 0.01
+# done
+# echo "SSH server started (pid $(cat sshd.pid))"
+ sleep 1
echo "Setting up SSH client configuration"
atf_check -s eq:0 -o empty -e empty \
@@ -122,8 +124,6 @@ ssh_head()
ssh_body()
{
- atf_expect_fail "PR lib/50174"
-
atf_check -s exit:0 ${rumpnetsrv} ${RUMP_SERVER}
# make sure clients die after we nuke the server
export RUMPHIJACK_RETRYCONNECT='die'
@@ -137,7 +137,8 @@ ssh_body()
jot 11 12 | xargs mkdir
cd ..
- atf_check -s exit:0 -o save:ssh.out\
+ # ignore stderr for now, prints environment in debug mode
+ atf_check -s exit:0 -o save:ssh.out -e ignore \
env LD_PRELOAD=/usr/lib/librumphijack.so \
ssh -T -F ssh_config 127.0.0.1 env BLOCKSIZE=512 \
ls -li $(pwd)/testdir
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: christos Date: Fri Sep 10 21:21:35 UTC 2021 Modified Files: src/tests/lib/librumphijack: t_tcpip.sh Log Message: fix the ssh rump test To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/lib/librumphijack/t_tcpip.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
