X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=f218a8feefaa8810e5236d9aa631080f0ca69acf;hb=2ab9ebe178bc7ef6f1d65dc465712f4fe18b4b50;hp=31c9f30ab94ec7f6ceae1908649c6787252e59e9;hpb=23c4e6b7963baac70b8aa12bb92dd830518bed94;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 31c9f30..f218a8f 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -8,7 +8,8 @@ TESTDIR=test
 
 acl_reset() {
     # Remove any ACLs on our test directory and remove its contents.
-    setfacl --remove-all --recursive "$TESTDIR"
+    setfacl --remove-all --recursive "${TESTDIR}"
+    chmod 755 "${TESTDIR}"
     rm -rf "${TESTDIR}"/*
 }
 
@@ -18,10 +19,14 @@ compare() {
 	acl_reset
     else
 	echo "Failure (#${TESTNUM})"
-	echo "Expected result:"
+	echo 'Expected result:'
+	echo '================'
 	echo "${EXPECTED}"
-	echo "Actual result:"
+	echo '================'
+	echo 'Actual result:'
+	echo '================'
 	echo "${ACTUAL}"
+	echo '================'
 	exit 1
     fi
 }
@@ -35,11 +40,11 @@ mkdir "${TESTDIR}"
 # permissions should all be propagated to the mode bits.
 TESTNUM=1
 TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 777 "${TARGET}"
 setfacl -d -m user::r--  "${TESTDIR}"
 setfacl -d -m group::r-- "${TESTDIR}"
 setfacl -d -m other::r-- "${TESTDIR}"
-touch "${TARGET}"
-chmod 777 "${TARGET}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
@@ -76,6 +81,7 @@ EOF
 ACTUAL=`getfacl --omit-header "${TARGET}"`
 compare
 
+
 # A file shared by a group, should still be group-writable
 # afterwards.
 TESTNUM=3
@@ -90,12 +96,14 @@ group::r--
 group:mail:rwx	#effective:rw-
 mask::rw-
 other::r--
+
 EOF
 )
 
 ACTUAL=`getfacl --omit-header "${TARGET}"`
 compare
 
+
 # Same test as before except with a directory.
 TESTNUM=4
 setfacl -d -m group:mail:rwx "${TESTDIR}"
@@ -171,6 +179,11 @@ TESTNUM=7
 touch "${TARGET}"
 chmod 744 "${TARGET}"
 setfacl -m user:news:rw "${TARGET}"
+# If we don't add 'x' to the mask here, nobody can execute the file.
+# setfacl will update the mask for us under most circumstances, but
+# note that we didn't create an entry with an 'x' bit using setfacl --
+# therefore, setfacl won't unmask 'x' for us.
+setfacl -m mask::rwx "${TARGET}"
 setfacl -d -m user:mail:rwx "${TESTDIR}"
 setfacl -d -m user:news:rwx "${TESTDIR}"
 $BIN "${TARGET}"
@@ -329,6 +342,7 @@ other::r--
 default:user::rwx
 default:group::r--
 default:other::r--
+
 EOF
 )
 
@@ -358,6 +372,7 @@ default:user:mail:rwx
 default:group::r-x
 default:mask::rwx
 default:other::r-x
+
 EOF
 )
 
@@ -365,7 +380,7 @@ ACTUAL=`getfacl --omit-header "${TARGET}"`
 compare
 
 
-# Same as test #14, with 755 initial perms.
+# Same as previous test, with 755 initial perms.
 #
 TESTNUM=15
 TARGET="${TESTDIR}"/baz
@@ -387,6 +402,97 @@ default:user:mail:rwx
 default:group::r-x
 default:mask::rwx
 default:other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# Same as previous two tests, only with a file.
+#
+TESTNUM=16
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 644 "${TARGET}"
+setfacl -d -m user:mail:rwx "${TESTDIR}"
+
+$BIN "${TARGET}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rw-
+user:mail:rwx	#effective:rw-
+group::r--
+mask::rw-
+other::r--
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# User-executable files should not wind up exec-masked.
+TESTNUM=17
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 700 "${TARGET}"
+setfacl -d -m user:mail:rwx  "${TESTDIR}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx
+group::r-x
+mask::rwx
+other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# Group-executable files should not wind up exec-masked.
+TESTNUM=18
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 670 "${TARGET}"
+setfacl -d -m user:mail:rwx  "${TESTDIR}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx
+group::r-x
+mask::rwx
+other::r-x
+
+EOF
+)
+
+ACTUAL=`getfacl --omit-header "${TARGET}"`
+compare
+
+
+# Other-executable files should not wind up exec-masked.
+TESTNUM=19
+TARGET="${TESTDIR}"/foo
+touch "${TARGET}"
+chmod 607 "${TARGET}"
+setfacl -d -m user:mail:rwx  "${TESTDIR}"
+$BIN "${TARGET}"
+
+EXPECTED=$(cat <<EOF
+user::rwx
+user:mail:rwx
+group::r-x
+mask::rwx
+other::r-x
+
 EOF
 )