DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-05 04:15:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: make system test users configurable

Browse Source
This commit is contained in:
Miroslav Lichvar
2024-11-14 10:53:35 +01:00
parent c85ec4ff0f
commit bb8050d884
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/system/006-privdrop
View File

@@ -4,7 +4,7 @@
check_chronyd_features PRIVDROP || test_skip "PRIVDROP support disabled" check_chronyd_features PRIVDROP || test_skip "PRIVDROP support disabled"
user="nobody" priv_drop=1
test_start "dropping of root privileges" test_start "dropping of root privileges"

2
test/system/010-nts
View File

@@ -22,7 +22,7 @@ certtool --generate-privkey --key-type=ed25519 --outfile $TEST_DIR/server.key \
&> $TEST_DIR/certtool.log &> $TEST_DIR/certtool.log
certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \ certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \
--template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log --template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log
chown $user $TEST_DIR/server.* chown "$(get_user)" $TEST_DIR/server.*
ntpport=$(get_free_port) ntpport=$(get_free_port)
ntsport=$(get_free_port) ntsport=$(get_free_port)

2
test/system/011-systemd
View File

@@ -26,7 +26,7 @@ certtool --generate-privkey --key-type=ed25519 --outfile $TEST_DIR/server.key \
&> $TEST_DIR/certtool.log &> $TEST_DIR/certtool.log
certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \ certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \
--template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log --template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log
chown $user $TEST_DIR/server.* chown "$(get_user)" $TEST_DIR/server.*
ntpport=$(get_free_port) ntpport=$(get_free_port)
ntsport=$(get_free_port) ntsport=$(get_free_port)

3
test/system/104-systemdirs
View File

@@ -3,10 +3,11 @@
TEST_LIBDIR=${CHRONY_LIBDIR:-/var/lib/chrony} TEST_LIBDIR=${CHRONY_LIBDIR:-/var/lib/chrony}
TEST_LOGDIR=${CHRONY_LOGDIR:-/var/log/chrony} TEST_LOGDIR=${CHRONY_LOGDIR:-/var/log/chrony}
TEST_RUNDIR=${CHRONY_RUNDIR:-/var/run/chrony} TEST_RUNDIR=${CHRONY_RUNDIR:-/var/run/chrony}
TEST_PRIVDROP_USER=$(ls -ld "$TEST_RUNDIR" 2> /dev/null | awk '{print $3}')
. ./test.common . ./test.common
user=$(ls -ld "$TEST_RUNDIR" 2> /dev/null | awk '{print $3}') priv_drop=1
test_start "system directories" test_start "system directories"

21
test/system/test.common
View File

@@ -21,8 +21,12 @@ TEST_LIBDIR=${TEST_LIBDIR:-$TEST_DIR}
TEST_LOGDIR=${TEST_LOGDIR:-$TEST_DIR} TEST_LOGDIR=${TEST_LOGDIR:-$TEST_DIR}
TEST_RUNDIR=${TEST_RUNDIR:-$TEST_DIR} TEST_RUNDIR=${TEST_RUNDIR:-$TEST_DIR}
TEST_SCFILTER=${TEST_SCFILTER:-0} TEST_SCFILTER=${TEST_SCFILTER:-0}
TEST_ROOT_USER=${TEST_ROOT_USER:-root}
TEST_PRIVDROP_USER=${TEST_PRIVDROP_USER:-nobody}
test_start() { test_start() {
local user=$(get_user)
check_chronyd_features NTP CMDMON || test_skip "NTP/CMDMON support disabled" check_chronyd_features NTP CMDMON || test_skip "NTP/CMDMON support disabled"
[ "${#TEST_DIR}" -ge 5 ] || test_skip "invalid TEST_DIR" [ "${#TEST_DIR}" -ge 5 ] || test_skip "invalid TEST_DIR"
@@ -36,7 +40,7 @@ test_start() {
rm -f "$TEST_LIBDIR"/* "$TEST_LOGDIR"/* "$TEST_RUNDIR"/* rm -f "$TEST_LIBDIR"/* "$TEST_LOGDIR"/* "$TEST_RUNDIR"/*
if [ "$user" != "root" ]; then if [ "$user" != "$TEST_ROOT_USER" ]; then
id -u "$user" > /dev/null 2> /dev/null || test_skip "missing user $user" id -u "$user" > /dev/null 2> /dev/null || test_skip "missing user $user"
chown "$user:$(id -g "$user")" "$TEST_DIR" || test_skip "could not chown $TEST_DIR" chown "$user:$(id -g "$user")" "$TEST_DIR" || test_skip "could not chown $TEST_DIR"
su "$user" -s /bin/sh -c "touch $TEST_DIR/test" 2> /dev/null || \ su "$user" -s /bin/sh -c "touch $TEST_DIR/test" 2> /dev/null || \
@@ -108,7 +112,7 @@ default_clock_control=0
default_server=127.0.0.1 default_server=127.0.0.1
default_server_name=127.0.0.1 default_server_name=127.0.0.1
default_server_options="" default_server_options=""
default_user=root default_priv_drop=0
# Initialize test settings from their defaults # Initialize test settings from their defaults
for defoptname in ${!default_*}; do for defoptname in ${!default_*}; do
@@ -183,6 +187,14 @@ get_cmdsocket() {
echo "$TEST_RUNDIR/chronyd.sock" echo "$TEST_RUNDIR/chronyd.sock"
} }
get_user() {
if [ "$priv_drop" -ne 0 ]; then
echo "$TEST_PRIVDROP_USER"
else
echo "$TEST_ROOT_USER"
fi
}
# Find a free port in the 10000-20000 range (their use is racy) # Find a free port in the 10000-20000 range (their use is racy)
get_free_port() { get_free_port() {
local port local port
@@ -197,8 +209,9 @@ get_free_port() {
} }
generate_chrony_conf() { generate_chrony_conf() {
local ntpport cmdport local user ntpport cmdport
user=$(get_user)
ntpport=$(get_free_port) ntpport=$(get_free_port)
cmdport=$(get_free_port) cmdport=$(get_free_port)
@@ -246,7 +259,7 @@ get_chronyd_options() {
[ "$clock_control" -eq 0 ] && echo "-x" [ "$clock_control" -eq 0 ] && echo "-x"
echo "-l $(get_logfile)" echo "-l $(get_logfile)"
echo "-f $(get_conffile)" echo "-f $(get_conffile)"
echo "-u $user" echo "-u $(get_user)"
echo "-F $TEST_SCFILTER" echo "-F $TEST_SCFILTER"
echo "$extra_chronyd_options" echo "$extra_chronyd_options"
} }