Skip to content

Commit

Permalink
tests: split command args tests for EHLO and EHLO
Browse files Browse the repository at this point in the history 
Due to the many sleeps this test takes long, so split it in 2 parts to allow
this to be run in parallel. While at it fix test failures if stderr logging is
enabled.
  • Loading branch information
@DerDakon
DerDakon committed Jul 22, 2024
1 parent dc9b2a1 commit f45ba75
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 17 deletions.
25 changes: 16 additions & 9 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -851,19 +851,26 @@ else ()
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}250-[^\n ]*\n250-ENHANCEDSTATUSCODES\n250-PIPELINING\n250-8BITMIME\n(.*\n)?250 SIZE( [0-9]+)?\n${QSMTPD_QUEUE_LOG}250 2\\.1\\.5 sender <> is syntactically correct\n250 2\\.1\\.0 recipient <postmaster> OK\n550 5\\.5\\.3 bounce messages must not have more than one recipient\nrejected message to <postmaster> from <> from IP \\[::ffff:127.0.0.1\\] {bad bounce}\nrejected message to <postmaster> from <> from IP \\[::ffff:127.0.0.1\\] {bad bounce}\n554 5\\.1\\.1 no valid recipients\n${QSMTPD_QUIT_LINE}$")
endif ()

set(TEST_SEQUENCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmd_args.cmake")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Qsmtpd_quit.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd_cmd_args.cmake" @ONLY)
add_test(NAME "Qsmtpd_cmd_args"
COMMAND "${CMAKE_COMMAND}"
-P "${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd_cmd_args.cmake")
foreach (cmd_test IN ITEMS ehlo helo)
set(TEST_SEQUENCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmd_args_${cmd_test}.cmake")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Qsmtpd_quit.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd_cmd_args_${cmd_test}.cmake" @ONLY)
add_test(NAME "Qsmtpd_cmd_args_${cmd_test}"
COMMAND "${CMAKE_COMMAND}"
-P "${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd_cmd_args_${cmd_test}.cmake")
endforeach()

