X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=test%2Ftests%2Fbad-input%2Ftest-header;h=6b826a00d7fbfc7fd6b6a20ee70b0fcaeb97d3c8;hp=4832106ca14db7d6b50ba7103ac07e22eeddc593;hb=82325c1114254a76b8285bb710b2f651674331c7;hpb=8b4410a1f3cb75e3d92b61176397655d509f81ee

diff --git a/test/tests/bad-input/test-header b/test/tests/bad-input/test-header
index 4832106..6b826a0 100644
--- a/test/tests/bad-input/test-header
+++ b/test/tests/bad-input/test-header
@@ -1,20 +1,18 @@
 #!/bin/sh
+######################################################
+#
+# Test bogus headers (no blank line before body, etc.)
+#
+######################################################
 
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
-    diff -u $expected $actual
-    if [ $? -ne 0 ]; then
-        failed=$((failed + 1))
-    fi
-}
+. "$MH_TEST_COMMON"
 
 expected=$MH_TEST_DIR/$$.expected
-actual=$MH_TEST_DIR/$$.actual
 
 # Write message with bogus header field (missing blank line, really).
-msgfile=$(mhpath new)
-msgnum=$(basename $msgfile)
+msgfile="$(mhpath b)"
+msgnum="$(basename $msgfile)"
+
 cat > $msgfile <<EOF
 Date: Sun, 18 Dec 2005 00:52:39 +0100
 From: foo@example.edu
@@ -25,44 +23,88 @@ This is a multi-part message in MIME format.
 I am a stupid spammer.
 EOF
 
+
 # check scan
-cat > $expected <<EOF
-  11  12/18 foo@example.edu    test<<This is a multi-part message in MIME forma
-EOF
-scan $msgnum > $actual 2>&1
-check
+runandcheck "scan $msgnum" <<!
+  11  2005-12-18 00:52  foo@example.edu    test
+!
 
-# check show (mhl)
-cat > $expected <<EOF
-(Message inbox:11)
 
+# check show
+runandcheck "show $msgnum" <<!
 Date:    Sun, 18 Dec 2005 00:52:39 +0100
-To:      bar@example.edu
 From:    foo@example.edu
+To:      bar@example.edu
 Subject: test
 
+part       text/plain                  70
 
 This is a multi-part message in MIME format.
 
-
 I am a stupid spammer.
+!
+
+
+
+# check m_getfld() handling of empty header field
+msgfile="`mhpath b`"
+printf 'Date: Sat, 12 Jan 2013 09:07:01 -0600\nReceived:' >"$msgfile"
+runandcheck "scan l" <<!
+scan: eof encountered in field "Received"
+??Format error (message 12) in component 2
+  12  2013-01-12 09:07                     
+!
+
+
+
+# check m_getfld() handling of excessively long header field name
+
+msgfile="$MH_TEST_DIR/Mail/inbox/13"
+cat >"$msgfile" <<EOF
+Date: Tue, 15 Jan 2013 21:13:12 -0600
+ThisHeaderFieldNameIsWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayTooLong: OK
 EOF
-show $msgnum > $actual 2>&1
-check
+runandcheck "scan l" <<!
+scan: field name "ThisHeaderFieldNameIsWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayTooLong" exceeds 997 bytes
+??Format error (message 13) in component 2
+  13  2013-01-15 21:13                     
+!
 
-# check mhshow
-cat > $expected <<EOF
-Date:    Sun, 18 Dec 2005 00:52:39 +0100
-To:      bar@example.edu
-From:    foo@example.edu
-Subject: test
 
 
-part       text/plain                  70
+# # Cygwin has a BUFSIZ of 1024 so the error message gets truncated.
+# # Deal with that by grepping to verify that scan showed the proper error.
+# verify_string_in_file() {
+#   if grep "$1" "$2" >/dev/null; then
+#     :
+#   else
+#     echo "$0: did not receive expected error message \"$1\""
+#     failed=`expr ${failed:-0} + 1`
+#   fi
+# }
+# verify_string_in_file 'scan: field name "ThisHeaderFieldNameIsWa' "$actual_err"
+# verify_string_in_file 'exceeds 997' "$actual_err"
+# verify_string_in_file '??Format error (message 13) in component 2' "$actual_err"
+# rm -f "$actual_err"
+
+
+
+
+# check m_getfld() handling of long header field name without a colon
+
+msgfile="$MH_TEST_DIR/Mail/inbox/14"
+cat >"$msgfile" <<EOF
+Date: Thu, 17 Jan 2013 19:33:46 -0600
+If a header field name has at least 512 characters without a newline or colon, it will raise a format error in m_getfld().  Here is a test of that.  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901
+
+Test
 
-This is a multi-part message in MIME format.
 
-I am a stupid spammer.
 EOF
-mhshow -nopause $msgnum > $actual 2>&1
-check
+
+runandcheck "scan l" <<!
+scan: eol encountered in field "If a header field name has at least 512 characters without a newline or colon, it will raise a format error in m_getfld().  Here is a test of that.  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901"
+??Format error (message 14) in component 2
+  14  2013-01-17 19:33                     
+!
+