Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rmail: dont convert to ascii, use unicode regexp and add test for header field with weird char #214

Closed
wants to merge 2 commits into from
Closed

rmail: dont convert to ascii, use unicode regexp and add test for header field with weird char #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d53e6
rmail: dont convert to ascii, use unicode regexp and add test for hea…
gauteh Jan 28, 2014
1a68681
test: crappy address field in spam message
gauteh Jan 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/sup/message.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ def decode_header_field v
return v unless v.is_a? String
return unless v.size < MAX_HEADER_VALUE_SIZE # avoid regex blowup on spam
d = v.dup
d = d.transcode($encoding, 'ASCII')
# no need to transcode field when it is not converted to ascii
# in RMail
#d = d.transcode($encoding, 'ASCII')
Rfc2047.decode_to $encoding, d
end

Expand Down
17 changes: 0 additions & 17 deletions lib/sup/util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,6 @@ def calculate_boundaries(message)
end

class Header

# Convert to ASCII before trying to match with regexp
class Field

class << self
def parse(field)
field = field.dup.to_s
field = field.fix_encoding!.ascii
if field =~ EXTRACT_FIELD_NAME_RE
[ $1, $'.chomp ]
else
[ "", Field.value_strip(field) ]
end
end
end
end

## Be more cautious about invalid content-type headers
## the original RMail code calls
## value.strip.split(/\s*;\s*/)[0].downcase
Expand Down
160 changes: 160 additions & 0 deletions test/messages/bad-address-spam.eml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
Return-Path: <[email protected]>
X-Original-To: [email protected]
Delivered-To: [email protected]
Received: by binsbergen.vps.codeventures.net (Postfix, from userid 1001)
id 0FE2122017; Fri, 2 Mar 2012 07:37:55 +0100 (CET)
Received: from localhost by binsbergen.vps.codeventures.net
with SpamAssassin (version 3.3.2);
Fri, 02 Mar 2012 07:37:54 +0100
From: VIAGRA � Official Site <[email protected]>
To: <[email protected]>
Subject: ddddddddd Pf|zer Discount ID48184
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
aa.a.a.a.a.net
X-Spam-Flag: YES
X-Spam-Level: *****************************************
X-Spam-Status: Yes, score=41.3 required=5.0 tests=BAYES_99,DOS_OE_TO_MX,
DRUGS_ERECTILE,DRUGS_ERECTILE_OBFU,FORGED_MUA_OUTLOOK,FORGED_OUTLOOK_HTML,
FORGED_YAHOO_RCVD,FREEMAIL_FROM,FSL_HELO_NON_FQDN_1,HELO_NO_DOMAIN,
HK_NAME_DRUGS,HTML_IMAGE_ONLY_12,HTML_MESSAGE,HTML_SHORT_LINK_IMG_1,
MIME_HTML_ONLY,MISSING_DATE,MISSING_MID,RAZOR2_CF_RANGE_51_100,
RAZOR2_CF_RANGE_E8_51_100,RAZOR2_CHECK,RCVD_IN_BL_SPAMCOP_NET,
RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_XBL,RDNS_NONE,T_REMOTE_IMAGE,
T_SURBL_MULTI1,T_SURBL_MULTI2,T_SURBL_MULTI3,T_URIBL_SEM,T_URIBL_SEM_FRESH,
T_URIBL_SEM_RED,URIBL_AB_SURBL,URIBL_DBL_SPAM,URIBL_JP_SURBL,URIBL_RHS_DOB,
URIBL_SBL,URIBL_SC_SURBL,URIBL_WS_SURBL autolearn=spam version=3.3.2
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----------=_4F506AC2.EE281DC4"
Message-Id: <[email protected]>
Date: Fri, 2 Mar 2012 07:37:55 +0100 (CET)

This is a multi-part message in MIME format.

------------=_4F506AC2.EE281DC4
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Spam detection software, running on the system "a.a.a.a.a.", has
identified this incoming email as possible spam. The original message
has been attached to this so you can view it (if it isn't spam) or label
similar future email. If you have any questions, see
@@CONTACT_ADDRESS@@ for details.

Content preview: Click here! [...]

Content analysis details: (41.3 points, 5.0 required)

pts rule name description
---- ---------------------- --------------------------------------------------
3.3 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL
[197.226.240.40 listed in zen.spamhaus.org]
0.4 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL
4.5 URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist
[URIs: pillsquar.com]
1.6 URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist
[URIs: pillsquar.com]
1.2 URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist
[URIs: pillsquar.com]
0.6 URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist
[URIs: pillsquar.com]
1.5 URIBL_RHS_DOB Contains an URI of a new domain (Day Old Bread)
[URIs: pillsquar.com]
1.7 URIBL_DBL_SPAM Contains an URL listed in the DBL blocklist
[URIs: pillsquar.com]
3.5 BAYES_99 BODY: Bayes spam probability is 99 to 100%
[score: 1.0000]
0.0 FSL_HELO_NON_FQDN_1 FSL_HELO_NON_FQDN_1
0.6 HK_NAME_DRUGS From name contains drugs
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
(hbvv[at]yahoo.com)
1.6 FORGED_YAHOO_RCVD 'From' yahoo.com does not match 'Received' headers
2.1 HTML_IMAGE_ONLY_12 BODY: HTML: images with 800-1200 bytes of words
0.0 HTML_MESSAGE BODY: HTML included in message
0.7 MIME_HTML_ONLY BODY: Message only has text/html MIME parts
1.9 RAZOR2_CF_RANGE_E8_51_100 Razor2 gives engine 8 confidence level
above 50%
[cf: 100]
0.5 RAZOR2_CF_RANGE_51_100 Razor2 gives confidence level above 50%
[cf: 100]
0.9 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/)
1.4 RCVD_IN_BRBL_LASTEXT RBL: RCVD_IN_BRBL_LASTEXT
[197.226.240.40 listed in bb.barracudacentral.org]
1.3 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net
[Blocked - see <http://www.spamcop.net/bl.shtml?197.226.240.40>]
0.0 T_URIBL_SEM_RED Contains a URI listed in urired.spameatingmonkey.net
[URIs: pillsquar.com]
0.0 T_URIBL_SEM Contains a URI listed in uribl.spameatingmonkey.net
[URIs: pillsquar.com]
0.0 T_URIBL_SEM_FRESH Contains a domain registered less than 5 days ago
[URIs: pillsquar.com]
1.6 URIBL_SBL Contains an URL listed in the SBL blocklist
[URIs: pillsquar.com]
0.5 MISSING_MID Missing Message-Id: header
1.1 DRUGS_ERECTILE_OBFU Obfuscated reference to an erectile drug
2.0 DRUGS_ERECTILE Refers to an erectile drug
0.0 T_SURBL_MULTI2 T_SURBL_MULTI2
0.8 RDNS_NONE Delivered to internal network by a host with no rDNS
0.0 HTML_SHORT_LINK_IMG_1 HTML is very short with a linked image
0.0 T_SURBL_MULTI3 T_SURBL_MULTI3
0.0 FORGED_OUTLOOK_HTML Outlook can't send HTML message only
0.0 T_SURBL_MULTI1 T_SURBL_MULTI1
0.0 HELO_NO_DOMAIN Relay reports its domain incorrectly
1.4 MISSING_DATE Missing Date: header
0.0 T_REMOTE_IMAGE Message contains an external image
1.9 FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook
2.5 DOS_OE_TO_MX Delivered direct to MX with OE headers

The original message was not completely plain text, and may be unsafe to
open with some email clients; in particular, it may contain a virus,
or confirm that your address can receive spam. If you wish to view
it, it may be safer to save it to a file and open it with an editor.


------------=_4F506AC2.EE281DC4
Content-Type: message/rfc822; x-spam-type=original
Content-Description: original message before SpamAssassin
Content-Disposition: attachment
Content-Transfer-Encoding: 8bit

Received: from aspire4315 (unknown [197.226.240.40])
by binsbergen.vps.codeventures.net (Postfix) with SMTP id EC69521FA4
for <[email protected]>; Fri, 2 Mar 2012 07:37:51 +0100 (CET)
Subject: [email protected] Pf|zer Discount ID48184
From: VIAGRA � Official Site <[email protected]>
To: <[email protected]>
MIME-Version: 1.0
Content-Type: multipart/related;
boundary="----=_NextPart_000_0ADE_01CCF860.3D890300"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.3138
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3138

This is a multi-part message in MIME format.

------=_NextPart_000_0ADE_01CCF860.3D890300
Content-Type: text/html;
charset="windows-1251"
Content-Transfer-Encoding: 8bit

<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
</head>
<body>
<table border="0" cellpadding="0" cellspacing="0" style="width: 896px">
<tr><td align="center" style="font: normal 11px Verdana, sans-serif; color: #333;"><a href="http://[email protected]" style="text-decoration: none; color: #0099ff;">Click here!</td></tr>
<tr><td align="center">
<br/>
<a href="http://mau.pillsquar.com?rln="><img src="http://www.viagra.com/PublicResources/ContentAssets/4.4_p1.jpg" style="border-width: 0px"/></a></td></tr>
</table>
</body>
</html>



------------=_4F506AC2.EE281DC4--

7 changes: 7 additions & 0 deletions test/messages/weird-encoding-in-header-field.eml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
From: Hæy There <[email protected]>
To: tesæ[email protected]
Subject: here comes a weird char: õ


check out: https://github.com/sup-heliotrope/sup/issues/205

98 changes: 98 additions & 0 deletions test/test_messages_dir.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/ruby
# encoding: utf-8

require 'test_helper'
require 'sup'
Expand Down Expand Up @@ -26,6 +27,18 @@ def File.exists? file

module Redwood

# monkey patch the MBox source to work without the index.
require 'sup/mbox'
class MBox
def first_new_message
0
end

def my_ensure_open
@f = File.open @path, 'rb' if @f.nil?
end
end

class TestMessagesDir < ::Minitest::Unit::TestCase

def setup
Expand Down Expand Up @@ -140,6 +153,91 @@ def test_missing_line
assert (badline.display_length > 0), "The length of this line should greater than 0: #{badline}"

end
def test_weird_header_encoding
message = ''
File.open 'test/messages/weird-encoding-in-header-field.eml', "r:UTF-8" do |f|
message = f.read
end

#message.force_encoding 'UTF-8'

source = DummySource.new("sup-test://test_messages")
source.messages = [ message ]
source_info = 0


sup_message = Message.build_from_source(source, source_info)
sup_message.load_from_source!

from = sup_message.from
# "from" is just a simple person item

assert_equal("[email protected]", from.email)
#assert_equal("Fake Sender", from.name)

to = sup_message.to[0]
test_to = "tesæ[email protected]"

assert_equal(test_to, to.email)

subj = sup_message.subj
test_subj = "here comes a weird char: õ"
assert_equal(test_subj, subj)

chunks = sup_message.load_from_source!
indexable_chunks = sup_message.indexable_chunks

# there should be only one chunk
#assert_equal(1, chunks.length)

lines = chunks[0].lines

# check if body content includes some of the expected text
assert (lines.join.include? "check out: "), "Body message does not match expected value"
end



def test_bad_address_field

testmsg = File.join(File.dirname(__FILE__), 'messages/bad-address-spam.eml')
source = MBox.new ("mbox:///#{testmsg}")
source.my_ensure_open
source_info = 0

sup_message = nil

source.poll do |sym, args|
assert_equal(sym, :add)
sup_message = Message.build_from_source source, args[:info]
end

from = sup_message.from
# "from" is just a simple person item

assert_equal("[email protected]", from.email)
#assert_equal("Fake Sender", from.name)

to = sup_message.to[0]
test_to = "[email protected]"

assert_equal(test_to, to.email)

subj = sup_message.subj
test_subj = "here comes a weird char: õ"
#assert_equal(test_subj, subj)

chunks = sup_message.load_from_source!
indexable_chunks = sup_message.indexable_chunks

# there should be only one chunk
#assert_equal(1, chunks.length)

lines = chunks[0].lines

# check if body content includes some of the expected text
#assert (lines.join.include? "check out: "), "Body message does not match expected value"
end
end

end
Expand Down