From 0dfff3282dcfbee8f1568797c2acd4983674c0d9 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sat, 3 Oct 2020 19:43:48 +0200 Subject: [PATCH 1/1] Testsuite: Provide '>>> ' for script input to allow binary data (take 2) This mimics the '>>> ' prefix known for the test client. Any line prefixed with '>>> ' will be processed by Perl's string eval(). As '>>> ' is generic and documented, it replaces the (undocumented) '\NONL\' tag. The client input lines starting with '>>> ' are now changed to '\>>> ' to avoid evaluation by the runtest script. (Test 4030, 1101). --- test/README | 18 +++++++++++++++--- test/runtest | 8 +++++--- test/scripts/0000-Basic/0100 | 6 +++--- test/scripts/0000-Basic/0101 | 6 +++--- test/scripts/0000-Basic/0242 | 4 ++-- test/scripts/0000-Basic/0900 | 2 +- test/scripts/0000-Basic/0901 | 4 ++-- test/scripts/1100-Basic-TLS/1101 | 2 +- test/scripts/4030-proxy-protocol/4030 | 2 +- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/test/README b/test/README index d944b29ac..7a852ee43 100644 --- a/test/README +++ b/test/README @@ -862,6 +862,16 @@ The remaining commands are followed by data lines for their standard input, terminated by four asterisks. Even if no data is required for the particular usage, the asterisks must be given. +If the input line starts with '>>> ', this prefix and any trailing spaces +(including line feed) are removed. The reminder is processed with Perl's +string eval() function, effectivly evaluatiing escape sequences like +'\x41', or '\r'. If you need a line feed there, you need to encode it +according to your needs. + +If the input line starts with '\>>> ', the backslash is removed and the +rest of the line is passed as input. This is used by the client tool, +which understands the '>>> ' prefix for similar processing. + background @@ -876,7 +886,6 @@ except that the data it generates is copied to the end of the test-stdout file as well as to the named file. - client [] [] This command runs the auxiliary "client" program that simulates an SMTP client. @@ -1047,10 +1056,13 @@ Lines in client scripts are of several kinds: (5) If a line begins with three '>' characters and a space, the rest of the line is input to be sent to the server. Backslash escaping is done as - described below, but no trailing "\r\n" is sent. + described below, but no trailing "\r\n" is sent. As the runtest's + input processing catches the '>>> ' for its string eval, you may + want to escape from this first stage processing by prefixing your + line with '\'. (6) If a line begin with three '<' characters and a space, the rest of the - line is a filename; the content of the file is inserted intto the script + line is a filename; the content of the file is inserted into the script at this point. (7) Otherwise, the line is an input line line that is sent to the server. Any diff --git a/test/runtest b/test/runtest index f61b016f9..a4d49aa79 100755 --- a/test/runtest +++ b/test/runtest @@ -2792,8 +2792,9 @@ else { tests_exit(-1, "Command unrecognized in line $lineno: $_"); } # Run the command, with stdin connected to a pipe, and write the stdin data -# to it, with appropriate substitutions. If a line ends with \NONL\, chop off -# the terminating newline (and the \NONL\). If the command contains +# to it, with appropriate substitutions. If a starts with '>>> ', process it +# via Perl's string eval(). +# If the command contains # -DSERVER=server add "-server" to the command, where it will adjoin the name # for the stderr file. See comment above about the use of -DSERVER. @@ -2807,7 +2808,8 @@ while (