X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/47b86722957cca6057bf5fcd07c9d1f01b4516f8..ef0725fd97369e801a56febfdb7a6ec2eaff73c8:/test/mhfixmsg/test-mhfixmsg?ds=inline diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index c2070c51..66e45a32 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -53,12 +53,15 @@ Usage: mhfixmsg [+folder] [msgs] [switches] -decodetext 8bit|7bit|binary -nodecodetext -decodetypes + -decodeheaderfieldbodies utf-8 + -nodecodeheaderfieldbodies -[no]crlflinebreaks -[no]textcharset -[no]reformat -[no]replacetextplain -[no]fixboundary -[no]fixcte + -[no]checkbase64 -fixtype mimetype -file file -outfile file @@ -71,7 +74,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches] EOF #### Skip nmh intro text. -run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1 +run_prog mhfixmsg -help 2>&1 | sed '/^$/,$d' >"$actual" check "$expected" "$actual" @@ -364,8 +367,8 @@ else fi -# check -nodecode -start_test "-nodecode" +# check -nodecodetext +start_test "-nodecodetext" prepare_space >"$expected" <"$expected.err" #### lynx inserts multiple blank lines, so squeeze them. - run_prog mhfixmsg last -nodecode -outfile - -verbose 2>"$actual.err" | \ + run_prog mhfixmsg last -nodecodetext -outfile - -verbose 2>"$actual.err" | \ squeeze_lines >"$actual" check "$expected" "$actual" 'ignore space' check "$expected.err" "$actual.err" @@ -1727,7 +1730,7 @@ check "`mhpath last`" "$actual" 'keep first' start_test "pass through message with relative folder path with parse error" #### Factor out leading portion of current folder path and make it relative. -pwd=`pwd` +pwd=`pwd -P` set +e run_prog mhfixmsg +./`mhpath | sed "s%^$pwd/%%"` last -out - >"$actual" 2>/dev/null set -e @@ -1790,6 +1793,362 @@ run_prog mhfixmsg -file - -outfile - <`mhpath last` >"$actual" 2>/dev/null check "$expected" "$actual" +start_test "-nodecodeheaderfieldbodies" +cat >"`mhpath new`" <"$actual" 2>/dev/null +check `mhpath last` "$actual" 'keep first' + + +start_test "test decoding of UTF-8 header value" +cat >"$expected" <"$actual" 2>/dev/null +check "$expected" "$actual" + + +start_test "-checkbase64 with base64 code that ends with == plus footer" +cat >"`mhpath new`" < +Subject: base64 code that ends with == +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQuCg== + +-- +Wait, this shouldn't be here. +EOF + +cat >"$expected" < +Subject: base64 code that ends with == +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is some text. + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart-- +EOF +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + +start_test "-checkbase64 with -nodecodetext" +cat >"`mhpath new`" < +Subject: base64 code that ends with == +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQuCg== + +-- +Wait, this shouldn't be here. +EOF + +cat >"$expected" < +Subject: base64 code that ends with == +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQuCg== + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart-- +EOF +run_prog mhfixmsg -nodecodetext last -outfile "$actual" +check "$expected" "$actual" + + +start_test "-checkbase64 with base64 code that ends with = plus footer" +cat >"`mhpath new`" < +Subject: base64 code that ends with = +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBwbGFpbiB0ZXh0Lgo= + +-- +Wait, this shouldn't be here. +EOF + +cat >"$expected" < +Subject: base64 code that ends with = +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is plain text. + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart-- +EOF +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + +start_test "-checkbase64 with base64 code that ends without = plus footer" +cat >"`mhpath new`" < +Subject: base64 code that ends without = +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQK + +-- +Wait, this shouldn't be here. +EOF + +cat >"$expected" < +Subject: base64 code that ends without = +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is some text + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart-- +EOF +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + +start_test "-checkbase64 with base64 code that contains single invalid character" +cat >"`mhpath new`" < +Subject: base64 code that ends without = +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQK + +-X- +Wait, this shouldn't be here. +EOF + +cat >"$expected" < +Subject: base64 code that ends without = +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQK + +-X- +Wait, this shouldn't be here. +EOF + +cat >"$expected_err" <"$actual_err" || true +check "$expected" "$actual" +check "$expected_err" "$actual_err" + + +start_test "-checkbase64 with base64 code in MIME part" +cat >"`mhpath new`" < +Subject: MIME part with base64 encoded text and unencoded footer +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBzb21lIHRleHQK + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is a second text/plain part. + +------=_nmh-multipart-- +EOF + +cat >"$expected" < +Subject: MIME part with base64 encoded text and unencoded footer +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" + +------=_nmh-multipart +Content-Type: multipart/mixed; boundary="----=_nmh-multipart1" + +------=_nmh-multipart1 +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is some text + +------=_nmh-multipart1 +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart1-- + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +This is a second text/plain part. + +------=_nmh-multipart-- +EOF +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + +start_test "-checkbase64 with 8-bit encoded base64 code" +cat >"`mhpath new`" < +Subject: 8-bit encoded base64 code +MIME-Version: 1.0 +Content-Type: text/plain +Content-Transfer-Encoding: base64 + +U2VlIFJGQyAyMDQ1IMKnNi44Lg== + +-- +Wait, this shouldn't be here. +EOF +cat >"$expected" < +Subject: 8-bit encoded base64 code +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_nmh-multipart" +Content-Transfer-Encoding: 8bit + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 8bit + +See RFC 2045 §6.8. + +------=_nmh-multipart +Content-Type: text/plain +Content-Transfer-Encoding: 7bit + +-- +Wait, this shouldn't be here. + +------=_nmh-multipart-- +EOF + +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + # make sure there are no tmp files left over find "$MH_TEST_DIR/Mail" -name '*mhfix*' -print \ >"$actual" @@ -1798,5 +2157,6 @@ EOF check "$expected" "$actual" + finish_test exit $failed