commit 42ee12157508704adbd4869a252be45c759c4b05
parent 38f50a6ce02eaaa0041407e149a7480fc04cea70
Author: Dan Callaghan <djc@djc.id.au>
Date: Sat, 17 Oct 2026 11:00:31 +1100
unfold headers before further parsing
Fixes handling of From headers where a CRLF fold appears inside the
quoted name portion.
Diffstat:
4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/Manifest.txt b/Manifest.txt
@@ -146,6 +146,7 @@ test/fixtures/blank-header-fields.eml
test/fixtures/contacts.txt
test/fixtures/embedded-message-rfc6532.eml
test/fixtures/embedded-message.eml
+test/fixtures/folded-from-header.eml
test/fixtures/invalid-date.eml
test/fixtures/mailing-list-header.eml
test/fixtures/malicious-attachment-names.eml
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -72,9 +72,12 @@ class Message
return unless v
return v unless v.is_a? String
return unless v.size < MAX_HEADER_VALUE_SIZE # avoid regex blowup on spam
+ ## Unfold per RFC 5322 2.2.3: remove each CRLF immediately followed
+ ## by WSP, leaving the WSP in place.
+ v = v.gsub(/\r?\n(?=[ \t])/, "")
## Header values should be either 7-bit with RFC2047-encoded words
## or UTF-8 as per RFC6532. Replace any invalid high bytes with U+FFFD.
- Rfc2047.decode_to $encoding, v.dup.force_encoding(Encoding::UTF_8).scrub
+ Rfc2047.decode_to $encoding, v.force_encoding(Encoding::UTF_8).scrub
end
def parse_header encoded_header
diff --git a/test/fixtures/folded-from-header.eml b/test/fixtures/folded-from-header.eml
@@ -0,0 +1,8 @@
+From: "Kevin Frazier, Juliana Schroeder, Brian Frye, Nathanael Fast,
+ and Rob Greer" <user@rss2email.invalid>
+To: someone@example.invalid
+Subject: folded From header
+Date: Fri, 16 Oct 2026 10:00:00 +0000
+Message-Id: <folded-from-header@example.invalid>
+
+body
diff --git a/test/test_message.rb b/test/test_message.rb
@@ -234,12 +234,25 @@ class TestMessage < Minitest::Test
# Look at another header field whose first line was blank.
list_unsubscribe = sup_message.list_unsubscribe
- assert_equal("<http://mailman2.widget.com/mailman/listinfo/monitor-list>,\n\t" +
+ assert_equal("<http://mailman2.widget.com/mailman/listinfo/monitor-list>,\t" +
"<mailto:monitor-list-request@widget.com?subject=unsubscribe>",
list_unsubscribe)
end
+ def test_folded_from_header
+ source = DummySource.new("sup-test://test_folded_from_header")
+ source.messages = [ fixture_path("folded-from-header.eml") ]
+ source_info = 0
+
+ sup_message = Message.build_from_source(source, source_info)
+ sup_message.load_from_source!
+
+ assert_equal "Kevin Frazier, Juliana Schroeder, Brian Frye, " +
+ "Nathanael Fast, and Rob Greer", sup_message.from.name
+ assert_equal "user@rss2email.invalid", sup_message.from.email
+ end
+
def test_rfc2047_header_encoding
source = DummySource.new("sup-test://test_rfc2047_header_encoding")
source.messages = [ fixture_path("rfc2047-header-encoding.eml") ]