X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=fc5e2b48dcd13b79de969aed5df7d84bfc870dbe;hb=3a4c697a608a23e11b84d897883b2870f9587dfa;hp=4bfd36461bbe3cd944792df67785938046326986;hpb=950ef1a3228a2c6427dbd8f836100d0d91221740;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 4bfd364..fc5e2b4 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# The program name.
+BIN=./reapply_default_acl
+
 # The directory where we'll do all the ACL manipulation.
 TESTDIR=test
 
@@ -37,7 +40,7 @@ setfacl -d -m group::r-- "${TESTDIR}"
 setfacl -d -m other::r-- "${TESTDIR}"
 touch "${TARGET}"
 chmod 777 "${TARGET}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::r--
@@ -58,7 +61,7 @@ setfacl -d -m other::r--    "${TESTDIR}"
 setfacl -d -m user:mail:rwx "${TESTDIR}"
 touch "${TARGET}"
 chmod 777 "${TARGET}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::r--
@@ -79,7 +82,7 @@ TESTNUM=3
 touch "${TARGET}"
 chmod 644 "${TARGET}"
 setfacl -d -m group:mail:rwx "${TESTDIR}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rw-
@@ -98,7 +101,7 @@ TESTNUM=4
 setfacl -d -m group:mail:rwx "${TESTDIR}"
 mkdir "${TARGET}"
 chmod 755 "${TARGET}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
@@ -123,7 +126,7 @@ compare
 TESTNUM=5
 touch "${TARGET}"
 chmod 744 "${TARGET}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
@@ -139,21 +142,21 @@ compare
 
 
 
-# Make sure execute permission is removed for group/other after the
-# reapplication.
+# Since the default ACL will grant r-x to group/other, they will wind
+# up with it.
 TESTNUM=6
 touch "${TARGET}"
 chmod 744 "${TARGET}"
 setfacl -d -m user:mail:rwx "${TESTDIR}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
 user::rwx
 user:mail:rwx
-group::r--
+group::r-x
 mask::rwx
-other::r--
+other::r-x
 
 EOF
 )
@@ -162,24 +165,46 @@ ACTUAL=`getfacl --omit-header "${TARGET}"`
 compare
 
 
-# In fact, no existing named entries without execute permissions
-# should be granted execute permissions as the result of
-# reapplication.
+# Some named entries can be granted execute permissions as the result
+# of reapplication.
 TESTNUM=7
 touch "${TARGET}"
 chmod 744 "${TARGET}"
 setfacl -m user:news:rw "${TARGET}"
 setfacl -d -m user:mail:rwx "${TESTDIR}"
 setfacl -d -m user:news:rwx "${TESTDIR}"
-./aclq "${TARGET}"
+$BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
 user::rwx
 user:mail:rwx
-user:news:rw-
-group::r--
+user:news:rwx
+group::r-x
 mask::rwx
+other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# We should not retain any entries that aren't in the default.
+TESTNUM=8
+touch "${TARGET}"
+chmod 644 "${TARGET}"
+setfacl -m user:news:rw "${TARGET}"
+setfacl -d -m user:mail:rwx "${TESTDIR}"
+$BIN "${TARGET}"
+
+
+EXPECTED=$(cat <<EOF
+user::rw-
+user:mail:rwx	#effective:rw-
+group::r--
+mask::rw-
 other::r--
 
 EOF
@@ -187,3 +212,48 @@ EOF
 
 ACTUAL=`getfacl --omit-header "${TARGET}"`
 compare
+
+
+# A slightly modified test #1 to make sure it works right.
+TESTNUM=9
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 777 "${TARGET}"
+setfacl -d -m user::r--  "${TESTDIR}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::r--
+group::r-x
+other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# If the default ACL mask denies execute, we should respect that
+# regardless of the existing execute permissions.
+TESTNUM=10
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 777 "${TARGET}"
+setfacl -m user:mail:rwx "${TESTDIR}"
+setfacl -d -m user:mail:rwx  "${TESTDIR}"
+setfacl -d -m mask::rw-  "${TESTDIR}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx	#effective:rw-
+group::r-x	#effective:r--
+mask::rw-
+other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare