Commit 873d95a3 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Incorporated Daniel Black's test706 and test707 SOCKS test cases.

parent 1500e958

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ 


                                  Changelog



Dan F (8 June 2007)

- Incorporated Daniel Black's test706 and test707 SOCKS test cases.



- Fixed a few problems when starting the SOCKS server.



- Reverted some recent changes to runtests.pl that weren't compatible with

  perl 5.0.



Daniel S (6 June 2007)

- -s/--silent can now be used to toggle off the silence again if used a second

  time.

tests/data/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ 
 test603 test401 test402 test290 test291 test292 test293 test403 test404   \

 test405 test604 test605 test606 test607 test608 test609 test294 test295   \

 test296 test297 test298 test610 test611 test612 test406 test407 test408   \

 test409 test613 test614 test700 test701 test702 test704 test705 test703
 
 test409 test613 test614 test700 test701 test702 test704 test705 test703   \

 test706 test707

tests/data/test706

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<testcase>

#based off test 100

<info>

<keywords>

FTP

PASV

LIST

SOCKS4

</keywords>

</info>

#

# Server-side

<reply>

# When doing LIST, we get the default list output hard-coded in the test

# FTP server

<datacheck>

total 20

drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

-r--r--r--   1 0        1             35 Jul 16  1996 README

lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

</datacheck>

</reply>



#

# Client-side

<client>

<server>

ftp

socks4

</server>

 <name>

FTP dir list PASV via SOCKS4

 </name>

 <command>

--socks4 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<protocol>

USER anonymous

PASS ftp@example.com

PWD

EPSV

TYPE A

LIST

QUIT

</protocol>

</verify>

</testcase>

tests/data/test707

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<testcase>

#based off test 100

<info>

<keywords>

FTP

PASV

LIST

SOCKS5

</keywords>

</info>

#

# Server-side

<reply>

# When doing LIST, we get the default list output hard-coded in the test

# FTP server

<datacheck>

total 20

drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

-r--r--r--   1 0        1             35 Jul 16  1996 README

lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

</datacheck>

</reply>



#

# Client-side

<client>

<server>

ftp

socks5

</server>

 <name>

FTP dir list PASV via SOCKS5

 </name>

 <command>

--socks5 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<protocol>

USER anonymous

PASS ftp@example.com

PWD

EPSV

TYPE A

LIST

QUIT

</protocol>

</verify>

</testcase>

tests/runtests.pl

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ sub runsocksserver { 
    my $pidfile = $SOCKSPIDFILE;



    my $flag=$debugprotocol?"-v ":"";

    my $cmd="ssh -D ${HOSTIP}:$SOCKSPORT -N -F curl_ssh_config ${USER}\@${HOSTIP} -p ${SSHPORT} >log/ssh.log 2>&1";

    my $cmd="ssh -D ${HOSTIP}:$SOCKSPORT -N -F curl_ssh_config ${USER}\@${HOSTIP} -p ${SSHPORT} -vv >log/ssh.log 2>&1";

    my ($sshpid, $pid2) =

        startnew($cmd, $pidfile,1); # start the server in a new process