Menu
▾
▴
[Ltp-cvs] ltp/testcases/network/tcp_cmds/ftp ftp01, 1.4, 1.4.4.1 ftp02, 1.1, 1.1.4.1 ftp02_s1, 1.2, 1.2.4.1 ftp03, 1.4, 1.4.4.1 ftp04, 1.6, 1.6.4.1 ftp05, 1.4, 1.4.4.1 ftp_set_passwd, 1.1, 1.1.4.1
|
From: Garrett C. <yab...@us...> - 2009-08-03 11:37:09
|
Update of /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32037/testcases/network/tcp_cmds/ftp Modified Files: Tag: makefile_infra_rework ftp01 ftp02 ftp02_s1 ftp03 ftp04 ftp05 ftp_set_passwd Log Message: 1. Check in Bourne shell lib related RFC work changes. Prepare for integration test with scripts. 2. Fix a few Makefiles here and there. Index: ftp02_s1 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp02_s1,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ftp02_s1 22 Sep 2005 21:11:25 -0000 1.2 --- ftp02_s1 3 Aug 2009 11:36:56 -0000 1.2.4.1 *************** *** 48,53 **** # Check if connection succeeded. expect { ! "Name" {} ! timeout {send_user "\nConnection failed\n Test FAILED \n";exit 1} } --- 48,53 ---- # Check if connection succeeded. expect { ! "Name" {} ! timeout {send_user "\nConnection failed; test FAILED\n";exit 1} } *************** *** 59,66 **** expect { ! # 530 - Login failed ! "530" {send_user "Ftp invalid password, login test PASSED\n"} ! # 230 - Login successful ! "230" {send_user "Ftp invalid password, login test FAILED \n";exit 1} } --- 59,66 ---- expect { ! # 530 - Login failed ! "530" {send_user "Login failed as expected; test PASSED\n"} ! # 230 - Login successful ! "230" {send_user "Login succeeded unexpectedly; test FAILED\n"; exit 1} } *************** *** 68,72 **** send "exit\r" - send_user "\nTest Successful\n\n" exit 0 --- 68,71 ---- Index: ftp01 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp01,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ftp01 12 Apr 2005 19:43:53 -0000 1.4 --- ftp01 3 Aug 2009 11:36:56 -0000 1.4.4.1 *************** *** 40,78 **** # #---------------------------------------------------------------------- - #Uncomment line below for debug output. - #trace_logic=${trace_logic:-"set -x"} - $trace_logic - - RHOST=${RHOST:-`hostname`} - RUSER=${RUSER:-root} - PASSWD=${PASSWD:-.pasroot} - - TC=ftp - TCbin=${TCbin:-`pwd`} - TCtmp=${TCtmp:-$TCbin/$TC$$} - TCdat=${TCdat:-$TCbin/datafiles} - SLEEPTIME=${SLEEPTIME:-0} - ASCII_FILES=${ASCII_FILES:-"ascii.sm ascii.med ascii.lg ascii.jmb"} - BIN_FILES=${BIN_FILES:-"bin.sm bin.med bin.lg bin.jmb"} - - - #----------------------------------------------------------------------- - # - # FUNCTION: exists - # - #----------------------------------------------------------------------- - - exists() - { - for cmd in $1 - do - which $cmd 2>&1 1>/dev/null - if [ $? -ne 0 ] - then - tst_resm TBROK "Test broke: command $cmd not found" - exit 1 - fi - done - } #----------------------------------------------------------------------- --- 40,43 ---- *************** *** 84,100 **** do_setup() { - $trace_logic ! export TCID=ftp ! export TST_TOTAL=1 ! export TST_COUNT=1 ! exists "rsh ftp awk" ! mkdir -p $TCtmp ! cd $TCtmp - rsh -n -l root $RHOST mkdir -p $TCtmp - rsh -n -l root $RHOST chown -R ${RUSER} $TCtmp - [ $? = 0 ] || echo "Check .rhosts file on remote machine." } --- 49,75 ---- do_setup() { ! TC=ftp ! TCbin=${TCbin:-`pwd`} ! TCtmp=${TCtmp:-$TCbin/$TC$$} ! TCdat=${TCdat:-$TCbin/datafiles} ! SLEEPTIME=${SLEEPTIME:-0} ! ASCII_FILES=${ASCII_FILES:-"ascii.sm ascii.med ascii.lg ascii.jmb"} ! BIN_FILES=${BIN_FILES:-"bin.sm bin.med bin.lg bin.jmb"} ! RHOST=${RHOST:-`hostname`} ! RUSER=${RUSER:-root} ! PASSWD=${PASSWD:-.pasroot} ! ! tst_setup ! ! exists awk ftp rsh ! ! cd "$TCtmp" ! ! rsh -n -l root $RHOST mkdir -p "$TCtmp" ! rsh -n -l root $RHOST chown -R ${RUSER} "$TCtmp" ! [ $? = 0 ] || end_testcase "Check .rhosts file on remote machine." } *************** *** 107,159 **** do_test() { - $trace_logic ! for i in binary ascii ! do ! if [ $i = "binary" ]; then ! FILES=$BIN_FILES ! fi ! if [ $i = "ascii" ]; then ! FILES=$ASCII_FILES ! fi ! for j in $FILES ! do ! for a in get put ! do ! if [ $a = "get" ]; then ! { ! echo user $RUSER $PASSWD ! echo lcd $TCtmp ! echo $i ! echo cd $TCdat ! echo $a $j ! echo quit ! } | ftp -nv $RHOST ! SUM1=`ls -l $TCtmp/$j | awk '{print $5}'` ! SUM2=`ls -l $TCdat/$j | awk '{print $5}'` ! rm -f $TCtmp/$j ! else ! { ! echo user $RUSER $PASSWD ! echo lcd $TCdat ! echo $i ! echo cd $TCtmp ! echo $a $j ! echo quit ! } | ftp -nv $RHOST ! SUM1=`rsh -n -l root $RHOST sum $TCtmp/$j | awk '{print $1}'` ! SUM2=`sum $TCdat/$j | awk '{print $1}'` ! rsh -n -l root $RHOST rm -f $TCtmp/$j ! fi ! if [ $SUM1 = $SUM2 ]; then ! tst_resm TINFO "Test Successful doing ftp $a $j $i" ! else ! end_testcase "Test Fail: Wrong sum while performing ftp $a $j $i" ! fi ! sleep $SLEEPTIME ! done ! done ! done } --- 82,132 ---- do_test() { ! for i in binary ascii; do ! ! if [ $i = "binary" ]; then ! FILES=$BIN_FILES ! fi ! if [ $i = "ascii" ]; then ! FILES=$ASCII_FILES ! fi ! for j in $FILES; do ! ! for a in get put; do ! if [ $a = "get" ]; then ! { ! echo user $RUSER $PASSWD ! echo lcd $TCtmp ! echo $i ! echo cd $TCdat ! echo $a $j ! echo quit ! } | ftp -nv $RHOST ! SUM1=`ls -l $TCtmp/$j | awk '{print $5}'` ! SUM2=`ls -l $TCdat/$j | awk '{print $5}'` ! rm -f $TCtmp/$j ! else ! { ! echo user $RUSER $PASSWD ! echo lcd $TCdat ! echo $i ! echo cd $TCtmp ! echo $a $j ! echo quit ! } | ftp -nv $RHOST ! SUM1=`rsh -n -l root $RHOST sum $TCtmp/$j | awk '{print $1}'` ! SUM2=`sum $TCdat/$j | awk '{print $1}'` ! rsh -n -l root $RHOST rm -f $TCtmp/$j ! fi ! if [ $SUM1 = $SUM2 ]; then ! tst_resm TINFO "Test Successful doing ftp $a $j $i" ! else ! end_testcase "Test Fail: Wrong sum while performing ftp $a $j $i" ! fi ! sleep $SLEEPTIME ! done ! done ! done } *************** *** 167,196 **** do_cleanup() { ! $trace_logic ! ! rm -rf $TCtmp ! ! rsh -n -l root $RHOST rmdir $TCtmp ! } ! ! #============================================================================= ! # FUNCTION NAME: end_testcase ! # ! # FUNCTION DESCRIPTION: Clean up ! # ! # PARAMETERS: string, IF AND ONLY IF the testcase fails ! # ! # RETURNS: None. ! #============================================================================= ! ! end_testcase() ! { ! $trace_logic ! do_cleanup ! echo "$this_file: doing $0." ! ! [ $# = 0 ] && { tst_resm TPASS "Test Successful"; exit 0; } ! tst_resm TFAIL "Test Failed: $@" ! exit 1 } --- 140,145 ---- do_cleanup() { ! rsh -n -l root $RHOST rmdir "$TCtmp" ! tst_cleanup } *************** *** 203,206 **** --- 152,157 ---- # test. #---------------------------------------------------------------------- + . cmdlib.sh + do_setup do_test Index: ftp05 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp05,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ftp05 8 Dec 2006 22:34:01 -0000 1.4 --- ftp05 3 Aug 2009 11:36:56 -0000 1.4.4.1 *************** *** 32,119 **** # to conform with LTP standards in the offical LTP tree. ! RHOST="localhost" ! TEST_USER="anonymous" ! TEST_USER_PASSWD="no...@no..." ! tvar=${MACHTYPE%-*} ! tvar=${tvar#*-} ! if [ $tvar = "redhat" -o $tvar = "redhat-linux" ] ! then ! # Check if vsftpd is on system. ! which vsftpd ! if [ $? != 0 ] ! then { ! echo "vsftpd not found. Possible cause: does not exist on WS." ! echo "Test ftp05 FAIL." ! EXIT_CODE=1 ! exit 1 ! } ! fi ! ANONYMOUS_ENABLE=`cat /etc/vsftpd/vsftpd.conf | grep "^anonymous_enable=" | awk -F= '{print $2}'` ! else ! ANONYMOUS_ENABLE=`cat /etc/vsftpd.conf | grep "^anonymous_enable=" | awk -F= '{print $2}'` ! fi ! if [ "$ANONYMOUS_ENABLE" != "NO" ]; then ! ANONYMOUS_ENABLE="YES" ! fi ! EXIT_CODE=0 #----------------------------------------------------------------------- ! # FUNCTION: do_test # ! # DESCRIPTION: The anonymous user will ftp in and create a directory in his home directory on the remote host. #----------------------------------------------------------------------- ! do_test(){ ! echo "TEST: Ftp into a remote host as anonymous user, ANONYMOUS_ENABLE=$ANONYMOUS_ENABLE" ! if [ "$ANONYMOUS_ENABLE" = "YES" ]; then { ! expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : FAIL (ftp rejected login attempt)\n\";exit 1} ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : PASS (ftp allowed login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! } else { expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 500 - Login failed ! \"500\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! } fi - if [ $? != 0 ] - then { - EXIT_CODE=1 - } - fi } --- 32,114 ---- # to conform with LTP standards in the offical LTP tree. ! do_setup() ! { ! RHOST="localhost" ! TEST_USER="anonymous" ! TEST_USER_PASSWD="no...@no..." ! VSFTP_CONF= ! tst_setup ! exists expect ftp vsftpd ! for vsftp_conf in /etc/vsftpd /etc; do ! if [ -r "$vsftp_confdir/vsftp.conf" ]; then ! VSFTP_CONF="$vsftp_confdir/vsftp.conf" ! break ! fi ! done ! if [ ! -r "$VSFTP_CONF" ] ; then ! end_testcase "vsftpd.conf not found." ! fi ! ANONYMOUS_ENABLE=$(awk -F= '/^anonymous_enable=/ {print $2}' "$VSFTP_CONF") ! if [ "$ANONYMOUS_ENABLE" != "NO" ]; then ! ANONYMOUS_ENABLE="YES" ! fi ! } #----------------------------------------------------------------------- ! # FUNCTION : do_test # ! # DESCRIPTION: The anonymous user will ftp in and create a directory in his/her ! # home directory on the remote host. #----------------------------------------------------------------------- ! do_test() ! { ! tst_resm TINFO "Ftp into a remote host as anonymous user; ANONYMOUS_ENABLE=$ANONYMOUS_ENABLE" ! if [ "$ANONYMOUS_ENABLE" = "YES" ]; then ! expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : FAIL (ftp rejected login attempt)\n\";exit 1} ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : PASS (ftp allowed login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! else expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 500 - Login failed ! \"500\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! fi + [ $? -eq 0 ] || end_testcase "Testcase failed." } *************** *** 123,126 **** # the prologue. #---------------------------------------------------------------------- do_test ! exit $EXIT_CODE --- 118,124 ---- # the prologue. #---------------------------------------------------------------------- + . cmdlib.sh + + do_setup do_test ! end_testcase Index: ftp04 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp04,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** ftp04 8 Dec 2006 22:34:01 -0000 1.6 --- ftp04 3 Aug 2009 11:36:56 -0000 1.6.4.1 *************** *** 29,81 **** # 09/21/05 Kris Wilson (kr...@us...) Check if vsftpd is on system. ! RHOST=localhost ! TEST_USER=root ! ! if [ $PASSWD ] ! then ! TEST_USER_PASSWORD=$PASSWD ! else ! echo "YOU MUST EXPORT PASSWD VARIABLE" ! exit 1 ! fi ! EXIT_CODE=0 ! #----------------------------------------------------------------------- ! # FUNCTION: verify_user_is_in_ftpusers_db ! #----------------------------------------------------------------------- ! ! verify_user_is_in_ftpusers_db(){ ! tvar=${MACHTYPE%-*} ! tvar=${tvar#*-} ! if [ $tvar = "redhat" -o $tvar = "redhat-linux" ] ! then ! # Check if vsftpd is on system. ! which vsftpd ! if [ $? != 0 ] ! then { ! echo "vsftpd not found. Possible cause: does not exist on WS." ! echo "Test ftp04 FAIL." ! EXIT_CODE=1 ! exit 1 ! } ! fi echo "Verifying test user $TEST_USER is in /etc/vsftpd.ftpusers database..." FTPUSERS=`grep $TEST_USER /etc/vsftpd.ftpusers` ! else echo "Verifying test user $TEST_USER is in /etc/ftpusers database..." FTPUSERS=`grep $TEST_USER /etc/ftpusers` ! fi ! if [ "x$FTPUSERS" = "x" ] ! then { ! echo "Test user $TEST_USER not found in /etc/ftpusers unable to run TEST, exiting 0 ..." ! exit 0 ! } ! fi ! } --- 29,67 ---- # 09/21/05 Kris Wilson (kr...@us...) Check if vsftpd is on system. + #----------------------------------------------------------------------- + # FUNCTION: do_setup + #----------------------------------------------------------------------- + + do_setup() + { ! tvar=${MACHTYPE%-*} ! tvar=${tvar#*-} + RHOST=localhost + TEST_USER=root ! tst_setup ! if [ -n "$PASSWD" ]; then ! TEST_USER_PASSWORD=$PASSWD ! else ! end_testcase "You must set your password via the PASSWD variable." ! exit 1 ! fi ! exists expect ftp vsftpd ! if [ $tvar = "redhat" -o $tvar = "redhat-linux" ]; then echo "Verifying test user $TEST_USER is in /etc/vsftpd.ftpusers database..." FTPUSERS=`grep $TEST_USER /etc/vsftpd.ftpusers` ! else echo "Verifying test user $TEST_USER is in /etc/ftpusers database..." FTPUSERS=`grep $TEST_USER /etc/ftpusers` ! fi ! if [ -z "$FTPUSERS" ] ; then ! end_testcase "Test user $TEST_USER not found in /etc/ftpusers unable to run TEST, exiting 0 ..." ! fi ! } *************** *** 85,111 **** do_test() { ! echo "TEST: Ftp should reject $TEST_USER from loging in successfully" ! expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" ! " ! ! if [ $? != 0 ] ! then { ! EXIT_CODE=1 } ! fi } --- 71,93 ---- do_test() { ! tst_resm TINFO "Ftp should reject $TEST_USER from loging in successfully" ! expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} } ! expect \"ftp> \" ! send \"quit\r\" ! " ! ! [ $? -eq 0 ] || end_testcase "Testcase failed." } *************** *** 114,124 **** # FUNCTION: MAIN #---------------------------------------------------------------------- ! verify_user_is_in_ftpusers_db ! do_test ! exit $EXIT_CODE ! ! ! ! ! --- 96,102 ---- # FUNCTION: MAIN #---------------------------------------------------------------------- ! . cmdlib.sh + do_setup + do_test + end_testcase Index: ftp03 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp03,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ftp03 8 Dec 2006 22:34:01 -0000 1.4 --- ftp03 3 Aug 2009 11:36:56 -0000 1.4.4.1 *************** *** 32,89 **** # to conform with LTP standards in the offical LTP tree. - RHOST="localhost" - TEST_USER="ftpuser1" - TEST_USER_PASSWD="eal" - TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA" - TEST_USER_HOMEDIR="/home/$TEST_USER" - tvar=${MACHTYPE%-*} - tvar=${tvar#*-} - - if [ $tvar = "redhat" -o $tvar = "redhat-linux" ] - then - ls /etc/vsftpd/vsftpd.conf - if [ $? != 0 ] - then { - echo "vsftpd.conf not found. Possible cause: does not exist on WS." - echo "Test ftp03 FAIL." - EXIT_CODE=1 - exit 1 - } - fi - LOCAL_ENABLE=`cat /etc/vsftpd/vsftpd.conf | grep "^local_enable=" | awk -F= '{print $2}'` - else - LOCAL_ENABLE=`cat /etc/vsftpd.conf | grep "^local_enable=" | awk -F= '{print $2}'` - fi - if [ "$LOCAL_ENABLE" != "YES" ]; then - LOCAL_ENABLE="NO" - fi - - EXIT_CODE=0 - #----------------------------------------------------------------------- # FUNCTION: do_setup #----------------------------------------------------------------------- ! do_setup(){ ! #erase user if he may exist , so we can have a clean env ! rm -rf /home/$TEST_USER ! userdel $TEST_USER ! sleep 1 ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER ! if [ $? != 0 ] ! then { ! echo "Could not add test user $TEST_USER on system $RHOST." ! exit 1 ! } ! fi - #create users home diretory (SLES 8 does not do this, even when specified in adduser) - USER_UID=`id -u $TEST_USER` - USER_GID=`id -g $TEST_USER` - mkdir $TEST_USER_HOMEDIR - chown -R $USER_UID.$USER_GID $TEST_USER_HOMEDIR - } --- 32,85 ---- # to conform with LTP standards in the offical LTP tree. #----------------------------------------------------------------------- # FUNCTION: do_setup #----------------------------------------------------------------------- ! do_setup() ! { ! RHOST="localhost" ! TCtmp=/home/$TEST_USER ! TEST_USER="ftpuser1" ! TEST_USER_PASSWD="eal" ! TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA" ! TEST_USER_HOMEDIR="/home/$TEST_USER" ! VSFTP_CONF= ! tst_setup ! ! exists ftp useradd userdel vftpd ! ! for vsftp_conf in /etc/vsftpd /etc; do ! ! if [ -r "$vsftp_confdir/vsftp.conf" ]; then ! VSFTP_CONF="$vsftp_confdir/vsftp.conf" ! break ! fi ! ! done ! if [ ! -r "$VSFTP_CONF" ] ; then ! end_testcase "vsftpd.conf not found." ! fi ! LOCAL_ENABLE=$(awk -F= '/^local_enable=/ {print $2}' "$VSFTP_CONF") ! ! [ "$LOCAL_ENABLE" != "YES" ] && LOCAL_ENABLE="NO" ! ! userdel $TEST_USER ! sleep 1 ! ! if ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER; then ! end_testcase "Could not add test user $TEST_USER on system $RHOST." ! fi ! ! trap do_cleanup QUIT ! ! # create users home diretory (SLES 8 does not do this, even when specified ! # in adduser) ! USER_UID=$(id -u $TEST_USER) ! USER_GID=$(id -g $TEST_USER) ! mkdir -p "$TEST_USER_HOMEDIR" ! chown -R $USER_UID:$USER_GID $TEST_USER_HOMEDIR } *************** *** 92,98 **** #----------------------------------------------------------------------- ! do_cleanup(){ ! rm -rf /home/$TEST_USER ! userdel $TEST_USER } --- 88,95 ---- #----------------------------------------------------------------------- ! do_cleanup() ! { ! userdel $TEST_USER ! tst_cleanup } *************** *** 106,154 **** do_test(){ ! echo "TEST: Ftp into a remote host as a local user (other than root), LOCAL_ENABLE=$LOCAL_ENABLE" ! if [ "$LOCAL_ENABLE" = "YES" ]; then { expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : FAIL (ftp rejected login attempt)\n\";exit 1} ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : PASS (ftp allowed login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! } else { expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 500 - Login failed ! \"500\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! } fi ! ! if [ $? != 0 ] ! then { ! EXIT_CODE=1 ! } fi } --- 103,148 ---- do_test(){ ! tst_resm TINFO "TEST: Ftp into a remote host as a local user (other than root), LOCAL_ENABLE=$LOCAL_ENABLE" ! if [ "$LOCAL_ENABLE" = "YES" ]; then expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : FAIL (ftp rejected login attempt)\n\";exit 1} ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : PASS (ftp allowed login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! else expect -c " ! spawn ftp $RHOST ! sleep 1 ! expect -re \": \" ! send \"$TEST_USER\r\" ! expect -re \"Password:\" ! send \"$TEST_USER_PASSWD\r\" ! expect { ! # 230 - Login successful ! \"230\" {send_user \"==> TEST \#$TEST : FAIL (ftp allowed login attempt)\n\";exit 1} ! # 500 - Login failed ! \"500\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! # 530 - Login failed ! \"530\" {send_user \"==> TEST \#$TEST : PASS (ftp rejected login attempt)\n\";exit 0} ! } ! expect \"ftp> \" ! send \"quit\r\" " ! fi ! if [ $? != 0 ]; then ! end_testcase "Testcase failed" fi } *************** *** 159,164 **** # the prologue. #---------------------------------------------------------------------- do_setup do_test ! do_cleanup ! exit $EXIT_CODE --- 153,159 ---- # the prologue. #---------------------------------------------------------------------- + . cmdlib.sh + do_setup do_test ! end_testcase Index: ftp02 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp02,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ftp02 22 Mar 2004 16:48:47 -0000 1.1 --- ftp02 3 Aug 2009 11:36:56 -0000 1.1.4.1 *************** *** 30,56 **** # to conform with LTP standards in the offical LTP tree. - export RHOST="localhost" - export TEST_USER="ftpuser2" - export TEST_USER_PASSWD="eal" - export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA" - export TEST_USER_HOMEDIR="/home/$TEST_USER" - #----------------------------------------------------------------------- # FUNCTION: do_setup #----------------------------------------------------------------------- ! do_setup(){ ! #erase user if he may exist , so we can have a clean env ! rm -rf /home/$TEST_USER ! userdel $TEST_USER ! sleep 1 - useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER - if [ $? != 0 ] - then { - echo "Could not add test user $TEST_USER to system $RHOST." - exit 1 - } - fi } --- 30,62 ---- # to conform with LTP standards in the offical LTP tree. #----------------------------------------------------------------------- # FUNCTION: do_setup #----------------------------------------------------------------------- ! do_setup() ! { ! ! export RHOST="localhost" ! export TEST_USER="ftpuser2" ! export TEST_USER_PASSWD="eal" ! 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 ! TCtmp="/home/$TEST_USER" ! ! tst_setup ! ! exists expect ftp ftp02_s1 useradd userdel ! ! userdel $TEST_USER ! sleep 1 ! ! if ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER; then ! end_testcase "Could not add test user $TEST_USER to system $RHOST." ! fi ! ! trap do_cleanup EXIT } *************** *** 59,65 **** #----------------------------------------------------------------------- ! do_cleanup(){ ! rm -rf /home/$TEST_USER ! userdel $TEST_USER } --- 65,72 ---- #----------------------------------------------------------------------- ! do_cleanup() ! { ! userdel $TEST_USER ! tst_cleanup } *************** *** 72,79 **** # Exit with exit code of script called upon #----------------------------------------------------------------------- ! do_setup ! ftp02_s1 ! EXIT_CODE=$? ! do_cleanup ! exit $EXIT_CODE --- 79,85 ---- # Exit with exit code of script called upon #----------------------------------------------------------------------- ! . cmdlib.sh + do_setup + ftp02_s1 || end_testcase "Testcase failed." + end_testcase Index: ftp_set_passwd =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/network/tcp_cmds/ftp/ftp_set_passwd,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ftp_set_passwd 22 Mar 2004 16:48:47 -0000 1.1 --- ftp_set_passwd 3 Aug 2009 11:36:56 -0000 1.1.4.1 *************** *** 9,13 **** if { [llength $argv] < 2} { ! exit 1 } --- 9,13 ---- if { [llength $argv] < 2} { ! exit 1 } |