From nobody Wed Aug 27 18:40:43 2025 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 4cBtdR5XQdz65S20; Wed, 27 Aug 2025 18:40:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBtdR2BCXz3x00; Wed, 27 Aug 2025 18:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756320043; 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=r1PRkshPNIhfdWMPSOJXrv0+TcZkEJJXIYqdZ8dSQfU=; b=Yl1VONfx2eIItQrPbHBSLa+cDktmm7S5wHaRADofJCn6lJzsMC1wMa/QSmNuLixhj3HjgP ReoKM8W6yiw7JsGakT/aEuXybpVtvFItqpC4V3yGBWXiAItsZIjTZ4pv5WI8TmVHdFwTF0 N/D1llekCJTpP+Fc0ZLnF841Iw4QUERYGF0MSr6Ct3ZMcl01K9JWR0QUjvjY1ZCQubh3fl KlLGqQKooi0koCYAIJQyLqsvA3wdQ5SoFZ3MSWe3a84AQ9y8x7ewUCUEmBOq+00yu8top2 nJrBRbMCLgdCH7Sxq7wDj1GgT+mZC5B5IBquZ3CGr3TuhOETcO4Ip7mj2+cHsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756320043; 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=r1PRkshPNIhfdWMPSOJXrv0+TcZkEJJXIYqdZ8dSQfU=; b=Et7hPoOKzbXetPqxOm/ZVauKk9ksVTSWNeH9Iy89/qyB1ipvJLcY9e2RXx4kX4IMincPtT sMCL1RELJurGVyW1tt6IM/chcCdg6nDXVeT7uBb9KVhgRHsmwXnzbCseLCK1e5qwH8eoI+ +2YpfhxtbAyHbzk0vw9VbvGKOxBI6QOzOvqQf/lO8RNT9W+5A6m2VlM4QJttTwyM1yr+oU IK7wAGL++a1Fwpm1YejjBlLBZF0ApA0eO70cYYqA3phwmQXP2AY65POfvMxbYrxoHBiR39 elBATmLzz3ordsmVfbr9rons4TLFq4kCVlSmpzvtbS6hc5Mb8nn3Wf8DYqzrpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756320043; a=rsa-sha256; cv=none; b=rrTKO5QNuPKYN1UPnl/faeFeuo4BxIn6Cvs3mI9T/28jlmtZVKPfV8PIaVzr2Wi7945uKv NDDKxHDf2zDU+FCJ2eCECuumFhIePKed+kcsJwJalX7s7/tGW5tS7VoyYY0p3lZKcqntI3 fbhpi2g7U5G81i/zUZiWPfBLZtKbc91Ucrfz8PEUk7Vcuo26NiCQI/h2gdv3YQkkFx+PFS 07pQnWyP12ab30YSFWw4Z/ml3YXyLGIGmdXXpHH2X2Ky7q44MsCFXIdu0owoY1Tk5accZf SMse0jPlihtaY6scIS3bnhjco+4xjr9JxA2fM7rO9b0lP3csWOmblY+5V0kR9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cBtdR17yZzZ8N; Wed, 27 Aug 2025 18:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RIehGi059812; Wed, 27 Aug 2025 18:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RIehCa059809; Wed, 27 Aug 2025 18:40:43 GMT (envelope-from git) Date: Wed, 27 Aug 2025 18:40:43 GMT Message-Id: <202508271840.57RIehCa059809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b2f394b90062 - main - tzcode: Add a test case for thin jails 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2f394b90062b9f4aee51de4e5fd7513b3db7362 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b2f394b90062b9f4aee51de4e5fd7513b3db7362 commit b2f394b90062b9f4aee51de4e5fd7513b3db7362 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-27 12:27:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:40:09 +0000 tzcode: Add a test case for thin jails Add a test case for a typical thin jail scenario where TZDIR does not exist and we get our information from /etc/localtime. This is technically already covered by the detect_tz_changes test case, but this new test case is independent of the DETECT_TZ_CHANGES option. --- lib/libc/tests/stdtime/detect_tz_changes_test.c | 43 +++++++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index e3fdcc0baef7..ad8c4818669d 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -44,12 +44,6 @@ static const struct tzcase { static const time_t then = 1751328000; /* 2025-07-01 00:00:00 UTC */ -#ifdef DETECT_TZ_CHANGES -static const char *tz_change_interval_sym = "__tz_change_interval"; -static int *tz_change_interval_p; -static const int tz_change_interval = 3; -static int tz_change_timeout = 90; - static bool debugging; static void @@ -89,6 +83,35 @@ change_tz(const char *tzn) debug("time zone %s installed", tzn); } +ATF_TC(thin_jail); +ATF_TC_HEAD(thin_jail, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test typical thin jail scenario"); + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(thin_jail, tc) +{ + const struct tzcase *tzcase = tzcases; + char buf[128]; + struct tm *tm; + size_t len; + + /* prepare chroot */ + ATF_REQUIRE_EQ(0, mkdir("root", 0755)); + ATF_REQUIRE_EQ(0, mkdir("root/etc", 0755)); + change_tz(tzcase->tzfn); + /* enter chroot */ + ATF_REQUIRE_EQ(0, chroot("root")); + ATF_REQUIRE_EQ(0, chdir("/")); + /* check timezone */ + unsetenv("TZ"); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_CHECK_STREQ(tzcase->expect, buf); +} + +#ifdef DETECT_TZ_CHANGES /* * Test time zone change detection. * @@ -106,6 +129,11 @@ change_tz(const char *tzn) * after we've received and discarded the first report from the child, * which should come almost immediately on startup. */ +static const char *tz_change_interval_sym = "__tz_change_interval"; +static int *tz_change_interval_p; +static const int tz_change_interval = 3; +static int tz_change_timeout = 90; + ATF_TC(detect_tz_changes); ATF_TC_HEAD(detect_tz_changes, tc) { @@ -324,9 +352,10 @@ ATF_TC_BODY(tz_env_setugid, tc) ATF_TP_ADD_TCS(tp) { -#ifdef DETECT_TZ_CHANGES debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); + ATF_TP_ADD_TC(tp, thin_jail); +#ifdef DETECT_TZ_CHANGES ATF_TP_ADD_TC(tp, detect_tz_changes); #endif /* DETECT_TZ_CHANGES */ ATF_TP_ADD_TC(tp, tz_env);