Overview
Comment: | More test fixes. Tests marked "empty" will hang, presumably because of the synchronous nature of those tests. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
2af1d4883b2ea4725cd4a08cedf80765 |
User & Date: | awb on 2000-06-03 05:01:32 |
Other Links: | manifest | tags |
Context
2000-06-05
| ||
18:09 | Moved SSL shutdown up into the CloseProc, away from the asynchronous EventuallyFree check-in: b3abc0c1c4 user: welch tags: trunk | |
2000-06-03
| ||
05:01 | More test fixes. Tests marked "empty" will hang, presumably because of the synchronous nature of those tests. check-in: 2af1d4883b user: awb tags: trunk | |
03:35 | *** empty log message *** check-in: ed9d07e135 user: awb tags: trunk | |
Changes
Modified tests/remote.tcl from [6420d365ae] to [89ceb816c3].
1 2 3 4 5 6 7 8 9 10 11 | # This file contains Tcl code to implement a remote server that can be # used during testing of Tcl socket code. This server is used by some # of the tests in socket.test. # # Source this file in the remote server you are using to test Tcl against. # # Copyright (c) 1995-1996 Sun Microsystems, Inc. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | # This file contains Tcl code to implement a remote server that can be # used during testing of Tcl socket code. This server is used by some # of the tests in socket.test. # # Source this file in the remote server you are using to test Tcl against. # # Copyright (c) 1995-1996 Sun Microsystems, Inc. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: remote.tcl,v 1.3 2000/06/03 05:01:32 awb Exp $ # load tls package package require tls # Initialize message delimitor # Initialize command array |
︙ | ︙ | |||
92 93 94 95 96 97 98 99 100 101 102 103 104 105 | proc __accept__ {s a p} { global VERBOSE if {$VERBOSE} { puts "Server accepts new connection from $a:$p on $s" } fileevent $s readable [list __readAndExecute__ $s] fconfigure $s -buffering line -translation crlf } set serverIsSilent 0 for {set i 0} {$i < $argc} {incr i} { if {[string compare -serverIsSilent [lindex $argv $i]] == 0} { | > | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | proc __accept__ {s a p} { global VERBOSE if {$VERBOSE} { puts "Server accepts new connection from $a:$p on $s" } tls::handshake $s fileevent $s readable [list __readAndExecute__ $s] fconfigure $s -buffering line -translation crlf } set serverIsSilent 0 for {set i 0} {$i < $argc} {incr i} { if {[string compare -serverIsSilent [lindex $argv $i]] == 0} { |
︙ | ︙ |
Modified tests/tlsIo.test from [09e01ca39a] to [e3a6bcecdf].
1 2 3 4 5 6 7 8 9 10 11 12 | # Commands tested in this file: socket. # # This file contains a collection of tests for one or more of the Tcl # built-in commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 1994-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # Commands tested in this file: socket. # # This file contains a collection of tests for one or more of the Tcl # built-in commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 1994-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: tlsIo.test,v 1.12 2000/06/03 05:01:33 awb Exp $ # Running socket tests with a remote server: # ------------------------------------------ # # Some tests in socket.test depend on the existence of a remote server to # which they connect. The remote server must be an instance of tcltest and it # must run the script found in the file "remote.tcl" in this directory. You |
︙ | ︙ | |||
206 207 208 209 210 211 212 | } else { append resp $line "\n" } } } } | | | | | | | | | | | | | | | 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | } else { append resp $line "\n" } } } } test tlsIo-1.1 {arg parsing for socket command} {socket} { list [catch {tls::socket -server} msg] $msg } {1 {wrong # args: should be "tls::socket -server command ?options? port"}} test tlsIo-1.2 {arg parsing for socket command} {socket} { list [catch {tls::socket -server foo} msg] $msg } {1 {wrong # args: should be "tls::socket -server command ?options? port"}} test tlsIo-1.3 {arg parsing for socket command} {socket} { list [catch {tls::socket -myaddr} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.4 {arg parsing for socket command} {socket} { list [catch {tls::socket -myaddr 127.0.0.1} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.5 {arg parsing for socket command} {socket} { list [catch {tls::socket -myport} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.6 {arg parsing for socket command} {socket} { list [catch {tls::socket -myport xxxx} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.7 {arg parsing for socket command} {socket} { list [catch {tls::socket -myport 2522} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.8 {arg parsing for socket command} {socket} { list [catch {tls::socket -froboz} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.9 {arg parsing for socket command} {socket} { list [catch {tls::socket -server foo -myport 2521 3333} msg] $msg } {1 {wrong # args: should be "tls::socket -server command ?options? port"}} test tlsIo-1.10 {arg parsing for socket command} {socket} { list [catch {tls::socket host 2528 -junk} msg] $msg } {1 {wrong # args: should be "tls::socket ?options? host port"}} test tlsIo-1.11 {arg parsing for socket command} {socket} { list [catch {tls::socket -server callback 2520 --} msg] $msg } {1 {wrong # args: should be "tls::socket -server command ?options? port"}} test tlsIo-1.12 {arg parsing for socket command} {socket} { list [catch {tls::socket foo badport} msg] $msg } {1 {expected integer but got "badport"}} test tlsIo-2.1 {tcp connection} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x timed_out"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2828 \]" |
︙ | ︙ | |||
295 296 297 298 299 300 301 | if [info exists port] { incr port } else { set port [expr 2048 + [pid]%1024] } | | | 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | if [info exists port] { incr port } else { set port [expr 2048 + [pid]%1024] } test tlsIo-2.2 {tcp connection with client port specified} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x done"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2829 \]" |
︙ | ︙ | |||
334 335 336 337 338 339 340 | lappend x [gets $f] close $sock } close $f set x } [list ready "hello $port"] | | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | lappend x [gets $f] close $sock } close $f set x } [list ready "hello $port"] test tlsIo-2.3 {tcp connection with client interface specified} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x done"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2830 \]" |
︙ | ︙ | |||
371 372 373 374 375 376 377 | lappend x [gets $f] close $sock } close $f set x } {ready {hello 127.0.0.1}} | | | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | lappend x [gets $f] close $sock } close $f set x } {ready {hello 127.0.0.1}} test tlsIo-2.4 {tcp connection with server interface specified} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x done"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey -myaddr [info hostname] 2831 \]" |
︙ | ︙ | |||
407 408 409 410 411 412 413 | lappend x [gets $f] close $sock } close $f set x } {ready hello} | | | 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | lappend x [gets $f] close $sock } close $f set x } {ready hello} test tlsIo-2.5 {tcp connection with redundant server port} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x done"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2832 \]" |
︙ | ︙ | |||
442 443 444 445 446 447 448 | flush $sock lappend x [gets $f] close $sock } close $f set x } {ready hello} | | | | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | flush $sock lappend x [gets $f] close $sock } close $f set x } {ready hello} test tlsIo-2.6 {tcp connection} {socket} { set status ok if {![catch {set sock [tls::socket 127.0.0.1 2833]}]} { if {![catch {gets $sock}]} { set status broken } close $sock } set status } ok test tlsIo-2.7 {echo server, one line} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x done"] } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2834 \]" |
︙ | ︙ | |||
497 498 499 500 501 502 503 | set x [gets $s] close $s set y [gets $f] close $f list $x $y } {{hello abcdefghijklmnop} done} | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | set x [gets $s] close $s set y [gets $f] close $f list $x $y } {{hello abcdefghijklmnop} done} test tlsIo-2.8 {echo server, loop 50 times, single connection} {socket stdio} { set f [open script w] puts $f { package require tls } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2835 \]" puts $f { proc accept {s a p} { |
︙ | ︙ | |||
546 547 548 549 550 551 552 | } close $s catch {set x [gets $f]} close $f set x } {done 50} | | | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 | } close $s catch {set x [gets $f]} close $f set x } {done 50} test tlsIo-2.9 {socket conflict} {socket stdio} { set s [tls::socket -server accept 2828] removeFile script set f [open script w] puts -nonewline $f {package require tls; tls::socket -server accept 2828} close $f set f [open "|[list $::tcltest::tcltest script]" r] gets $f |
︙ | ︙ | |||
569 570 571 572 573 574 575 | invoked from within "eval ::socket $sopts" (procedure "tls::socket" line 62) invoked from within "tls::socket -server accept 2828" (file "script" line 1)}} | | | 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 | invoked from within "eval ::socket $sopts" (procedure "tls::socket" line 62) invoked from within "tls::socket -server accept 2828" (file "script" line 1)}} test tlsIo-2.10 {close on accept, accepted socket lives} {socket knownBug} { set done 0 set timer [after 20000 "set done timed_out"] set ss [tls::socket -server accept -certfile $serverCert -cafile $caCert \ -keyfile $serverKey 2830] proc accept {s a p} { global ss close $ss |
︙ | ︙ | |||
595 596 597 598 599 600 601 | close $cs vwait done after cancel $timer set done } 1 | | | 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 | close $cs vwait done after cancel $timer set done } 1 test tlsIo-2.11 {detecting new data} {socket knownBug} { proc accept {s a p} { global sock set sock $s set f [open awb.log w] puts $f [catch {tls::handshake $sock} err] puts $f "err: $err" puts $f "[tls::status $sock]" |
︙ | ︙ | |||
630 631 632 633 634 635 636 | fconfigure $sock -blocking 1 close $s2 close $s close $sock set result } {one {} two} | | | 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | fconfigure $sock -blocking 1 close $s2 close $s close $sock set result } {one {} two} test tlsIo-2.12 {tcp connection; no certificates specified} {socket stdio pcCrash} { removeFile script set f [open script w] puts $f { package require tls set timer [after 2000 "set x timed_out"] set f [tls::socket -server accept 2828] proc accept {file addr port} { |
︙ | ︙ | |||
665 666 667 668 669 670 671 | close $f set x } {ready done {}} | | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 | close $f set x } {ready done {}} test tlsIo-3.1 {socket conflict} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2828 \]" puts $f { |
︙ | ︙ | |||
689 690 691 692 693 694 695 | -server accept 2828} msg] \ $msg] puts $f bye close $f set x } {1 {couldn't open socket: address already in use}} | | | 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 | -server accept 2828} msg] \ $msg] puts $f bye close $f set x } {1 {couldn't open socket: address already in use}} test tlsIo-3.2 {server with several clients} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls set t1 [after 30000 "set x timed_out"] set t2 [after 31000 "set x timed_out"] set t3 [after 32000 "set x timed_out"] |
︙ | ︙ | |||
756 757 758 759 760 761 762 | close $s2 close $s3 lappend x [gets $f] close $f set x } {ready done} | | | 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 | close $s2 close $s3 lappend x [gets $f] close $f set x } {ready done} test tlsIo-4.1 {server with several clients} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls gets stdin } puts $f "set s \[tls::socket -certfile $clientCert -cafile $caCert -keyfile $clientKey 127.0.0.1 2828 \]" |
︙ | ︙ | |||
824 825 826 827 828 829 830 | puts $p3 bye close $p1 close $p2 close $p3 set l } {{p1 bye done} {p2 bye done} {p3 bye done}} | | | | | | | 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 | puts $p3 bye close $p1 close $p2 close $p3 set l } {{p1 bye done} {p2 bye done} {p3 bye done}} test tlsIo-4.2 {byte order problems, socket numbers, htons} {socket} { set x ok if {[catch {tls::socket -server dodo 0x3000} msg]} { set x $msg } else { close $msg } set x } ok test tlsIo-5.1 {byte order problems, socket numbers, htons} \ {socket unixOnly notRoot} { set x {couldn't open socket: not owner} if {![catch {tls::socket -server dodo 0x1} msg]} { set x {htons problem, should be disallowed, are you running as SU?} close $msg } set x } {couldn't open socket: not owner} test tlsIo-5.2 {byte order problems, socket numbers, htons} {socket} { set x {couldn't open socket: port number too high} if {![catch {tls::socket -server dodo 0x10000} msg]} { set x {port resolution problem, should be disallowed} close $msg } set x } {couldn't open socket: port number too high} test tlsIo-5.3 {byte order problems, socket numbers, htons} \ {socket unixOnly notRoot} { set x {couldn't open socket: not owner} if {![catch {tls::socket -server dodo 21} msg]} { set x {htons problem, should be disallowed, are you running as SU?} close $msg } set x } {couldn't open socket: not owner} test tlsIo-6.1 {accept callback error} {socket stdio pcCrash} { removeFile script set f [open script w] puts $f { package require tls gets stdin tls::socket 127.0.0.1 2848 } |
︙ | ︙ | |||
887 888 889 890 891 892 893 | vwait x after cancel $timer close $s rename bgerror {} set x } {{divide by zero}} | | | 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 | vwait x after cancel $timer close $s rename bgerror {} set x } {{divide by zero}} test tlsIo-7.1 {testing socket specific options} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls } puts $f "tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2820" puts $f { |
︙ | ︙ | |||
919 920 921 922 923 924 925 | close $f set l "" lappend l [string compare [lindex $p 0] 127.0.0.1] lappend l [string compare [lindex $p 2] 2820] lappend l [llength $p] } {0 0 3} | | | 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 | close $f set l "" lappend l [string compare [lindex $p 0] 127.0.0.1] lappend l [string compare [lindex $p 2] 2820] lappend l [llength $p] } {0 0 3} test tlsIo-7.2 {testing socket specific options} {socket stdio} { removeFile script set f [open script w] puts $f { package require tls } puts $f "tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2821" puts $f { |
︙ | ︙ | |||
948 949 950 951 952 953 954 | 127.0.0.1 2821] set p [fconfigure $s -sockname] close $s close $f set l "" lappend l [llength $p] lappend l [lindex $p 0] | | | | | | > | 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 | 127.0.0.1 2821] set p [fconfigure $s -sockname] close $s close $f set l "" lappend l [llength $p] lappend l [lindex $p 0] lappend l [string equal [lindex $p 2] 2821] } {3 127.0.0.1 0} test tlsIo-7.3 {testing socket specific options} {socket} { set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2822] set l [fconfigure $s] close $s update llength $l } 12 test tlsIo-7.4 {testing socket specific options} {socket} { set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2823] proc accept {s a p} { global x set x [fconfigure $s -sockname] close $s } set s1 [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ [info hostname] 2823] set timer [after 10000 "set x timed_out"] vwait x after cancel $timer close $s close $s1 set l "" lappend l [lindex $x 2] [llength $x] } {2823 3} test tlsIo-7.5 {testing socket specific options} {socket unixOrPc} { set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2829] proc accept {s a p} { global x set x [fconfigure $s -sockname] close $s } set s1 [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ 127.0.0.1 2829] set timer [after 10000 "set x timed_out"] vwait x after cancel $timer close $s close $s1 set l "" lappend l [lindex $x 0] [lindex $x 2] [llength $x] } {127.0.0.1 2829 3} test tlsIo-8.1 {testing -async flag on sockets} {empty socket} { # test seems to hang -- awb 6/2/2000 # NOTE: This test may fail on some Solaris 2.4 systems. If it does, # check that you have these patches installed (using showrev -p): # # 101907-05, 101925-02, 101945-14, 101959-03, 101969-05, 101973-03, # 101977-03, 101981-02, 101985-01, 102001-03, 102003-01, 102007-01, # 102011-02, 102024-01, 102039-01, 102044-01, 102048-01, 102062-03, # 102066-04, 102070-01, 102105-01, 102153-03, 102216-01, 102232-01, |
︙ | ︙ | |||
1037 1038 1039 1040 1041 1042 1043 | vwait x set z [gets $s1] close $s close $s1 set z } bye | | > | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 | vwait x set z [gets $s1] close $s close $s1 set z } bye test tlsIo-9.1 {testing spurious events} {empty socket} { # locks up set len 0 set spurious 0 set done 0 proc readlittle {s} { global spurious done len set l [read $s 1] if {[string length $l] == 0} { |
︙ | ︙ | |||
1059 1060 1061 1062 1063 1064 1065 | incr len [string length $l] } } proc accept {s a p} { fconfigure $s -buffering none -blocking off fileevent $s readable [list readlittle $s] } | | > > | > > | | > > | > > | > | 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 | incr len [string length $l] } } proc accept {s a p} { fconfigure $s -buffering none -blocking off fileevent $s readable [list readlittle $s] } set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2831] set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ [info hostname] 2831] puts -nonewline $c 01234567890123456789012345678901234567890123456789 close $c set timer [after 10000 "set done timed_out"] vwait done after cancel $timer close $s list $spurious $len } {0 50} test tlsIo-9.2 {testing async write, fileevents, flush on close} {socket} { set firstblock "" for {set i 0} {$i < 5} {incr i} {set firstblock "a$firstblock$firstblock"} set secondblock "" for {set i 0} {$i < 16} {incr i} { set secondblock "b$secondblock$secondblock" } set l [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2832] proc accept {s a p} { fconfigure $s -blocking 0 -translation lf -buffersize 16384 \ -buffering line fileevent $s readable "readable $s" } proc readable {s} { set l [gets $s] fileevent $s readable {} after 1000 respond $s } proc respond {s} { global firstblock puts -nonewline $s $firstblock after 1000 writedata $s } proc writedata {s} { global secondblock puts -nonewline $s $secondblock close $s } set s [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ [info hostname] 2832] fconfigure $s -blocking 0 -trans lf -buffering line set count 0 puts $s hello proc readit {s} { global count done set l [read $s] incr count [string length $l] if {[eof $s]} { close $s set done 1 } } fileevent $s readable "readit $s" set timer [after 10000 "set done timed_out"] vwait done after cancel $timer close $l set count } 65566 test tlsIo-9.3 {testing EOF stickyness} {empty socket} { # hangs proc count_to_eof {s} { global count done timer set l [gets $s] if {[eof $s]} { incr count if {$count > 9} { close $s |
︙ | ︙ | |||
1149 1150 1151 1152 1153 1154 1155 | puts $s bye close $s } proc accept {s a p} { fconfigure $s -buffering line -translation lf fileevent $s writable "write_then_close $s" } | | > > | > > | | | 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 | puts $s bye close $s } proc accept {s a p} { fconfigure $s -buffering line -translation lf fileevent $s writable "write_then_close $s" } set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2833] set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ [info hostname] 2833] fconfigure $c -blocking off -buffering line -translation lf fileevent $c readable "count_to_eof $c" set timer [after 1000 timerproc] vwait done close $s set count } {eof is sticky} removeFile script test tlsIo-10.1 {testing socket accept callback error handling} {socket} { set goterror 0 proc bgerror args {global goterror; set goterror 1} set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2898] proc accept {s a p} {close $s; error} set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ 127.0.0.1 2898] vwait goterror close $s close $c set goterror } 1 test tlsIo-11.1 {tcp connection} {socket doTestsWithRemoteServer} { sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" sendCommand { set socket9_1_test_server [tls::socket -server accept \ |
︙ | ︙ | |||
1204 1205 1206 1207 1208 1209 1210 | $remoteServerIP 2834] set r [gets $s] close $s sendCommand {close $socket9_1_test_server} set r } done | | > | | > | 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 | $remoteServerIP 2834] set r [gets $s] close $s sendCommand {close $socket9_1_test_server} set r } done test tlsIo-11.2 {client specifies its port} {socket doTestsWithRemoteServer} { sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" if {[info exists port]} { incr port } else { set port [expr 2048 + [pid]%1024] } sendCommand { set socket9_2_test_server [tls::socket -server accept \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ 2835] proc accept {s a p} { tls::handshake $s puts $s $p close $s } } set s [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ -myport $port $remoteServerIP 2835] set r [gets $s] close $s sendCommand {close $socket9_2_test_server} if {$r == $port} { set result ok } else { set result broken } set result } ok test tlsIo-11.3 {trying to connect, no server} {socket doTestsWithRemoteServer} { set status ok if {![catch {set s [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ $remoteServerIp 2836]}]} { if {![catch {gets $s}]} { set status broken } close $s } set status } ok test tlsIo-11.4 {remote echo, one line} {socket doTestsWithRemoteServer} { sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" sendCommand { global serverCert global caCert global serverKey set socket10_6_test_server [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2836] proc accept {s a p} { tls::handshake $s fileevent $s readable [list echo $s] fconfigure $s -buffering line -translation crlf } proc echo {s} { set l [gets $s] if {[eof $s]} { close $s |
︙ | ︙ | |||
1291 1292 1293 1294 1295 1296 1297 | puts $f hello set r [gets $f] close $f sendCommand {close $socket10_6_test_server} set r } hello | | > | 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 | puts $f hello set r [gets $f] close $f sendCommand {close $socket10_6_test_server} set r } hello test tlsIo-11.5 {remote echo, 50 lines} {socket doTestsWithRemoteServer} { sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" sendCommand { set socket10_7_test_server [tls::socket -server accept \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ 2836] proc accept {s a p} { tls::handshake $s fileevent $s readable [list echo $s] fconfigure $s -buffering line -translation crlf } proc echo {s} { set l [gets $s] if {[eof $s]} { close $s |
︙ | ︙ | |||
1338 1339 1340 1341 1342 1343 1344 | # Macintosh sockets can have more than one server per port if {$tcl_platform(platform) == "macintosh"} { set conflictResult {0 2836} } else { set conflictResult {1 {couldn't open socket: address already in use}} } | | | > > | 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 | # Macintosh sockets can have more than one server per port if {$tcl_platform(platform) == "macintosh"} { set conflictResult {0 2836} } else { set conflictResult {1 {couldn't open socket: address already in use}} } test tlsIo-11.6 {socket conflict} {socket doTestsWithRemoteServer} { set s1 [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2836] if {[catch {set s2 [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2836]} msg]} { set result [list 1 $msg] } else { set result [list 0 [lindex [fconfigure $s2 -sockname] 2]] close $s2 } close $s1 set result } $conflictResult test tlsIo-11.7 {server with several clients} {socket doTestsWithRemoteServer} { sendCommand { set socket10_9_test_server [tls::socket \ -certfile [file join [pwd] certs server.pem] \ -cafile [file join [pwd] certs caFile.pem] \ -keyfile [file join [pwd] certs skey.pem] \ -server accept 2836] proc accept {s a p} { # handshake locks up the three synchronous clients # tls::handshake $s fconfigure $s -buffering line fileevent $s readable [list echo $s] } proc echo {s} { set l [gets $s] if {[eof $s]} { close $s |
︙ | ︙ | |||
1401 1402 1403 1404 1405 1406 1407 | close $s1 close $s2 close $s3 sendCommand {close $socket10_9_test_server} set i } 100 | | > | 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 | close $s1 close $s2 close $s3 sendCommand {close $socket10_9_test_server} set i } 100 test tlsIo-11.8 {client with several servers} {empty socket doTestsWithRemoteServer} { # this one seems to hang -- awb 6/2/2000 sendCommand { set s1 [tls::socket \ -certfile [file join [pwd] certs server.pem] \ -cafile [file join [pwd] certs caFile.pem] \ -keyfile [file join [pwd] certs skey.pem] \ -server "accept 4003" 4003] set s2 [tls::socket \ -certfile [file join [pwd] certs server.pem] \ -cafile [file join [pwd] certs caFile.pem] \ -keyfile [file join [pwd] certs skey.pem] \ -server "accept 4004" 4004] set s3 [tls::socket \ -certfile [file join [pwd] certs server.pem] \ -cafile [file join [pwd] certs caFile.pem] \ -keyfile [file join [pwd] certs skey.pem] \ -server "accept 4005" 4005] proc accept {mp s a p} { tls::handshake $s puts $s $mp close $s } } set s1 [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ $remoteServerIP 4003] |
︙ | ︙ | |||
1447 1448 1449 1450 1451 1452 1453 | close $s1 close $s2 close $s3 } set l } {4003 {} 1 4004 {} 1 4005 {} 1} | | | 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 | close $s1 close $s2 close $s3 } set l } {4003 {} 1 4004 {} 1 4005 {} 1} test tlsIo-11.9 {accept callback error} {socket doTestsWithRemoteServer} { set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 2836] proc accept {s a p} {expr 10 / 0} proc bgerror args { global x set x $args |
︙ | ︙ | |||
1481 1482 1483 1484 1485 1486 1487 | vwait x after cancel $timer close $s rename bgerror {} set x } {{divide by zero}} | | | 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 | vwait x after cancel $timer close $s rename bgerror {} set x } {{divide by zero}} test tlsIo-11.10 {testing socket specific options} {socket doTestsWithRemoteServer} { sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" sendCommand { set socket10_12_test_server [tls::socket \ |
︙ | ︙ | |||
1507 1508 1509 1510 1511 1512 1513 | set l "" lappend l [lindex $p 2] [llength $p] [llength $p] close $s sendCommand {close $socket10_12_test_server} set l } {2836 3 3} | | > > | 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 | set l "" lappend l [lindex $p 2] [llength $p] [llength $p] close $s sendCommand {close $socket10_12_test_server} set l } {2836 3 3} test tlsIo-11.11 {testing spurious events} {empty socket doTestsWithRemoteServer} { # hangs sendCommand "set caCert $caCert" sendCommand "set serverCert $serverCert" sendCommand "set clientCert $clientCert" sendCommand "set serverKey $serverKey" sendCommand "set clientKey $clientKey" sendCommand { set socket10_13_test_server [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2836] proc accept {s a p} { tls::handshake $s fconfigure $s -translation "auto lf" after 100 writesome $s } proc writesome {s} { for {set i 0} {$i < 100} {incr i} { puts $s "line $i from remote server" } |
︙ | ︙ | |||
1558 1559 1560 1561 1562 1563 1564 | set timer [after 10000 "set done timed_out"] vwait done after cancel $timer sendCommand {close $socket10_13_test_server} list $spurious $len } {0 2690} | | | 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 | set timer [after 10000 "set done timed_out"] vwait done after cancel $timer sendCommand {close $socket10_13_test_server} list $spurious $len } {0 2690} test tlsIo-11.12 {testing EOF stickyness} {socket doTestsWithRemoteServer} { set counter 0 set done 0 proc count_up {s} { global counter done after_id set l [gets $s] if {[eof $s]} { incr counter |
︙ | ︙ | |||
1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 | sendCommand { set socket10_14_test_server [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2836] proc accept {s a p} { after 100 close $s } } set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ $remoteServerIP 2836] fileevent $c readable "count_up $c" set after_id [after 1000 timed_out] vwait done sendCommand {close $socket10_14_test_server} set done } {EOF is sticky} | > | | 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 | sendCommand { set socket10_14_test_server [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2836] proc accept {s a p} { tls::handshake $s after 100 close $s } } set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ $remoteServerIP 2836] fileevent $c readable "count_up $c" set after_id [after 1000 timed_out] vwait done sendCommand {close $socket10_14_test_server} set done } {EOF is sticky} test tlsIo-11.13 {testing async write, async flush, async close} \ {socket doTestsWithRemoteServer} { proc readit {s} { global count done set l [read $s] incr count [string length $l] if {[eof $s]} { close $s |
︙ | ︙ | |||
1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 | } set l [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2845] proc accept {s a p} { fconfigure $s -blocking 0 -translation lf -buffersize 16384 \ -buffering line fileevent $s readable "readable $s" } proc readable {s} { set l [gets $s] fileevent $s readable {} | > | 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 | } set l [tls::socket \ -certfile $serverCert \ -cafile $caCert \ -keyfile $serverKey \ -server accept 2845] proc accept {s a p} { tls::handshake $s fconfigure $s -blocking 0 -translation lf -buffersize 16384 \ -buffering line fileevent $s readable "readable $s" } proc readable {s} { set l [gets $s] fileevent $s readable {} |
︙ | ︙ | |||
1668 1669 1670 1671 1672 1673 1674 | set timer [after 10000 "set done timed_out"] vwait done after cancel $timer sendCommand {close $l} set count } 65566 | | | > | > | > | | | | 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 | set timer [after 10000 "set done timed_out"] vwait done after cancel $timer sendCommand {close $l} set count } 65566 test tlsIo-12.1 {testing inheritance of server sockets} \ {socket doTestsWithRemoteServer} { removeFile script1 removeFile script2 # Script1 is just a 10 second delay. If the server socket # is inherited, it will be held open for 10 seconds set f [open script1 w] puts $f { after 10000 exit vwait forever } close $f # Script2 creates the server socket, launches script1, # waits a second, and exits. The server socket will now # be closed unless script1 inherited it. set f [open script2 w] # puts $f [list set tcltest $::tcltest::tcltest] puts $f [list set tclsh [info nameofexecutable]] puts $f { package require tcltest package require tls } puts $f "set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2828 \]" puts $f { proc accept { file addr port } { close $file } # exec $::tcltest::tcltest script1 & exec $tclsh script1 & close $f after 1000 exit vwait forever } close $f # Launch script2 and wait 5 seconds # exec $::tcltest::tcltest script2 & exec [info nameofexecutable] script2 & after 5000 { set ok_to_proceed 1 } vwait ok_to_proceed # If we can still connect to the server, the socket got inherited. if {[catch {tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ 127.0.0.1 2828} msg]} { set x {server socket was not inherited} } else { close $msg set x {server socket was inherited} } removeFile script1 removeFile script2 set x } {server socket was not inherited} test tlsIo-12.2 {testing inheritance of client sockets} \ {socket doTestsWithRemoteServer} { removeFile script1 removeFile script2 # Script1 is just a 10 second delay. If the server socket # is inherited, it will be held open for 10 seconds set f [open script1 w] puts $f { after 10000 exit vwait forever } close $f # Script2 opens the client socket and writes to it. It then # launches script1 and exits. If the child process inherited the # client socket, the socket will still be open. set f [open script2 w] puts $f [list set tclsh [info nameofexecutable]] puts $f { package require tls } puts $f "set f \[tls::socket -certfile $clientCert -cafile $caCert -keyfile $clientKey 127.0.0.1 2829 \]" puts $f { exec $tclsh script1 & puts $f testing flush $f after 1000 exit vwait forever } close $f |
︙ | ︙ | |||
1808 1809 1810 1811 1812 1813 1814 | # script1 process must have inherited the client. set failed 0 after 5000 [list set failed 1] # Launch the script2 process | | | | > | | | | | | | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 | # script1 process must have inherited the client. set failed 0 after 5000 [list set failed 1] # Launch the script2 process exec [info nameofexecutable] script2 & vwait x if {!$failed} { vwait failed } removeFile script1 removeFile script2 set x } {client socket was not inherited} test tlsIo-12.3 {testing inheritance of accepted sockets} \ {empty socket doTestsWithRemoteServer} { # hangs on Linux removeFile script1 removeFile script2 set f [open script1 w] puts $f { after 10000 exit vwait forever } close $f set f [open script2 w] puts $f [list set tclsh [info nameofexecutable]] puts $f { package require tls } puts $f "catch {set f \[tls::socket -server accept -certfile $serverCert -cafile $caCert -keyfile $serverKey 2930 \]}" puts $f { proc accept { file host port } { global tclsh puts $file {test data on socket} exec $tclsh script1 & after 1000 exit } catch {vwait forever} } close $f # Launch the script2 process and connect to it. See how long # the socket stays open exec [info nameofexecutable] script2 & after 1000 set ok_to_proceed 1 vwait ok_to_proceed set f [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ 127.0.0.1 2930] |
︙ | ︙ | |||
1900 1901 1902 1903 1904 1905 1906 | vwait x removeFile script1 removeFile script2 set x } {accepted socket was not inherited} | | | 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 | vwait x removeFile script1 removeFile script2 set x } {accepted socket was not inherited} test tlsIo-13.1 {Testing use of shared socket between two threads} \ {socket testthread} { removeFile script threadReap makeFile { package require tls |
︙ | ︙ |