From nobody Mon Apr 21 03:58:06 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 4Zgs67343bz5sqck; Mon, 21 Apr 2025 03:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zgs666Nz0z3RRj; Mon, 21 Apr 2025 03:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207886; 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=rGKqZlvz6quF1MnRcZDy7kjcVTwO+TzrpDoNX69kGD8=; b=oA9P5uEkEJEvUmlHaWrVLeYHnFyRv708QoXX4cLPMfYw9TpN4RMMtOCVkiAi+8OObZFJXg cyDDmeYCfNIWc9YTxiGufpZ6lld2LqiZoM+sn4soewVkbSqPY4ood2ZT7QZJN6jFHhVDCB woxMceUDyCE7rAPASGI8XcpS7LRnYvN9rvCGTnCpeoI4ksOyxBrS9cn4tXJEkIUHdbB6m3 wZDxGIVx/J9d6FKh2LXTpyGT+cQEUahR15nlX1u58bEFtc+UbOlRS/D3UC8wR2tcWzk32n 6lqPrSeMnGc52bsGNb46h5UvuSzhOG7soOUZ+oFZipFgK2Z/QOl0E55I0auTCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745207886; a=rsa-sha256; cv=none; b=b7XWbZd+pfE/ApJ320uq7OzOnXeS49ra9r/PvvaIrMkbiEnUIz2mWH4rK7wlnSRnwouvXq dWHydCgaWBibZVTLIhtmUxBamDVVKh9q5fU7a5UFlkbjk5fl8eKm9wmoYS0OH5sp30MxTD TgoZ5dbCOuVOvd+4SBzBunAVJBMM113XhwPPt8aUzbcPgohqP5X41QcvUnIBjihObwHBZF R89cmj4Z76+z7uSqU8ErhFn1UcINYN0Royhnly0aNIR+p83bHYta//nuTlMGilG9x5yoZg UE9vwesdndDs4OpyTqAEiU0IAanSa7nefXzW/FpnM6noz+slAw0H+0EwfdyKqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207886; 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=rGKqZlvz6quF1MnRcZDy7kjcVTwO+TzrpDoNX69kGD8=; b=PE/zZSfLAOpVeRJin7B56KBjQcIcYWsgWjyjtdXJJ5GfNBHSCr6EMSg78MHaAdbm26cOSU kHxscD9YqhCgC0xCU9g73Spfi3cPP3SJZ3l4IUQbwmr6N8xw/7YI5T9vaNPyD0PJnnlBFZ 3N1JIT10wXc4TVytxsiXO+Kht4ftV4aARNKhO40xOY72VCH2GI1hAXVvMciBpvYOcWe+gF cT8Dqp1niVpiAQtLWVKZi9CQ/ggKBBtATGyH4vGntZvh9alrkWFBn8k/Q/oE/OJYO6HiqY vr7IjBt7I0d5cFiUCR0ML6ic8gt2jAh6Yo24liOIV0ktjPYohUvm++383LeoGQ== 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 4Zgs665x0czZx2; Mon, 21 Apr 2025 03:58:06 +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 53L3w6uk080695; Mon, 21 Apr 2025 03:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L3w6FR080692; Mon, 21 Apr 2025 03:58:06 GMT (envelope-from git) Date: Mon, 21 Apr 2025 03:58:06 GMT Message-Id: <202504210358.53L3w6FR080692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8bf37c868f45 - main - getfacl: implement --skip-base (-s) 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bf37c868f45e73345b791f9abc6c5a07a1629db Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8bf37c868f45e73345b791f9abc6c5a07a1629db commit 8bf37c868f45e73345b791f9abc6c5a07a1629db Author: Kyle Evans AuthorDate: 2025-04-21 03:57:45 +0000 Commit: Kyle Evans CommitDate: 2025-04-21 03:57:45 +0000 getfacl: implement --skip-base (-s) This skips files that only have a trivial ACL, which is useful for callers that want to examine files with more unique ACLs. While we're here, don't issue the file name/ownership header if we're just going to error out on the file; this adds extra noise for little gain. Reviewed by: markj, olce Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D40603 --- bin/getfacl/getfacl.1 | 5 ++++ bin/getfacl/getfacl.c | 65 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1 index b2b6294c46de..475c86e275bc 100644 --- a/bin/getfacl/getfacl.1 +++ b/bin/getfacl/getfacl.1 @@ -75,6 +75,11 @@ Ignored for POSIX.1e ACLs. Do not write commented information about file name and ownership. This is useful when dealing with filenames with unprintable characters. +.It Fl s , Fl -skip-base +Skip files that only have a trivial ACL, as defined by +.Xr acl_is_trivial_np 3 . +Notably, files with POSIX.1e ACLs that only represent the owner, group and other +to match the mode of the file will be skipped. .It Fl v For NFSv4 ACLs, display access mask and flags in a verbose form. Ignored for POSIX.1e ACLs. diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c index 2b98f923d618..5f55819c81a1 100644 --- a/bin/getfacl/getfacl.c +++ b/bin/getfacl/getfacl.c @@ -52,6 +52,7 @@ static const struct option long_options[] = { "default", no_argument, NULL, 'd' }, { "numeric", no_argument, NULL, 'n' }, { "omit-header", no_argument, NULL, 'q' }, + { "skip-base", no_argument, NULL, 's' }, { NULL, no_argument, NULL, 0 }, }; @@ -90,7 +91,7 @@ getgname(gid_t gid) static int print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag, - int qflag, int vflag) + int qflag, int vflag, int sflag) { struct stat sb; acl_t acl; @@ -122,25 +123,49 @@ print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag, return (-1); } + if (hflag) + acl = acl_get_link_np(path, type); + else + acl = acl_get_file(path, type); + + if (!acl && errno != EOPNOTSUPP) { + warn("%s", path); + return(-1); + } + + if (sflag) { + int trivial; + + /* + * With the -s flag, we shouldn't synthesize a trivial ACL if + * they aren't supported as we do below. + */ + if (!acl) + return(0); + + /* + * We also shouldn't render anything for this path if it's a + * trivial ACL. If we error out, we'll issue a warning but + * proceed with this file to err on the side of caution. + */ + error = acl_is_trivial_np(acl, &trivial); + if (error != 0) { + warn("%s: acl_is_trivial_np failed", path); + } else if (trivial) { + (void)acl_free(acl); + return(0); + } + } + if (more_than_one) printf("\n"); else more_than_one++; - if (!qflag) printf("# file: %s\n# owner: %s\n# group: %s\n", path, getuname(sb.st_uid), getgname(sb.st_gid)); - if (hflag) - acl = acl_get_link_np(path, type); - else - acl = acl_get_file(path, type); if (!acl) { - if (errno != EOPNOTSUPP) { - warn("%s", path); - return(-1); - } - errno = 0; if (type == ACL_TYPE_DEFAULT) return(0); acl = acl_from_mode_np(sb.st_mode); @@ -176,7 +201,7 @@ print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag, static int print_acl_from_stdin(acl_type_t type, int hflag, int iflag, int nflag, - int qflag, int vflag) + int qflag, int vflag, int sflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -185,7 +210,7 @@ print_acl_from_stdin(acl_type_t type, int hflag, int iflag, int nflag, if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; if (print_acl(pathname, type, hflag, iflag, nflag, - qflag, vflag) == -1) { + qflag, vflag, sflag) == -1) { carried_error = -1; } } @@ -199,14 +224,15 @@ main(int argc, char *argv[]) acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; - int hflag, iflag, qflag, nflag, vflag; + int hflag, iflag, qflag, nflag, sflag, vflag; hflag = 0; iflag = 0; qflag = 0; nflag = 0; + sflag = 0; vflag = 0; - while ((ch = getopt_long(argc, argv, "+dhinqv", long_options, + while ((ch = getopt_long(argc, argv, "+dhinqsv", long_options, NULL)) != -1) switch(ch) { case 'd': @@ -224,6 +250,9 @@ main(int argc, char *argv[]) case 'q': qflag = 1; break; + case 's': + sflag = 1; + break; case 'v': vflag = 1; break; @@ -236,19 +265,19 @@ main(int argc, char *argv[]) if (argc == 0) { error = print_acl_from_stdin(type, hflag, iflag, nflag, - qflag, vflag); + qflag, vflag, sflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { error = print_acl_from_stdin(type, hflag, iflag, nflag, - qflag, vflag); + qflag, vflag, sflag); if (error == -1) carried_error = -1; } else { error = print_acl(argv[i], type, hflag, iflag, nflag, - qflag, vflag); + qflag, vflag, sflag); if (error == -1) carried_error = -1; }