From nobody Mon Jun 23 08:44:59 2025 X-Original-To: dev-commits-src-main@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 4bQhV36fxKz604yt; Mon, 23 Jun 2025 08:44:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQhV34kGCz3S2d; Mon, 23 Jun 2025 08:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750668299; 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=yILM9WRxb1v46EC8q2Q/zCCLkgPDR6Qi/F3VVuW4M58=; b=FhnarHXo+sVJmuAwpnlIAHOL5nxkM26oLH8sfdRCxXd10LYrEpHBnBKTu13Tx7Y9fh3cIa 0FTXaRKlyOwUu/8fIDhoQTZoHM76Uq8CxzfrFan2qGXEkCesKV5vadgtLcLv00B0kYPkU7 y8YL9Lu3K+BcMDv1bJmoOyCyEBc9wLayrmbcmnCKAPfr6VCDGZ4EatHNb2DnSEZ8Hsq0Tx U9z+LbSaj9w5rsMbKI+dDEvQprMzDIBg29/DROqE/exche8hKABINr0U/8zSIA4Tmpl5ER 0MWCmuGKpQLoDsF0d39+tQgpdVchVyUsLNCG84QOdKON4tEcvZLHhtzHj7d35Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750668299; 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=yILM9WRxb1v46EC8q2Q/zCCLkgPDR6Qi/F3VVuW4M58=; b=CHxuHPCdoQhyFuR28YfZy+JdcNbYVGVaZs0+TrM4vClDweu3SXtpUdsIzAvwtKQZbFUUXA d3Foagz1M2sW3cpKKGT49T6uyvPcA72FYaQMb6G0wQcohSAVsUswo4UGx3l+NS+Kw6J6Rv xr4cIIfVawYVoi9cHudMRmpr0ZBPqGJumzE1oYucTv6AAO2CFFpJchRb7vyL83jeYZ/ZI8 l2Im3hYg4UMM9gISF0ezk1rHksZS7iOkm/y0QZ9B14iFppebWSuhUnK9aO0W9ufhlGUGrm EtAeGZ7AP2w/1YXJJ4yWlbDTZ+c8CcmQjNj32YCUTiOb1s3QvHUbSeBpUdE3fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750668299; a=rsa-sha256; cv=none; b=ma3DlPgkupurfQyatDyrwqdf2Y44e198xHNr4DKVyO0VNhw6T6JEVsvabyXm0bC49nWxAV Y1wQUlImSC7GFlz9HmBfJYT0OWxoJKI5e7E2d8n1eFeMzT5kTTph6XiQ7iJ+OurfT6jyqf APFvTlKCTYIUUgyQAemBZJSdkdRg3c4YZ+MxT5UY4Odo0RQ7X6iLCos7meZZAieLnWXod0 vh91Qv/9MOoektjBww9/H/jAznflIk7WXyTbgNzkzy3BJeC5xm4QtfLvRUf254vQ4EGBoS 15Mud7qkxoVEK0N4mACJLz+zxWxDjge2ZCXAYvHYPriclsU83JJiXd5Xg/P+QA== 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 4bQhV32TTMzwSH; Mon, 23 Jun 2025 08:44:59 +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 55N8ixxo081532; Mon, 23 Jun 2025 08:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N8ixJP081529; Mon, 23 Jun 2025 08:44:59 GMT (envelope-from git) Date: Mon, 23 Jun 2025 08:44:59 GMT Message-Id: <202506230844.55N8ixJP081529@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: 7fe39bec801a - main - glob: Improve callback tests. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7fe39bec801a08f541d0111219fe8701a6a20cf1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe39bec801a08f541d0111219fe8701a6a20cf1 commit 7fe39bec801a08f541d0111219fe8701a6a20cf1 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-23 08:44:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-23 08:44:31 +0000 glob: Improve callback tests. Most importantly, they need to run without privileges, since root is allowed to read a directory regardless of its permission bits. PR: 287694 Fixes: 4d7c31bca252 Sponsored by: Klara, Inc. Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D50965 --- lib/libc/tests/gen/glob2_test.c | 47 +++++++++++++++++++++----------- lib/libc/tests/gen/glob_blocks_test.c | 51 ++++++++++++++++++++++------------- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/lib/libc/tests/gen/glob2_test.c b/lib/libc/tests/gen/glob2_test.c index 45d17b063593..ff1b36b830b8 100644 --- a/lib/libc/tests/gen/glob2_test.c +++ b/lib/libc/tests/gen/glob2_test.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -38,8 +39,6 @@ #include -static int glob_callback_invoked; - /* * Derived from Russ Cox' pathological case test program used for the * https://research.swtch.com/glob article. @@ -129,34 +128,50 @@ ATF_TC_BODY(glob_period, tc) "glob(3) should match files starting with a period when using '.*'"); } +static bool glob_callback_invoked; + static int errfunc(const char *path, int err) { - ATF_REQUIRE_STREQ(path, "test/"); - ATF_REQUIRE(err == EACCES); - glob_callback_invoked = 1; + ATF_CHECK_STREQ(path, "test/"); + ATF_CHECK(err == EACCES); + glob_callback_invoked = true; /* Suppress EACCES errors. */ return (0); } -ATF_TC_WITHOUT_HEAD(glob_callback_test); -ATF_TC_BODY(glob_callback_test, tc) +ATF_TC(glob_callback); +ATF_TC_HEAD(glob_callback, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test ability of callback function to suppress errors"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(glob_callback, tc) { - int rv; glob_t g; + int rv; - glob_callback_invoked = 0; - ATF_REQUIRE_EQ(0, mkdir("test", 0007)); + ATF_REQUIRE_EQ(0, mkdir("test", 0755)); + ATF_REQUIRE_EQ(0, symlink("foo", "test/foo")); + ATF_REQUIRE_EQ(0, chmod("test", 0)); + + glob_callback_invoked = false; rv = glob("test/*", 0, errfunc, &g); - ATF_REQUIRE_MSG(glob_callback_invoked == 1, + ATF_CHECK_MSG(glob_callback_invoked, "glob(3) failed to invoke callback function"); - ATF_REQUIRE_MSG(rv == GLOB_NOMATCH, - "error callback function failed to suppress EACCES"); + ATF_CHECK_EQ_MSG(GLOB_NOMATCH, rv, + "callback function failed to suppress EACCES"); + globfree(&g); /* GLOB_ERR should ignore the suppressed error. */ + glob_callback_invoked = false; rv = glob("test/*", GLOB_ERR, errfunc, &g); - ATF_REQUIRE_MSG(rv == GLOB_ABORTED, - "GLOB_ERR didn't override error callback function"); + ATF_CHECK_MSG(glob_callback_invoked, + "glob(3) failed to invoke callback function"); + ATF_CHECK_EQ_MSG(GLOB_ABORTED, rv, + "GLOB_ERR didn't override callback function"); + globfree(&g); } ATF_TP_ADD_TCS(tp) @@ -164,6 +179,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, glob_pathological_test); ATF_TP_ADD_TC(tp, glob_period); - ATF_TP_ADD_TC(tp, glob_callback_test); + ATF_TP_ADD_TC(tp, glob_callback); return (atf_no_error()); } diff --git a/lib/libc/tests/gen/glob_blocks_test.c b/lib/libc/tests/gen/glob_blocks_test.c index a20aad17ce31..629b90bee762 100644 --- a/lib/libc/tests/gen/glob_blocks_test.c +++ b/lib/libc/tests/gen/glob_blocks_test.c @@ -8,42 +8,55 @@ #include #include +#include #include -static int glob_callback_invoked; - -ATF_TC_WITHOUT_HEAD(glob_b_callback_test); -ATF_TC_BODY(glob_b_callback_test, tc) +ATF_TC(glob_b_callback); +ATF_TC_HEAD(glob_b_callback, tc) { - int rv; - glob_t g; - - glob_callback_invoked = 0; - ATF_REQUIRE_EQ(0, mkdir("test", 0007)); - int (^errblk)(const char *, int) = + atf_tc_set_md_var(tc, "descr", + "Test ability of callback block to suppress errors"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(glob_b_callback, tc) +{ + static bool glob_callback_invoked; + static int (^errblk)(const char *, int) = ^(const char *path, int err) { - ATF_REQUIRE_STREQ(path, "test/"); - ATF_REQUIRE(err == EACCES); - glob_callback_invoked = 1; + ATF_CHECK_STREQ(path, "test/"); + ATF_CHECK(err == EACCES); + glob_callback_invoked = true; /* Suppress EACCES errors. */ return (0); }; + glob_t g; + int rv; + ATF_REQUIRE_EQ(0, mkdir("test", 0755)); + ATF_REQUIRE_EQ(0, symlink("foo", "test/foo")); + ATF_REQUIRE_EQ(0, chmod("test", 0)); + + glob_callback_invoked = false; rv = glob_b("test/*", 0, errblk, &g); - ATF_REQUIRE_MSG(glob_callback_invoked == 1, + ATF_CHECK_MSG(glob_callback_invoked, "glob(3) failed to invoke callback block"); - ATF_REQUIRE_MSG(rv == GLOB_NOMATCH, - "error callback function failed to suppress EACCES"); + ATF_CHECK_EQ_MSG(GLOB_NOMATCH, rv, + "callback function failed to suppress EACCES"); + globfree(&g); /* GLOB_ERR should ignore the suppressed error. */ + glob_callback_invoked = false; rv = glob_b("test/*", GLOB_ERR, errblk, &g); - ATF_REQUIRE_MSG(rv == GLOB_ABORTED, - "GLOB_ERR didn't override error callback block"); + ATF_CHECK_MSG(glob_callback_invoked, + "glob(3) failed to invoke callback block"); + ATF_CHECK_EQ_MSG(GLOB_ABORTED, rv, + "GLOB_ERR didn't override callback block"); + globfree(&g); } ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, glob_b_callback_test); + ATF_TP_ADD_TC(tp, glob_b_callback); return (atf_no_error()); }