diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh index 2ad6a1a5c358..a4d4d54bb052 100644 --- a/bin/hostname/tests/hostname_test.sh +++ b/bin/hostname/tests/hostname_test.sh @@ -1,90 +1,93 @@ #- # SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2024 Lin Lee # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # # These tests need to run in a multibyte locale with non-localized # error messages. # export LC_CTYPE=C.UTF-8 export LC_MESSAGES=C test_jail_name="test-hostname-jail" test_jail_conf='%%test_jail_name%% { host.hostname = "test-hostname.example.org"; path = "/"; persist; }' init() { if ! which -s jail; then atf_skip "This test requires jail" fi echo "${test_jail_conf}" | \ sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" jail -f "./jail.conf" -c ${test_jail_name} } recycle() { jail -f "./jail.conf" -r ${test_jail_name} rm "./jail.conf" } atf_test_case basic cleanup basic_head() { atf_set require.user root atf_set "descr" "basic test for getting hostname" } basic_body() { init result=$(jexec ${test_jail_name} "hostname") atf_check_equal "test-hostname.example.org" "${result}" result=$(jexec ${test_jail_name} "hostname" -s) atf_check_equal "test-hostname" "${result}" result=$(jexec ${test_jail_name} "hostname" -d) atf_check_equal "example.org" "${result}" jexec ${test_jail_name} "hostname" "test-bsd2" result=$(jexec ${test_jail_name} "hostname") atf_check_equal "test-bsd2" "${result}" } basic_cleanup() { + if ! which -s jail; then + atf_skip "This test requires jail" + fi recycle } atf_init_test_cases() { atf_add_test_case basic } diff --git a/sys/kern/sysctl_security_jail_children.sh b/sys/kern/sysctl_security_jail_children.sh index 6ac6aa904dbc..d4c57915880f 100644 --- a/sys/kern/sysctl_security_jail_children.sh +++ b/sys/kern/sysctl_security_jail_children.sh @@ -1,83 +1,83 @@ # # SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2024 Igor Ostapenko # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # Even being is_exclusive="true" this test does not expect a host to spawn # other jails during the test execution. # atf_test_case "max_cur" "cleanup" max_cur_head() { atf_set descr 'Test maximum and current number of child jails' atf_set require.user root - if ! which -s jail; then - atf_skip "This test requires jail" - fi } max_cur_body() { + if ! which -s jail; then + atf_skip "This test requires jail" + fi origin_max=$(sysctl -n security.jail.children.max) origin_cur=$(sysctl -n security.jail.children.cur) # Magic numbers reasoning: # 3 stands for: # - the test creates three jails: childfree, maxallowed, maxallowed.family # 6 stands for: # - maxallowed.family wants to set children.max=4 # - it means that its parent (maxallowed) should have at least children.max=5 # - it makes the origin (parent of maxallowed) provide children.max=6 minimum # test $origin_cur -le $origin_max || atf_fail "Abnormal cur=$origin_cur > max=$origin_max." test $((origin_max - origin_cur)) -ge 3 || atf_skip "Not enough child jails are allowed for the test." test $origin_max -ge 6 || atf_skip "Not high enough children.max limit for the test." jail -c name=childfree persist atf_check_equal "$((origin_cur + 1))" "$(sysctl -n security.jail.children.cur)" atf_check_equal "0" "$(jexec childfree sysctl -n security.jail.children.max)" atf_check_equal "0" "$(jexec childfree sysctl -n security.jail.children.cur)" jail -c name=maxallowed children.max=$((origin_max - 1)) persist atf_check_equal "$((origin_cur + 2))" "$(sysctl -n security.jail.children.cur)" atf_check_equal "$((origin_max - 1))" "$(jexec maxallowed sysctl -n security.jail.children.max)" atf_check_equal "0" "$(jexec maxallowed sysctl -n security.jail.children.cur)" jexec maxallowed jail -c name=family children.max=4 persist atf_check_equal "$((origin_cur + 3))" "$(sysctl -n security.jail.children.cur)" atf_check_equal "1" "$(jexec maxallowed sysctl -n security.jail.children.cur)" atf_check_equal "4" "$(jexec maxallowed.family sysctl -n security.jail.children.max)" atf_check_equal "0" "$(jexec maxallowed.family sysctl -n security.jail.children.cur)" } max_cur_cleanup() { jail -r maxallowed jail -r childfree return 0 } atf_init_test_cases() { atf_add_test_case "max_cur" }