Menu
▾
▴
[LTP] [PATCH 1/5] ssh: unify code style amongst ssh tests
|
From: Jiri J. <jja...@re...> - 2013-12-03 10:16:40
|
You can use ie. diff/vimdiff to easily verify the effect of this change.
Signed-off-by: Jiri Jaburek <jja...@re...>
---
testcases/network/tcp_cmds/ssh/ssh01 | 12 ++++++-----
testcases/network/tcp_cmds/ssh/ssh01_s1 | 37 +++++++++++++++++++--------------
testcases/network/tcp_cmds/ssh/ssh02 | 1 -
testcases/network/tcp_cmds/ssh/ssh02_s1 | 11 +++++-----
testcases/network/tcp_cmds/ssh/ssh03 | 8 +++----
testcases/network/tcp_cmds/ssh/ssh03_s1 | 11 +++++-----
6 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/testcases/network/tcp_cmds/ssh/ssh01 b/testcases/network/tcp_cmds/ssh/ssh01
index 0337216..f8fe4d6 100755
--- a/testcases/network/tcp_cmds/ssh/ssh01
+++ b/testcases/network/tcp_cmds/ssh/ssh01
@@ -32,16 +32,17 @@
do_setup()
{
-
export RHOST="localhost"
export TEST_USER="ssh_usr1"
- export TEST_USER_PASSWD="eal"
+ export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
export TEST_USER_HOMEDIR="/home/$TEST_USER"
- #erase user if he may exist , so we can have a clean env
+ # erase user if he/she already exists, so we can have a clean env
TCtmp=/home/$TEST_USER
+ rm -Rf $TCtmp
+
tst_setup
exists expect ssh ssh01_s1 useradd userdel
@@ -60,7 +61,7 @@ do_setup()
if ! mkdir -p "$TEST_USER_HOMEDIR"; then
end_testcase "Failed to create $TEST_USER_HOMEDIR"
fi
- chown -Rf $USER_UID.$USER_GID "$TEST_USER_HOMEDIR"
+ chown -R $USER_UID.$USER_GID "$TEST_USER_HOMEDIR"
trap do_cleanup EXIT
@@ -70,7 +71,8 @@ do_setup()
# FUNCTION: do_cleanup
#-----------------------------------------------------------------------
-do_cleanup(){
+do_cleanup()
+{
userdel $TEST_USER
tst_cleanup
}
diff --git a/testcases/network/tcp_cmds/ssh/ssh01_s1 b/testcases/network/tcp_cmds/ssh/ssh01_s1
index 244593b..e64bbf0 100755
--- a/testcases/network/tcp_cmds/ssh/ssh01_s1
+++ b/testcases/network/tcp_cmds/ssh/ssh01_s1
@@ -21,7 +21,6 @@
# PURPOSE: Tests to see that ssh rejects an invalid password
#
# SETUP: The program `/usr/bin/expect' MUST be installed.
-# The PASSWD and RHOST variables MUST be set prior to execution.
#
# HISTORY:
# 03/03 Jerone Young (je...@us...)
@@ -31,31 +30,37 @@ set RHOST $env(RHOST)
set TEST_USER $env(TEST_USER)
set TEST_USER_PASSWD $env(TEST_USER_PASSWD)
+set RUSER $TEST_USER
+set PASSWD $TEST_USER_PASSWD
+
set timeout 90
#test invalid password
-send_user "SSH Test Invalid Password \n"
+send_user "TEST: SSH Test Invalid Password \n"
-set RUSER $TEST_USER
+# Set PASSWD to an invalid password
set PASSWD "invalid_password!"
spawn ssh -l $RUSER $RHOST whoami
while 1 {
- sleep 2
- expect {
-
- "Are you sure you want to continue connecting (yes/no)?" { exp_send "yes\r"}
- "assword:" {exp_send "$PASSWD\r"}
- "Permission denied" {
- send_user "SSH would not allow $RUSER to login with invalid password, Test Passed \n"
- send_user "\nTEST_PASSED\n"
- break
- }
- "$RUSER" {send_user "SSH allowed $RUSER to login with invalid pass, Test Failed \n" ;exit 1}
- }
- sleep 1
+ sleep 2
+ expect {
+
+ "Are you sure you want to continue connecting (yes/no)?" { exp_send "yes\r"}
+ "assword:" {exp_send "$PASSWD\r"}
+ "Permission denied" {
+ send_user "SSH would not allow $RUSER to login with invalid password, Test Passed \n"
+ send_user "\nTEST_PASSED\n"
+ break
+ }
+ "$RUSER" {
+ send_user "SSH allowed $RUSER to login with invalid pass, Test Failed \n"
+ exit 1
+ }
+ }
+ sleep 1
}
exit 0
diff --git a/testcases/network/tcp_cmds/ssh/ssh02 b/testcases/network/tcp_cmds/ssh/ssh02
index 00356e5..919e20d 100755
--- a/testcases/network/tcp_cmds/ssh/ssh02
+++ b/testcases/network/tcp_cmds/ssh/ssh02
@@ -32,7 +32,6 @@
do_setup()
{
-
export RHOST="localhost"
export TEST_USER="ssh_usr2"
export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
diff --git a/testcases/network/tcp_cmds/ssh/ssh02_s1 b/testcases/network/tcp_cmds/ssh/ssh02_s1
index b991141..724ef97 100755
--- a/testcases/network/tcp_cmds/ssh/ssh02_s1
+++ b/testcases/network/tcp_cmds/ssh/ssh02_s1
@@ -32,6 +32,7 @@ set TEST_USER $env(TEST_USER)
set TEST_USER_PASSWD $env(TEST_USER_PASSWD)
set RUSER $TEST_USER
+set PASSWD $TEST_USER_PASSWD
set timeout 90
@@ -41,10 +42,8 @@ send_user "TEST: Test to see if ssh rejects Invalid User \n"
# Set RUSER to an invalid user
set RUSER "Invaild_User"
-set PASSWD $TEST_USER_PASSWD
-
-spawn ssh -l $RUSER $RHOST
+spawn ssh -l $RUSER $RHOST whoami
while 1 {
sleep 2
@@ -57,8 +56,10 @@ while 1 {
send_user "\nTEST_PASSED\n"
break
}
- "#" {send_user "SSH allowed $RUSER to login with invalid pass, Test
-Failed \n" ;exit 1}
+ "$RUSER" {
+ send_user "SSH allowed $RUSER to login with invalid pass, Test Failed \n"
+ exit 1
+ }
}
sleep 1
}
diff --git a/testcases/network/tcp_cmds/ssh/ssh03 b/testcases/network/tcp_cmds/ssh/ssh03
index ca9ce0e..fe5919c 100755
--- a/testcases/network/tcp_cmds/ssh/ssh03
+++ b/testcases/network/tcp_cmds/ssh/ssh03
@@ -34,7 +34,7 @@ do_setup()
{
export RHOST="localhost"
export TEST_USER="ssh_usr3"
- export TEST_USER_PASSWD="eal"
+ export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
export TEST_USER_HOMEDIR="/home/$TEST_USER"
@@ -81,9 +81,9 @@ do_cleanup()
# FUNCTION: MAIN
#
# DESCRIPTION: Create Test User
-# Call upon script to make sure an invalid user can not have access
-# Cleanup Test User from system
-# Exit with exit code of script called upon
+# Call upon script to make sure a valid user can have access
+# Cleanup Test User from system
+# Exit with exit code of script called upon
#-----------------------------------------------------------------------
. net_cmdlib.sh
diff --git a/testcases/network/tcp_cmds/ssh/ssh03_s1 b/testcases/network/tcp_cmds/ssh/ssh03_s1
index 6d6c61a..9463a7f 100755
--- a/testcases/network/tcp_cmds/ssh/ssh03_s1
+++ b/testcases/network/tcp_cmds/ssh/ssh03_s1
@@ -31,16 +31,14 @@ set TEST_USER $env(TEST_USER)
set TEST_USER_PASSWD $env(TEST_USER_PASSWD)
set RUSER $TEST_USER
+set PASSWD $TEST_USER_PASSWD
set timeout 90
-#test invalid username
+#test valid username
send_user "TEST: SSH allow (non-root) valid User \n"
-set RUSER $TEST_USER
-set PASSWD $TEST_USER_PASSWD
-
spawn ssh -l $RUSER $RHOST whoami
@@ -54,7 +52,10 @@ while 1 {
send_user "\nSSH would not allow $RUSER to login, Test FAILED \n"
exit 1
}
- "$RUSER" {send_user "\nSSH allowed $RUSER to login, Test PASSED \n" ;break}
+ "$RUSER" {
+ send_user "SSH allowed $RUSER to login, Test PASSED \n"
+ break
+ }
}
sleep 1
}
--
1.8.3.1
|