From nobody Mon Aug 25 11:57:07 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 4c9Tmg5KQ9z65gY9; Mon, 25 Aug 2025 11:57:07 +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 4c9Tmg4ZSQz4LGg; Mon, 25 Aug 2025 11:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756123027; 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=1pww7/UkDUhY63qaitpGQSvUrL4X0/m8snt+1Ooa54w=; b=RlfiU80cySwZhQt+uO667k+I/qa+HmJSgSKUSHrcoevD9Wzi23vt/6vzld22yxpiKC8wdD ibnifFFzHZEuskdOo0n7ghWD4toeaLU3laoSsdkNMrutsNATBZp1v6Io7bpus9GXSBMcYH h5ghUli+4lIUbmWJF5EBLEpVwPCaHp4OZGziNhlJuVAOH18sKs5kuy3LgOnhWnkMgFl1Nk 3C3mnri1zdR9xPjuUJlbIfjkHlU7oDVobpNCJx0Mjd3lCyd+trlaJUg8gbZMnSQhL3kZdE ndzAzfKsSKcCK0eILJBzsb7N87iLVkxuHf6uiCkQU7bL1ME4GAZIa47k3PIYVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756123027; 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=1pww7/UkDUhY63qaitpGQSvUrL4X0/m8snt+1Ooa54w=; b=jiIXjd3JTOjYVYzhe+X3qOIiP4jb6Hn7fEIE0roB+9TF5X/QpAGCvFUBv84NLz47bOmL+6 TRJYgPQodKU9MJpy639oKHwCnQMr1VXo4kEfSCn4c0VCi+4XQq+E3Zp11cs6je1u6gLJoO 6+QQpaKnH//0cNZD9BdV4XeOrUqmvhj9cd2J8VMp6WCLrhKbDsm8SDqvas0+8OKfyBvvMJ FOOjQtvS9T9hZdRSdRkP/SLTYu/3rRg1irOKNJK6MvPUYpnY15T6GgCA3YbovkCi/gEaVu R7CW35XIcM3PKCbRS1hCuhFwFHRhzEmB8SWq7LQ6Z1mk3Nj6fCKWagSYepwHlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756123027; a=rsa-sha256; cv=none; b=ErY8Hw5cx9RCrw60sqtM0WfJnH5dPyT6bvkIpz2B9R7Jb95UXCkittcZ1Ov37/Q1/qCU+7 D/7tv39NsVTT+9CHgRZvCyesHADmgu0Z9qztClvVoXzXQJ7i/4vCn12feS026l5AJZBh3Z BPD8la81r+5td3k0HeO1n3UqWaywgLR0XClqH9n5dReEDJIiVfCplvDNaxxprOOtlQwnZF AGBqjHcwl1WC2t9KA98bUX6H43sr1bp7R0oz8Z0d57FQyzRqO1GfJtaY8dyCiahKo/Rg+t HTudjTKNmZdnuQVbeDdppiMqJjFKorZaRtdc/HUJA1gD+7giy621gIMvCosByA== 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 4c9Tmg46hnzpl9; Mon, 25 Aug 2025 11:57:07 +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 57PBv7sC058526; Mon, 25 Aug 2025 11:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PBv7iZ058523; Mon, 25 Aug 2025 11:57:07 GMT (envelope-from git) Date: Mon, 25 Aug 2025 11:57:07 GMT Message-Id: <202508251157.57PBv7iZ058523@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: c6c7c7ac9463 - main - tzcode: Add test case for setugid programs 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: c6c7c7ac94636a1f705a6f4d6ea74b1e62ad517d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c7c7ac94636a1f705a6f4d6ea74b1e62ad517d commit c6c7c7ac94636a1f705a6f4d6ea74b1e62ad517d Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 11:56:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-25 11:56:48 +0000 tzcode: Add test case for setugid programs Fixes: a6b19979bf13 ("tzcode: Fix TZ for non-setugid programs") Differential Revision: https://reviews.freebsd.org/D52124 --- lib/libc/tests/stdtime/Makefile | 4 +- lib/libc/tests/stdtime/detect_tz_changes_test.c | 53 ++++++++++++++++++++----- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/lib/libc/tests/stdtime/Makefile b/lib/libc/tests/stdtime/Makefile index adb883cc5b9a..6b9068e1641b 100644 --- a/lib/libc/tests/stdtime/Makefile +++ b/lib/libc/tests/stdtime/Makefile @@ -1,8 +1,10 @@ .include ATF_TESTS_C+= strptime_test -.if ${MK_DETECT_TZ_CHANGES} != "no" ATF_TESTS_C+= detect_tz_changes_test + +.if ${MK_DETECT_TZ_CHANGES} != "no" +CFLAGS.detect_tz_changes_test+= -DDETECT_TZ_CHANGES .endif TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/} diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index 75f55bdede04..e3fdcc0baef7 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include +#include #include #include @@ -41,6 +43,8 @@ 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; @@ -272,6 +276,21 @@ ATF_TC_BODY(detect_tz_changes, tc) ATF_REQUIRE(WIFEXITED(status)); ATF_REQUIRE_EQ(0, WEXITSTATUS(status)); } +#endif /* DETECT_TZ_CHANGES */ + +static void +test_tz_env(const char *tzval, const char *expect) +{ + char buf[128]; + struct tm *tm; + size_t len; + + setenv("TZ", tzval, 1); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_CHECK_STREQ(expect, buf); +} ATF_TC(tz_env); ATF_TC_HEAD(tz_env, tc) @@ -280,25 +299,37 @@ ATF_TC_HEAD(tz_env, tc) } ATF_TC_BODY(tz_env, tc) { - char buf[128]; - const struct tzcase *tzcase = NULL; - struct tm *tm; - size_t len; + const struct tzcase *tzcase; - for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) { - setenv("TZ", tzcase->tzfn, 1); - ATF_REQUIRE((tm = localtime(&then)) != NULL); - len = strftime(buf, sizeof(buf), "%z (%Z)", tm); - ATF_REQUIRE(len > 0); - ATF_REQUIRE_STREQ(tzcase->expect, buf); - } + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) + test_tz_env(tzcase->tzfn, tzcase->expect); +} + +ATF_TC(tz_env_setugid); +ATF_TC_HEAD(tz_env_setugid, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test TZ environment variable " + "in setugid process"); + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(tz_env_setugid, tc) +{ + const struct tzcase *tzcase; + + ATF_REQUIRE_EQ(0, seteuid(UID_NOBODY)); + ATF_REQUIRE(issetugid()); + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) + test_tz_env(tzcase->tzfn, tzcase->expect); } ATF_TP_ADD_TCS(tp) { +#ifdef DETECT_TZ_CHANGES debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); ATF_TP_ADD_TC(tp, detect_tz_changes); +#endif /* DETECT_TZ_CHANGES */ ATF_TP_ADD_TC(tp, tz_env); + ATF_TP_ADD_TC(tp, tz_env_setugid); return (atf_no_error()); }