From nobody Tue Jul 26 13:41:28 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LsdNm6Z36z4X3lJ; Tue, 26 Jul 2022 13:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LsdNm62GCz442V; Tue, 26 Jul 2022 13:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658842888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uF1CWbtAd2zFwPSSdo/VRrGIXD6pD5ZBY3lX27Ih3g=; b=Q1jtNL2ck3RKmPUrn9yDArWBxFJhs6Ngv5wES6DFXq3PuF98SO92jaXUuIS8WnlDVwwiJR BvbiVAYv3bJje7K/+mjpF+w5N2g8I31Ivtb+GBYeFJh2RFdRjDw+sZ+mU1DTZdRQc7RPUm zE5paQpr37pRBCPUJNtAIqopXXsBTmRXcW8d86yC9a6PyVSp4tmhZZZo01qReLLZdbEOwp h0ANR8/1dj+50T5yJQO8zo5dQkS8Cg7ztQ+3bodajQ2TCUvenqZ392gc1Q1/PGxGYHJYBU dekNeYqJGYzM30m/ftmnduZ0ElwvA+9Kg4l36shMAG8NQtgNYP5bxlW2P7Lvlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LsdNm55Jgzf4T; Tue, 26 Jul 2022 13:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QDfSEv052444; Tue, 26 Jul 2022 13:41:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QDfSSH052443; Tue, 26 Jul 2022 13:41:28 GMT (envelope-from git) Date: Tue, 26 Jul 2022 13:41:28 GMT Message-Id: <202207261341.26QDfSSH052443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e7437ae907c8 - main - rc: Start testing the rc(8) framework (beginning with *_oomprotect) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7437ae907c89bf85a99c5cbb7ddd194a1ff1354 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658842888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uF1CWbtAd2zFwPSSdo/VRrGIXD6pD5ZBY3lX27Ih3g=; b=dc0A7jwCEPHtFkAJ0N1iwVDjLZ+PIEl+qjk0OoPEsJHcKZDpOIifwyyT1OY4wCT49OT3UY TGqBVlUlBsW8s2Aw6IR9/yHfj0lP4eOS84Q8fBfnMZznOTlHr+K+Q5qSRP9Sa9npbxRbgg 1otjbWif2FUH3Q2nIS7sg8C7jcffUh3KUUxJjTfcjSZxDSCdQxEYDdWVgDVUAlyVQ2Ldun BELx55GgH+FZveyN0h4Ns/WLrxUoiFCnXCd/I8wJW7I9++U2XXbS7RYbtOX0uKf84SPzc8 WwKxvkNrg6ekBvcbHZOoWAM532HqhaLcnc3kMiIXwnTUsmJC5z+zMN2ZAM8lUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658842888; a=rsa-sha256; cv=none; b=PfCndkXidy/2SSCbRFNcK7dVV9SCOUUpN/nhb3CsFkD7a7vvct8VQcs3MJ8J9rrr3cAn+x EdQTsX2PsR479IAHdqc2l3gzsiFRKZBkUzWAN/XT1+0hOpxmAlvq61VntfDPtF7BRa0nNu 6rU2gT9Jua3Syk50neO0V/JW3Q7GKkaKkgtkPFExy0ZESo9hgXozzCWyMfiCtVN5kDwVL+ hHN1VMZeTutI3o0nUEEtmHW/h+l/8F26vB/o52T5IKcutwuzzlzusLT+tVKr63Ms+ogSYQ HiOI0R2EaC0z8VQT62lzuHwQvFhQrd8S9nbr4c5/jN8I6PKXnSpD2UHgPWIyvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e7437ae907c89bf85a99c5cbb7ddd194a1ff1354 commit e7437ae907c89bf85a99c5cbb7ddd194a1ff1354 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-07 18:24:27 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-26 13:39:39 +0000 rc: Start testing the rc(8) framework (beginning with *_oomprotect) This change adds 2 tests to make sure that the *_oomprotect variable sets the protection against OOM killer properly within rc(8) scripts. This is also adding the first tests for the rc(8) framework. More tests will be added as we go. PR: 256148 Approved by: des MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35745 --- etc/mtree/BSD.tests.dist | 2 + libexec/rc/Makefile | 3 ++ libexec/rc/tests/Makefile | 3 ++ libexec/rc/tests/rc_subr_test.sh | 103 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index e2dbc478ca64..19b0ccc25936 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -426,6 +426,8 @@ atf-sh .. .. + rc + .. rtld-elf .. tftpd diff --git a/libexec/rc/Makefile b/libexec/rc/Makefile index 974eb8661182..5c35ab677223 100644 --- a/libexec/rc/Makefile +++ b/libexec/rc/Makefile @@ -24,4 +24,7 @@ CONFETCDEFAULTSPACKAGE= rc SUBDIR+= rc.d +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/libexec/rc/tests/Makefile b/libexec/rc/tests/Makefile new file mode 100644 index 000000000000..c44c6db90b77 --- /dev/null +++ b/libexec/rc/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH+= rc_subr_test + +.include diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh new file mode 100644 index 000000000000..0ca790e39a14 --- /dev/null +++ b/libexec/rc/tests/rc_subr_test.sh @@ -0,0 +1,103 @@ +# +# Copyright 2022 Mateusz Piotrowski <0mp@FreeBSD.org> +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# 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. +# + +atf_test_case oomprotect_all +oomprotect_all_head() +{ + atf_set "descr" "Verify that \${name}_oomprotect=all protects " \ + "the command and all its current and future children" + atf_set "require.user" "root" # For protect(1). +} + +oomprotect_all_body() +{ + __name="$(atf_get ident)" + __pidfile="$(mktemp -t "${__name}.pid")" + __childpidfile="$(mktemp -t "${__name}.childpid")" + __script=$(mktemp -t "${__name}.script") + + cat >> "$__script" <<-'LITERAL' + . /etc/rc.subr + name="$1" + pidfile="$2" + _childpidfile="$3" + _rc_arg="$4" + setvar "${name}_oomprotect" all + command="/usr/sbin/daemon" + command_args="-P $pidfile -p $_childpidfile -- /bin/sleep 5" + run_rc_command "$_rc_arg" + LITERAL + + atf_check -s exit:0 -o inline:"Starting ${__name}.\n" -e empty \ + /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestart + atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ + ps -p "$(cat "$__pidfile")" -ax -o flags,flags2 + atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ + ps -p "$(cat "$__childpidfile")" -ax -o flags,flags2 + atf_check -s exit:0 -o ignore -e empty \ + /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestop +} + +atf_test_case oomprotect_yes +oomprotect_yes_head() +{ + atf_set "descr" "Verify that \${name}_oomprotect=yes protects " \ + "the command but not its children" + atf_set "require.user" "root" # For protect(1). +} + +oomprotect_yes_body() +{ + __name="$(atf_get ident)" + __pidfile="$(mktemp -t "${__name}.pid")" + __script=$(mktemp -t "${__name}.script") + + cat >> "$__script" <<-'LITERAL' + . /etc/rc.subr + name="$1" + pidfile="$2" + _rc_arg="$3" + setvar "${name}_oomprotect" yes + procname="/bin/sleep" + command="/usr/sbin/daemon" + command_args="-p $pidfile -- $procname 5" + run_rc_command "$_rc_arg" + LITERAL + + atf_check -s exit:0 -o inline:"Starting ${__name}.\n" -e empty \ + /bin/sh "$__script" "$__name" "$__pidfile" onestart + atf_check -s exit:0 -o match:'^..1..... .......0$' -e empty \ + ps -p "$(cat "$__pidfile")" -ax -o flags,flags2 + atf_check -s exit:0 -o ignore -e empty \ + /bin/sh "$__script" "$__name" "$__pidfile" onestop +} + +atf_init_test_cases() +{ + atf_add_test_case oomprotect_all + atf_add_test_case oomprotect_yes +}