# Do not add \r here, looks like CMake automatically strips it, so just
# assume we are doing it right.
if (NOSTDERR)
set_tests_properties(Qsmtpd_cmd_args PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}${QSMTPD_HELO_RESPONSE}${QSMTPD_HELO_RESPONSE}500 5\\.5\\.2 command syntax error\n250-[^\n ]*\n250-ENHANCEDSTATUSCODES\n250-PIPELINING\n250-8BITMIME\n(.*\n)?250 SIZE( [0-9]+)?\n501 5\\.5\\.2 unrecognized command parameter\n250 2\\.1\\.5 sender <> is syntactically correct\n500 5\\.5\\.2 command syntax error\n501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n250 2\\.1\\.5 sender <> is syntactically correct\n(500 5\\.5\\.2 command syntax error\n250 2\\.0\\.0 ok\n)+500-5\\.5\\.2 line too long\n500-5\\.5\\.2 This is usually a bug in your mail client\n500 5\\.5\\.2 Try to use a different encoding like quoted-printable for this mail.\n250 2.0.0 ok\n501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n500 5\\.5\\.2 command syntax error\n503 5\\.5\\.1 SMTP command sent after end of PIPELINING command group\n503 5\\.5\\.1 Bad sequence of commands\n${QSMTPD_QUIT_LINE}$")
set_tests_properties(Qsmtpd_cmd_args_helo PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}${QSMTPD_HELO_RESPONSE}${QSMTPD_HELO_RESPONSE}500 5\\.5\\.2 command syntax error\n${QSMTPD_QUIT_LINE}$")
set_tests_properties(Qsmtpd_cmd_args_ehlo PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}250-[^\n ]*\n250-ENHANCEDSTATUSCODES\n250-PIPELINING\n250-8BITMIME\n(.*\n)?250 SIZE( [0-9]+)?\n501 5\\.5\\.2 unrecognized command parameter\n250 2\\.1\\.5 sender <> is syntactically correct\n500 5\\.5\\.2 command syntax error\n501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n250 2\\.1\\.5 sender <> is syntactically correct\n(500 5\\.5\\.2 command syntax error\n250 2\\.0\\.0 ok\n)+500-5\\.5\\.2 line too long\n500-5\\.5\\.2 This is usually a bug in your mail client\n500 5\\.5\\.2 Try to use a different encoding like quoted-printable for this mail.\n250 2.0.0 ok\n501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n500 5\\.5\\.2 command syntax error\n503 5\\.5\\.1 SMTP command sent after end of PIPELINING command group\n503 5\\.5\\.1 Bad sequence of commands\n${QSMTPD_QUIT_LINE}$")
else ()
set_tests_properties(Qsmtpd_cmd_args PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}${QSMTPD_HELO_RESPONSE}${QSMTPD_HELO_RESPONSE}(bad SMTP command syntax)?500 5\\.5\\.2 command syntax error\n(bad SMTP command syntax)?250-[^\n ]*\n250-ENHANCEDSTATUSCODES\n250-PIPELINING\n250-8BITMIME\n(.*\n)?250 SIZE( [0-9]+)?\n(bad SMTP command parameter)?501 5\\.5\\.2 unrecognized command parameter\n(bad SMTP command parameter)?${QSMTPD_QUEUE_LOG}250 2\\.1\\.5 sender <> is syntactically correct\n500 5\\.5\\.2 command syntax error\n501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n(bad SMTP command syntax)?250 2\\.1\\.5 sender <> is syntactically correct\n(500 5\\.5\\.2 command syntax error\n250 2\\.0\\.0 ok\n)+bad SMTP command syntax500-5\\.5\\.2 line too long\n500-5\\.5\\.2 This is usually a bug in your mail client\n500 5\\.5\\.2 Try to use a different encoding like quoted-printable for this mail.\n250 2.0.0 ok\ntoo long SMTP line501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n500 5\\.5\\.2 command syntax error\n503 5\\.5\\.1 SMTP command sent after end of PIPELINING command group\n503 5\\.5\\.1 Bad sequence of commands\n${QSMTPD_QUIT_LINE}bad SMTP command syntax$")
set_tests_properties(Qsmtpd_cmd_args_helo PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}${QSMTPD_HELO_RESPONSE}${QSMTPD_HELO_RESPONSE}(bad SMTP command syntax)?500 5\\.5\\.2 command syntax error\n(bad SMTP command syntax)?${QSMTPD_QUIT_LINE}(bad SMTP command syntax\n)?$")
set_tests_properties(Qsmtpd_cmd_args_ehlo PROPERTIES
PASS_REGULAR_EXPRESSION "^${PROFILE_MSG}${QSMTPD_GREETING_LINE}250-[^\n ]*\n250-ENHANCEDSTATUSCODES\n250-PIPELINING\n250-8BITMIME\n(.*\n)?250 SIZE( [0-9]+)?\n(bad SMTP command parameter)?501 5\\.5\\.2 unrecognized command parameter\n(bad SMTP command parameter)?${QSMTPD_QUEUE_LOG}250 2\\.1\\.5 sender <> is syntactically correct\n(bad SMTP command parameter)?500 5\\.5\\.2 command syntax error\n(bad SMTP command syntax)?501 5\\.1\\.3 domain of mail address is syntactically incorrect\n(bad SMTP command syntax)?250 2\\.0\\.0 ok\n(bad SMTP command syntax)?250 2\\.1\\.5 sender <> is syntactically correct\n((bad SMTP command syntax)*500 5\\.5\\.2 command syntax error\n250 2\\.0\\.0 ok\n)+bad SMTP command syntax500-5\\.5\\.2 line too long\n500-5\\.5\\.2 This is usually a bug in your mail client\n500 5\\.5\\.2 Try to use a different encoding like quoted-printable for this mail.\n250 2.0.0 ok\ntoo long SMTP line501 5\\.1\\.3 domain of mail address is syntactically incorrect\n250 2\\.0\\.0 ok\n500 5\\.5\\.2 command syntax error\n503 5\\.5\\.1 SMTP command sent after end of PIPELINING command group\n503 5\\.5\\.1 Bad sequence of commands\n(bad SMTP command syntax)?${QSMTPD_QUIT_LINE}(bad SMTP command syntax\n)?$")
endif ()

set(TEST_SEQUENCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Qsmtpd_bad_args.cmake")
Expand Down
8 changes: 0 additions & 8 deletions tests/cmd_args.cmake → tests/cmd_args_ehlo.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ foreach(i 1 2 3 4 5 6 7)
endforeach()

execute_process(COMMAND sleep 15)
# invalid HELO, but this will be filtered later
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "HELO [foo] \r")
execute_process(COMMAND sleep 1)
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "HELO nonsense.example.org\r")
execute_process(COMMAND sleep 1)
# arguments only allowed in ESMTP mode
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "mail from:<> size=20\r")
execute_process(COMMAND sleep 1)
# local ip as ehlo
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "EHLO [127.0.0.1]\r")
execute_process(COMMAND sleep 1)
Expand Down
22 changes: 22 additions & 0 deletions tests/cmd_args_helo.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
cmake_minimum_required(VERSION 3.0...3.27)

# The maximum permitted line length without extensions is 510 characters + CRLF.
# The easiest way to have a otherwise valid line that violates this length limit
# is to extend the space bug space.
set(SPACES " ")
foreach(i 1 2 3 4 5 6 7)
set(SPACES "${SPACES}${SPACES}")
endforeach()

execute_process(COMMAND sleep 15)
# invalid HELO, but this will be filtered later
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "HELO [foo] \r")
execute_process(COMMAND sleep 1)
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "HELO nonsense.example.org\r")
execute_process(COMMAND sleep 1)
# arguments only allowed in ESMTP mode
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "mail from:<> size=20\r")
execute_process(COMMAND sleep 1)

execute_process(COMMAND ${CMAKE_COMMAND} -E echo "quit\r")
execute_process(COMMAND sleep 1)

0 comments on commit f45ba75

Please sign in to comment.