From: Heiko Schlittermann (HS12-RIPE) Date: Wed, 26 Feb 2020 22:44:31 +0000 (+0100) Subject: Testsuite: Move 2040 to 1101 (hanging pipelining connections) X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/14e2dbbf0ec482f9fa5dd5a4fb6f2954a27f21eb Testsuite: Move 2040 to 1101 (hanging pipelining connections) While this was a bug using GnuTLS, the test is rather generic and the expected behaviour does not depend on the TLS implementation. --- diff --git a/test/confs/1101 b/test/confs/1101 new file mode 100644 index 000000000..fcb468072 --- /dev/null +++ b/test/confs/1101 @@ -0,0 +1,46 @@ +# Exim test configuration 2040 +# The test uses the same config for two Exim processes +# +# ,------ callout -------. +# | | +# | .----------. | +# `--> PORT_S | | +# client-gnutls --> PORT_D Exim |----' +# `----------' + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +tls_advertise_hosts = * + +tls_certificate = DIR/aux-fixed/cert1 +tls_privatekey = DIR/aux-fixed/cert1 + +acl_smtp_rcpt = acl_check_rcpt + +begin acl +acl_check_rcpt: + + accept condition = ${if eq{$received_port}{PORT_S}} + message = Accepted (rcpt on backend) + + accept verify = recipient/callout=no_cache + message = Accepted (rcpt via callout) + +begin routers +catchall: + driver = accept + transport = local_smtp + +begin transports +local_smtp: + driver = smtp + port = PORT_S + hosts = 127.0.0.1 + hosts_require_tls = * + allow_localhost + +# End diff --git a/test/confs/2040 b/test/confs/2040 deleted file mode 100644 index fcb468072..000000000 --- a/test/confs/2040 +++ /dev/null @@ -1,46 +0,0 @@ -# Exim test configuration 2040 -# The test uses the same config for two Exim processes -# -# ,------ callout -------. -# | | -# | .----------. | -# `--> PORT_S | | -# client-gnutls --> PORT_D Exim |----' -# `----------' - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -acl_smtp_rcpt = acl_check_rcpt - -begin acl -acl_check_rcpt: - - accept condition = ${if eq{$received_port}{PORT_S}} - message = Accepted (rcpt on backend) - - accept verify = recipient/callout=no_cache - message = Accepted (rcpt via callout) - -begin routers -catchall: - driver = accept - transport = local_smtp - -begin transports -local_smtp: - driver = smtp - port = PORT_S - hosts = 127.0.0.1 - hosts_require_tls = * - allow_localhost - -# End diff --git a/test/log/1101 b/test/log/1101 new file mode 100644 index 000000000..d239d2cfd --- /dev/null +++ b/test/log/1101 @@ -0,0 +1,3 @@ + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S diff --git a/test/log/2040 b/test/log/2040 deleted file mode 100644 index d239d2cfd..000000000 --- a/test/log/2040 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S diff --git a/test/scripts/1100-Basic-TLS/1101 b/test/scripts/1100-Basic-TLS/1101 new file mode 100644 index 000000000..0bcefa9fd --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1101 @@ -0,0 +1,18 @@ +# TLS server: uncork in pipelining mode, fixed in bd95ffc2ba87fbd3c752df17bc8fd9c01586d45a +exim -DSERVER=server -bd -oX PORT_D:PORT_S +**** +client-anytls 127.0.0.1 PORT_D +??? 220 +EHLO rhu.barb +????250 +STARTTLS +??? 220 +EHLO rhu.barb +????250 +>>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n +??? 250 OK +??? 250 Accepted (rcpt via callout) +QUIT +??? 2 +**** +killdaemon diff --git a/test/scripts/2000-GnuTLS/2040 b/test/scripts/2000-GnuTLS/2040 deleted file mode 100644 index c8780d217..000000000 --- a/test/scripts/2000-GnuTLS/2040 +++ /dev/null @@ -1,19 +0,0 @@ -# TLS server: uncork in pipelining mode -gnutls -exim -DSERVER=server -bd -oX PORT_D:PORT_S -**** -client-gnutls 127.0.0.1 PORT_D -??? 220 -EHLO rhu.barb -????250 -STARTTLS -??? 220 -EHLO rhu.barb -????250 ->>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n -??? 250 OK -??? 250 Accepted (rcpt via callout) -QUIT -??? 2 -**** -killdaemon diff --git a/test/stdout/1101 b/test/stdout/1101 new file mode 100644 index 000000000..10f5cb155 --- /dev/null +++ b/test/stdout/1101 @@ -0,0 +1,21 @@ +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO rhu.barb +????250 +>>> STARTTLS +??? 220 +<<< 220 TLS go ahead +Attempting to start TLS +Succeeded in starting TLS +>>> EHLO rhu.barb +????250 +>>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n +??? 250 OK +<<< 250 OK +??? 250 Accepted (rcpt via callout) +<<< 250 Accepted (rcpt via callout) +>>> QUIT +??? 2 +<<< 221 myhost.test.ex closing connection +End of script diff --git a/test/stdout/2040 b/test/stdout/2040 deleted file mode 100644 index 10f5cb155..000000000 --- a/test/stdout/2040 +++ /dev/null @@ -1,21 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO rhu.barb -????250 ->>> STARTTLS -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> EHLO rhu.barb -????250 ->>> MAIL FROM:<>\r\nRCPT TO:test@example.com\r\n -??? 250 OK -<<< 250 OK -??? 250 Accepted (rcpt via callout) -<<< 250 Accepted (rcpt via callout) ->>> QUIT -??? 2 -<<< 221 myhost.test.ex closing connection -End of script