* Use 'tst_check_cmds' instead of 'exists'.
* Use 'test_resm' instead of 'tst_res'.
* Use '$()' instead of '``'.
* Delete 'cat' and '<(file input)' while use 'sha1sum'.
* Delete some unuseful comments.
* Some cleanup.
Signed-off-by: Zeng Linggang <zenglg...@cn.fujitsu.com>
---
.../integrity/ima/tests/ima_measurements.sh | 142 +++++++--------------
1 file changed, 49 insertions(+), 93 deletions(-)
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
index e6b2b4f..6dde432 100755
--- a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
+++ b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
@@ -15,8 +15,8 @@
## for more details.
##
##
##
## You should have received a copy of the GNU General Public License
##
-## along with this program; if not, write to the Free Software
##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA ##
+## along with this program; if not, write to the Free Software Foundation,
##
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
##
##
##
################################################################################
#
@@ -26,25 +26,19 @@
# list based on policy.
#
# Author: Mimi Zohar, zo...@ibm.vnet.ibm.com
-#
-# Return - zero on success
-# - non zero on failure. return value from commands ($RC)
################################################################################
+export TST_TOTAL=3
+export TCID="ima_measurements"
+export TST_COUNT=0
+
init()
{
- export TST_TOTAL=3
- export TCID="init"
- export TST_COUNT=0
- RC=0
-
- exists sha1sum
+ tst_check_cmds sha1sum
# verify using default policy
if [ ! -f "$IMA_DIR/policy" ]; then
- tst_res TINFO $LTPTMP/imalog.$$ \
- "$TCID: not using default policy"
+ tst_resm TINFO "not using default policy"
fi
- return $RC
}
# Function: test01
@@ -52,40 +46,29 @@ init()
# be added to the IMA measurement list.
test01()
{
- TCID="test01"
- TST_COUNT=1
- RC=0
-
# Create file test.txt
- cat > $LTPIMA/test.txt <<-EOF || RC=$?
- `date` - this is a test file
+ cat > test.txt <<-EOF
+ $(date) - this is a test file
EOF
- if [ $RC -ne 0 ]; then
- tst_res TBROK $LTPTMP/imalog.$$ "" \
- "$TCID: Unable to create test file"
- return $RC
+ if [ $? -ne 0 ]; then
+ tst_brkm TBROK "Unable to create test file"
fi
- # Calculating the sha1sum of $LTPTMP/test.txt should add
+ # Calculating the sha1sum of test.txt should add
# the measurement to the measurement list.
# (Assumes SHA1 IMA measurements.)
- hash=$(sha1sum < "$LTPIMA/test.txt" | sed 's/ -//')
+ hash=$(sha1sum "test.txt" | sed 's/ -//')
# Check if the file is measured
# (i.e. contained in the ascii measurement list.)
- cat /sys/kernel/security/ima/ascii_runtime_measurements > \
- $LTPIMA/measurements
+ cat /sys/kernel/security/ima/ascii_runtime_measurements > measurements
sleep 1
- `grep $hash $LTPIMA/measurements > /dev/null` || RC=$?
- if [ $RC -ne 0 ]; then
- tst_res TFAIL $LTPTMP/imalog.$$ \
- "$TCID: TPM ascii measurement list does not contain sha1sum"
- return $RC
+ $(grep $hash measurements > /dev/null)
+ if [ $? -ne 0 ]; then
+ tst_resm TFAIL "TPM ascii measurement list does not contain
sha1sum"
else
- tst_res TPASS $LTPTMP/imalog.$$ \
- "$TCID: TPM ascii measurement list contains sha1sum"
+ tst_resm TPASS "TPM ascii measurement list contains sha1sum"
fi
- return $RC
}
# Function: test02
@@ -93,33 +76,23 @@ test01()
# measurement to be added to the IMA measurement list.
test02()
{
- TCID="test02"
- TST_COUNT=2
- RC=0
-
# Modify test.txt
- echo `$date` - file modified >> $LTPIMA/test.txt || RC=$?
+ echo $($date) - file modified >> test.txt
- # Calculating the sha1sum of $LTPTMP/test.txt should add
+ # Calculating the sha1sum of test.txt should add
# the new measurement to the measurement list
- hash=`cat $LTPIMA/test.txt | sha1sum | sed 's/ -//'`
+ hash=$(sha1sum test.txt | sed 's/ -//')
# Check if the new measurement exists
- cat /sys/kernel/security/ima/ascii_runtime_measurements > \
- $LTPIMA/measurements
- `grep $hash $LTPIMA/measurements > /dev/null` || RC=$?
-
- if [ $RC -ne 0 ]; then
- tst_res TFAIL $LTPTMP/imalog.$$ \
- "$TCID: Modified file not measured"
- tst_res TINFO $LTPTMP/imalog.$$ \
- "$TCID: iversion not supported; or not mounted with iversion"
- return $RC
+ cat /sys/kernel/security/ima/ascii_runtime_measurements > measurements
+ $(grep $hash measurements > /dev/null)
+
+ if [ $? -ne 0 ]; then
+ tst_resm TFAIL "Modified file not measured"
+ tst_resm TINFO "iversion not supported; or not mounted with
iversion"
else
- tst_res TPASS $LTPTMP/imalog.$$ \
- "$TCID: Modified file measured"
+ tst_resm TPASS "Modified file measured"
fi
- return $RC
}
# Function: test03
@@ -127,57 +100,40 @@ test02()
# (Default policy does not measure user files.)
test03()
{
- TCID="test03"
- TST_COUNT=3
- RC=0
-
# create file user-test.txt
- mkdir -m 0700 $LTPIMA/user
- chown nobody.nobody $LTPIMA/user
- cd $LTPIMA/user
+ mkdir -m 0700 user
+ chown nobody.nobody user
+ cd user
hash=0
# As user nobody, create and cat the new file
# (The LTP tests assumes existence of 'nobody'.)
- sudo -n -u nobody sh -c "echo `date` - create test.txt > ./test.txt;
+ sudo -n -u nobody sh -c "echo $(date) - create test.txt > ./test.txt;
cat ./test.txt > /dev/null"
# Calculating the hash will add the measurement to the measurement
# list, so only calc the hash value after getting the measurement
# list.
- cat /sys/kernel/security/ima/ascii_runtime_measurements > \
- $LTPIMA/measurements
- hash=`cat ./test.txt | sha1sum | sed 's/ -//'`
+ cat /sys/kernel/security/ima/ascii_runtime_measurements > measurements
+ hash=$(sha1sum test.txt | sed 's/ -//')
cd - >/dev/null
# Check if the file is measured
- grep $hash $LTPIMA/measurements > /dev/null || RC=$?
- if [ $RC -ne 0 ]; then
- RC=0
- tst_res TPASS $LTPTMP/imalog.$$ \
- "$TCID: user file test.txt not measured"
+ grep $hash measurements > /dev/null
+ if [ $? -ne 0 ]; then
+ tst_resm TPASS "user file test.txt not measured"
else
- RC=1
- tst_res TFAIL $LTPTMP/imalog.$$ \
- "$TCID: user file test.txt measured"
+ tst_resm TFAIL "user file test.txt measured"
fi
- return $RC
}
-# Function: main
-#
-# Description: - Execute all tests, exit with test status.
-#
-# Exit: - zero on success
-# - non-zero on failure.
-#
-RC=0
-EXIT_VAL=0
-
-. $(dirname "$0")/ima_setup.sh
-setup || exit $?
-init || exit $?
-test01 || EXIT_VAL=$RC
-test02 || EXIT_VAL=$RC
-test03 || EXIT_VAL=$RC
-exit $EXIT_VAL
+. ima_setup.sh
+TST_CLEANUP=cleanup
+
+setup
+init
+test01
+test02
+test03
+
+tst_exit
--
1.8.3.1
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
