svn commit: r219877 - head/tools/regression/acltools

Tue Mar 22 17:26:57 UTC 2011

Author: trasz
Date: Tue Mar 22 17:26:56 2011
New Revision: 219877
URL: http://svn.freebsd.org/changeset/base/219877

Log:
  Add test for acl_is_trivial_np(3).

Added:
  head/tools/regression/acltools/04.t
     - copied, changed from r219697, head/tools/regression/acltools/01.t
  head/tools/regression/acltools/tools-nfs4-trivial.test   (contents, props changed)

Copied and modified: head/tools/regression/acltools/04.t (from r219697, head/tools/regression/acltools/01.t)
==============================================================================

--- head/tools/regression/acltools/01.t	Wed Mar 16 12:40:58 2011	(r219697, copy source)
+++ head/tools/regression/acltools/04.t	Tue Mar 22 17:26:56 2011	(r219877)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz at FreeBSD.org>
+# Copyright (c) 2011 Edward Tomasz Napierała <trasz at FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,19 +27,11 @@
 # $FreeBSD$
 #
 
-# This is a wrapper script to run tools-nfs4.test on ZFS filesystem.
+# This is a wrapper script to run tools-nfs4-trivial.test on ZFS filesystem.
 #
 # WARNING: It uses hardcoded ZFS pool name "acltools"
-#
-# If any of the tests fails, here is how to debug it: go to
-# the directory with problematic filesystem mounted on it,
-# and do /path/to/test run /path/to/test tools-nfs4.test, e.g.
-#
-# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test
-#
-# Output should be obvious.
 
-echo "1..4"
+echo "1..3"
 
 if [ `whoami` != "root" ]; then
 	echo "not ok 1 - you need to be root to run this test."
@@ -61,21 +53,12 @@ echo "ok 1"
 
 cd $MNT
 
-# First, check whether we can crash the kernel by creating too many
-# entries.  For some reason this won't work in the test file.
-touch xxx
-setfacl -x2 xxx
-while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done
-chmod 600 xxx
-rm xxx
-echo "ok 2"
-
-perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test > /dev/null
 
 if [ $? -eq 0 ]; then
-	echo "ok 3"
+	echo "ok 2"
 else
-	echo "not ok 3"
+	echo "not ok 2"
 fi
 
 cd /
@@ -83,4 +66,4 @@ zpool destroy -f acltools
 rmdir $MNT
 mdconfig -du $MD
 
-echo "ok 4"
+echo "ok 3"

Added: head/tools/regression/acltools/tools-nfs4-trivial.test
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/acltools/tools-nfs4-trivial.test	Tue Mar 22 17:26:56 2011	(r219877)
@@ -0,0 +1,82 @@
+# Copyright (c) 2011 Edward Tomasz Napierała <trasz at FreeBSD.org>
+# All rights reserved.
+#
+# 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.
+#
+# $FreeBSD$
+#
+
+# This is a tools-level test for acl_is_trivial_np(3).  Run it as root on ZFS.
+# Note that this does not work on UFS with NFSv4 ACLs enabled - UFS recognizes
+# both kind of trivial ACLs and replaces it by the default one.
+#
+# WARNING: Creates files in unsafe way.
+
+$ whoami
+> root
+$ umask 022
+
+# Check whether ls(1) correctly recognizes PSARC/2010/029-style trivial ACLs.
+$ touch xxx
+
+$ ls -l xxx | cut -d' ' -f1
+> -rw-r--r--
+
+$ getfacl -q xxx
+>             owner@:rw-p--aARWcCos:------:allow
+>             group@:r-----a-R-c--s:------:allow
+>          everyone@:r-----a-R-c--s:------:allow
+
+# Check whether ls(1) correctly recognizes draft-style trivial ACLs.
+$ rm xxx
+$ touch xxx
+$ setfacl -a0 owner@:x:deny,owner@:rwpAWCo:allow,group@:wxp:deny,group@:r:allow,everyone@:wxpAWCo:deny,everyone@:raRcs:allow xxx
+$ setfacl -x5 xxx
+$ setfacl -x5 xxx
+$ setfacl -x5 xxx
+
+$ ls -l xxx | cut -d' ' -f1
+> -rw-r--r--
+
+$ getfacl -q xxx
+>             owner@:--x-----------:------:deny
+>             owner@:rw-p---A-W-Co-:------:allow
+>             group@:-wxp----------:------:deny
+>             group@:r-------------:------:allow
+>          everyone@:-wxp---A-W-Co-:------:deny
+>          everyone@:r-----a-R-c--s:------:allow
+
+# Make sure ls(1) actually can recognize something as non-trivial.
+$ setfacl -x0 xxx
+
+$ ls -l xxx | cut -d' ' -f1
+> -rw-r--r--+
+
+$ getfacl -q xxx
+>             owner@:rw-p---A-W-Co-:------:allow
+>             group@:-wxp----------:------:deny
+>             group@:r-------------:------:allow
+>          everyone@:-wxp---A-W-Co-:------:deny
+>          everyone@:r-----a-R-c--s:------:allow
+
+$ rm xxx
+
