stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-10-06 10:35:46 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor spam filter adjustments

Browse source
This commit is contained in:
mdecimus 2025-01-03 16:45:25 +01:00
parent 127ce0734f
commit 2370043594
14 changed files with 237 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/spam-filter/src/analysis/from.rs
View file

@ -184,7 +184,7 @@ impl SpamFilterAnalyzeFrom for Server {
&& !from_addr.address.is_empty()
&& !from_raw_utf8.contains(" <")
{
ctx.result.add_tag("R_NO_SPACE_IN_FROM");
ctx.result.add_tag("NO_SPACE_IN_FROM");
}
// Check whether read confirmation address is different to from address

2
crates/spam-filter/src/analysis/headers.rs
View file

@ -36,7 +36,7 @@ impl SpamFilterAnalyzeHeaders for Server {
} else if ch == '-' {
tag.push('_');
} else {
tag.push('X');
tag.push(' ');
}
}
ctx.result.add_tag(tag);

64
crates/spam-filter/src/analysis/html.rs
View file

@ -38,11 +38,6 @@ impl SpamFilterAnalyzeHtml for Server {
}) {
ctx.result.add_tag("MIME_HTML_ONLY");
}
let mut last_href: Option<Href> = None;
let mut html_img_words = 0;
let mut html_text_chars = 0;
let mut in_head: i32 = 0;
let mut in_body: i32 = 0;
for (part_id, part) in ctx.output.text_parts.iter().enumerate() {
let is_body_part = ctx.input.message.text_body.contains(&part_id)
@ -58,7 +53,12 @@ impl SpamFilterAnalyzeHtml for Server {
} else {
continue;
};
let mut has_link_to_img = false;
let mut last_href: Option<Href> = None;
let mut html_img_words = 0;
let mut in_head: i32 = 0;
let mut in_body: i32 = 0;
for token in html_tokens {
match token {
@ -121,6 +121,11 @@ impl SpamFilterAnalyzeHtml for Server {
{
// Has Data URI encoding
ctx.result.add_tag("HAS_DATA_URI");
} else if src.starts_with("https://")
|| src.starts_with("http://")
{
// Has external image
ctx.result.add_tag("HAS_EXTERNAL_IMG");
}
continue;
}
@ -139,8 +144,13 @@ impl SpamFilterAnalyzeHtml for Server {
}
let dimensions = img_width + img_height;
if last_href.is_some() && dimensions >= 210 {
if last_href.is_some() {
if dimensions >= 210 {
ctx.result.add_tag("HAS_LINK_TO_LARGE_IMG");
has_link_to_img = true;
} else {
ctx.result.add_tag("HAS_LINK_TO_IMG");
}
}
if dimensions > 100 {
@ -266,10 +276,6 @@ impl SpamFilterAnalyzeHtml for Server {
}
}
}
if is_body_part {
html_text_chars += text.chars().filter(|t| t.is_alphanumeric()).count();
}
}
_ => (),
}
@ -281,30 +287,19 @@ impl SpamFilterAnalyzeHtml for Server {
ctx.result.add_tag("HTML_UNBALANCED_TAG");
}
if has_link_to_img {
match html_text_chars {
0..1024 => {
ctx.result.add_tag("HTML_SHORT_LINK_IMG_1");
}
1024..1536 => {
ctx.result.add_tag("HTML_SHORT_LINK_IMG_2");
}
1536..2048 => {
ctx.result.add_tag("HTML_SHORT_LINK_IMG_3");
}
_ => (),
}
}
let mut html_words = 0;
let mut html_uris = 0;
let mut html_text_chars = 0;
for token in tokens {
match token {
TokenType::Alphabetic(_)
| TokenType::Alphanumeric(_)
| TokenType::Email(_) => {
TokenType::Alphabetic(s) | TokenType::Alphanumeric(s) => {
html_words += 1;
html_text_chars += s.len();
}
TokenType::Email(s) => {
html_words += 1;
html_text_chars += s.address.len();
}
TokenType::Url(_) | TokenType::UrlNoScheme(_) => {
html_uris += 1;
@ -313,6 +308,19 @@ impl SpamFilterAnalyzeHtml for Server {
}
}
match html_text_chars {
0..1024 => {
ctx.result.add_tag("HTML_SHORT_1");
}
1024..1536 => {
ctx.result.add_tag("HTML_SHORT_2");
}
1536..2048 => {
ctx.result.add_tag("HTML_SHORT_3");
}
_ => (),
}
if (!has_link_to_img || html_text_chars >= 2048)
&& (html_img_words as f64 / (html_words as f64 + html_img_words as f64) > 0.5)
{

8
crates/spam-filter/src/analysis/mime.rs
View file

@ -217,7 +217,7 @@ impl SpamFilterAnalyzeMime for Server {
&& (!text_part_words.is_empty() || !html_part_words.is_empty())
&& cosine_similarity(&text_part_words, &html_part_words) < 0.95
{
ctx.result.add_tag("R_PARTS_DIFFER");
ctx.result.add_tag("PARTS_DIFFER");
}
// Odd URI count between parts
@ -269,7 +269,7 @@ impl SpamFilterAnalyzeMime for Server {
.map_or(false, |bytes| !bytes.is_ascii())
{
// MIME text part claims to be ASCII but isn't
ctx.result.add_tag("R_BAD_CTE_7BIT");
ctx.result.add_tag("BAD_CTE_7BIT");
}
is_7bit = true;
}
@ -292,7 +292,7 @@ impl SpamFilterAnalyzeMime for Server {
.map_or(true, |c| c.is_empty())
{
// Charset header is missing
ctx.result.add_tag("R_MISSING_CHARSET");
ctx.result.add_tag("MISSING_CHARSET");
}
if ctx
@ -310,7 +310,7 @@ impl SpamFilterAnalyzeMime for Server {
})
{
// Text part contains multiple scripts
ctx.result.add_tag("R_MIXED_CHARSET");
ctx.result.add_tag("MIXED_CHARSET");
}
has_text_part = true;

23
crates/spam-filter/src/analysis/received.rs
View file

@ -23,11 +23,9 @@ impl SpamFilterAnalyzeReceived for Server {
let mut rcvd_count = 0;
let mut rcvd_from_ip = 0;
let mut tls_count = 0;
let mut has_ua = false;
for header in ctx.input.message.headers() {
match &header.name {
HeaderName::Received => {
if let HeaderName::Received = &header.name {
if !ctx
.input
.message
@ -84,16 +82,6 @@ impl SpamFilterAnalyzeReceived for Server {
rcvd_count += 1;
}
HeaderName::Other(name) => {
if !has_ua
&& (name.eq_ignore_ascii_case("User-Agent")
|| name.eq_ignore_ascii_case("X-Mailer"))
{
has_ua = true;
}
}
_ => {}
}
}
if rcvd_from_ip >= 2 || (rcvd_from_ip == 1 && ctx.output.ehlo_host.ip.is_some()) {
@ -118,15 +106,6 @@ impl SpamFilterAnalyzeReceived for Server {
match rcvd_count {
0 => {
ctx.result.add_tag("RCVD_COUNT_ZERO");
// One received header in a message (currently zero
// but one header will be added later by the MTA)
ctx.result.add_tag("ONCE_RECEIVED");
// Message has been directly delivered from MUA to local MX
if has_ua {
ctx.result.add_tag("DIRECT_TO_MX");
}
}
1 => {
ctx.result.add_tag("RCVD_COUNT_ONE");

6
crates/spam-filter/src/analysis/url.rs
View file

@ -145,7 +145,7 @@ impl SpamFilterAnalyzeUrl for Server {
}
if ch.is_obscured() {
ctx.result.add_tag("R_SUSPICIOUS_URL");
ctx.result.add_tag("SUSPICIOUS_URL");
}
}
@ -159,7 +159,7 @@ impl SpamFilterAnalyzeUrl for Server {
url_parsed
} else {
// URL could not be parsed
ctx.result.add_tag("R_UNPARSABLE_URL");
ctx.result.add_tag("UNPARSABLE_URL");
continue;
};
let host_sld = url_parsed.host.sld_or_default();
@ -260,7 +260,7 @@ impl SpamFilterAnalyzeUrl for Server {
.await;
} else {
// URL is an ip address
ctx.result.add_tag("R_SUSPICIOUS_URL");
ctx.result.add_tag("SUSPICIOUS_URL");
}
// Check URL DNSBL

109
tests/resources/smtp/antispam/combined.test
View file

@ -6,7 +6,7 @@ spf.result none
spf_ehlo.result none
dmarc.result none
remote_ip 195.210.29.48
expect_header X-Spam-Result: ARC_NA (0.00), DKIM_NA (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_DATA_URI (0.00), MID_RHS_MATCH_ENV_FROM (0.00), RCPT_COUNT_ONE (0.00), RCVD_COUNT_ZERO (0.00), SPF_NA (0.00), SUBJECT_ENDS_EXCLAIM (0.00), TO_DN_NONE (0.00), TO_MATCH_ENVRCPT_ALL (0.00), ONCE_RECEIVED (0.10), RCVD_NO_TLS_LAST (0.10), MIME_HTML_ONLY (0.20), HELO_NORES_A_OR_MX (0.30), AUTH_NA (1.00), DATE_IN_PAST (1.00), DMARC_NA (1.00), MID_RHS_MATCH_FROM (1.00), FROMHOST_NORES_A_OR_MX (1.50), HTML_SHORT_LINK_IMG_1 (2.00), RDNS_NONE (2.00), PYZOR (3.50)
expect_header X-Spam-Result: ARC_NA (0.00), DKIM_NA (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_DATA_URI (0.00), HAS_LINK_TO_LARGE_IMG (0.00), HTML_SHORT_1 (0.00), MID_RHS_MATCH_ENV_FROM (0.00), RCPT_COUNT_ONE (0.00), SPF_NA (0.00), SUBJECT_ENDS_EXCLAIM (0.00), TO_DN_NONE (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_COUNT_ZERO (0.10), RCVD_NO_TLS_LAST (0.10), MIME_HTML_ONLY (0.20), HELO_NORES_A_OR_MX (0.30), AUTH_NA (1.00), DATE_IN_PAST (1.00), DMARC_NA (1.00), MID_RHS_MATCH_FROM (1.00), FROMHOST_NORES_A_OR_MX (1.50), HTML_SHORT_LINK_IMG_1 (2.00), RDNS_NONE (2.00), PYZOR (3.50)
expect_header X-Spam-Status: Yes, score=13.70
From: Client Services <noreply@tetheer.com>
@ -49,7 +49,7 @@ dkim.domains tenthrevolution.com
dmarc.result pass
remote_ip 185.58.86.181
tls.version TLSv1.3
expect_header X-Spam-Result: DMARC_POLICY_ALLOW (-0.50), DKIM_ALLOW (-0.20), SPF_ALLOW (-0.20), MIME_GOOD (-0.10), ARC_NA (0.00), DKIM_SIGNED (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_ATTACHMENT (0.00), RCPT_COUNT_ONE (0.00), RCVD_COUNT_THREE (0.00), TO_DN_EQ_ADDR_ALL (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), SUBJECT_ENDS_SPACES (0.50), URI_COUNT_ODD (0.50), DATE_IN_PAST (1.00), FORGED_RCVD_TRAIL (1.00), FROMHOST_NORES_A_OR_MX (1.50)
expect_header X-Spam-Result: DMARC_POLICY_ALLOW (-0.50), DKIM_ALLOW (-0.20), SPF_ALLOW (-0.20), MIME_GOOD (-0.10), ARC_NA (0.00), DKIM_SIGNED (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_ATTACHMENT (0.00), HTML_SHORT_2 (0.00), RCPT_COUNT_ONE (0.00), RCVD_COUNT_THREE (0.00), TO_DN_EQ_ADDR_ALL (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), SUBJECT_ENDS_SPACES (0.50), URI_COUNT_ODD (0.50), DATE_IN_PAST (1.00), FORGED_RCVD_TRAIL (1.00), FROMHOST_NORES_A_OR_MX (1.50)
expect_header X-Spam-Status: No, score=3.90
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenthrevolution.com;
@ -574,7 +574,7 @@ dmarc.result fail
dmarc.policy reject
remote_ip 51.89.165.39
tls.version TLS1_2
expect_header X-Spam-Result: DKIM_ALLOW (-0.20), HAS_LIST_UNSUB (-0.01), ARC_NA (0.00), DKIM_SIGNED (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_REPLYTO (0.00), MID_RHS_MATCH_ENV_FROM (0.00), RCPT_COUNT_ONE (0.00), RCVD_COUNT_ZERO (0.00), REPLYTO_ADDR_EQ_FROM (0.00), REPLYTO_EQ_FROM (0.00), SPF_SOFTFAIL (0.00), TO_DN_NONE (0.00), TO_MATCH_ENVRCPT_ALL (0.00), ONCE_RECEIVED (0.10), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), DATE_IN_PAST (1.00), MID_RHS_MATCH_FROM (1.00), R_PARTS_DIFFER (1.00), FROMHOST_NORES_A_OR_MX (1.50), HTML_SHORT_LINK_IMG_1 (2.00), RDNS_NONE (2.00), VIOLATED_DIRECT_SPF (3.50), DMARC_POLICY_REJECT (4.00)
expect_header X-Spam-Result: DKIM_ALLOW (-0.20), HAS_LIST_UNSUB (-0.01), ARC_NA (0.00), DKIM_SIGNED (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_EXTERNAL_IMG (0.00), HAS_LINK_TO_LARGE_IMG (0.00), HAS_REPLYTO (0.00), HTML_SHORT_1 (0.00), MID_RHS_MATCH_ENV_FROM (0.00), RCPT_COUNT_ONE (0.00), REPLYTO_ADDR_EQ_FROM (0.00), REPLYTO_EQ_FROM (0.00), SPF_SOFTFAIL (0.00), TO_DN_NONE (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_COUNT_ZERO (0.10), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), DATE_IN_PAST (1.00), MID_RHS_MATCH_FROM (1.00), PARTS_DIFFER (1.00), FROMHOST_NORES_A_OR_MX (1.50), HTML_SHORT_LINK_IMG_1 (2.00), RDNS_NONE (2.00), VIOLATED_DIRECT_SPF (3.50), DMARC_POLICY_REJECT (4.00)
expect_header X-Spam-Status: Yes, score=16.29
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=sectionalism; d=grupokonecta.net;
@ -791,7 +791,7 @@ dmarc.result pass
dmarc.policy reject
remote_ip 52.103.64.5
tls.version TLS1_2
expect_header X-Spam-Result: DMARC_POLICY_ALLOW (-0.50), DKIM_ALLOW (-0.20), SPF_ALLOW (-0.20), ARC_NA (0.00), ARC_SIGNED (0.00), DKIM_SIGNED (0.00), FREEMAIL_FROM (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_SEO_WORD (0.00), HAS_X_PRIO_ONE (0.00), MID_RHS_MATCH_ENV_FROMTLD (0.00), MID_RHS_MATCH_FROMTLD (0.00), RCPT_COUNT_ONE (0.00), RCPT_IN_BODY (0.00), RCVD_COUNT_TWO (0.00), TO_DN_EQ_ADDR_ALL (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), DATE_IN_PAST (1.00), HEADER_EMPTY_DELIMITER (1.00), FROMHOST_NORES_A_OR_MX (1.50), SEO_SPAM (5.00)
expect_header X-Spam-Result: DMARC_POLICY_ALLOW (-0.50), DKIM_ALLOW (-0.20), SPF_ALLOW (-0.20), ARC_NA (0.00), ARC_SIGNED (0.00), DKIM_SIGNED (0.00), FREEMAIL_FROM (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_SEO_WORD (0.00), HAS_X_PRIO_ONE (0.00), HTML_SHORT_1 (0.00), MID_RHS_MATCH_ENV_FROMTLD (0.00), MID_RHS_MATCH_FROMTLD (0.00), RCPT_COUNT_ONE (0.00), RCPT_IN_BODY (0.00), RCVD_COUNT_TWO (0.00), TO_DN_EQ_ADDR_ALL (0.00), TO_MATCH_ENVRCPT_ALL (0.00), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), DATE_IN_PAST (1.00), HEADER_EMPTY_DELIMITER (1.00), FROMHOST_NORES_A_OR_MX (1.50), SEO_SPAM (5.00)
expect_header X-Spam-Status: Yes, score=8.00
Return-Path: <miah.join@outlook.com>
@ -1008,3 +1008,104 @@ om you.&nbsp; <o:p>
--_000_SEYPR04MB74966F6A34B2B0AC5DA8E6DDFD0A2SEYPR04MB7496apcp_--
<!-- NEXT TEST -->
envelope_from marketing@landeray.com
envelope_to hello@stalw.art
helo_domain terminal4.landeray.com
iprev.result pass
dkim.result pass
dkim.domains outlook.com
spf.result pass
spf_ehlo.result pass
dmarc.result pass
dmarc.policy reject
remote_ip 173.224.123.255
tls.version TLS1_2
expect_header X-Spam-Result: DMARC_POLICY_ALLOW (-0.50), DKIM_ALLOW (-0.20), SPF_ALLOW (-0.20), ARC_NA (0.00), DKIM_SIGNED (0.00), FROM_EQ_ENV_FROM (0.00), FROM_HAS_DN (0.00), HAS_EXTERNAL_IMG (0.00), HAS_REPLYTO (0.00), HAS_X_PRIO_THREE (0.00), HTML_SHORT_1 (0.00), RCPT_COUNT_ONE (0.00), REPLYTO_DN_EQ_FROM_DN (0.00), REPLYTO_DOM_EQ_FROM_DOM (0.00), TO_DN_ALL (0.00), TO_EQ_FROM (0.00), RCVD_COUNT_ZERO (0.10), RCVD_NO_TLS_LAST (0.10), HELO_NORES_A_OR_MX (0.30), MID_RHS_NOT_FQDN (0.50), UNPARSABLE_URL (0.50), FROMHOST_NORES_A_OR_MX (1.50), DIRECT_TO_MX (2.00), FORGED_RECIPIENTS (2.00), SUBJ_ALL_CAPS (3.00)
expect_header X-Spam-Status: Yes, score=9.10
Return-Path: <marketing@landeray.com>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=default; d=landeray.com;
h=Message-ID:Reply-To:From:To:Subject:Date:MIME-Version:Content-Type;
i=marketing@landeray.com;
bh=nlE2QLcR2WpTkMQ4zUwkF7IBIw4eOeAhkKS/HXiMvSs=;
b=EwWEML/WtTA6nI6CuagI2LRBWAZuRHk6IJiDNA3R77dTpa80gHPkfzF3NBcKcVIiCYcf6i4HCniZ
bF4DT8VZrFfLCSykeL2t5FLjYwFcjXjX7qCvyaR0hLfyFRSCDO9RytMw8Q3WoODc/jMXWrdxYpqu
phP9D5Q/N8vzSneReGOCV62Me1ss947uc43zYZXvVwuXeyLbU0yPzJtTTEODFXmVp2Ul/M7w963E
UxzrNlTd/lEIUXVvxAOL2DKGxY8oXslevI0euO8E8TQms3SlY6LySkDia1h+N+mVpbPPeE3txZhS
LJwn2MBX59b+W3aMafAt4Ae/UVOOBlMT7FhhvA==
Message-ID: <FA171967DC4F4DC39B03EEF3E42FBDEE@christian>
Reply-To: "RESERVAS Y CONSULTAS" <noreply@landeray.com>
From: "RESERVAS Y CONSULTAS" <marketing@landeray.com>
To: "Marketing Online" <marketing@landeray.com>
Subject: BRISZA ASIA TEMPORADA 2025
Date: Fri, 3 Jan 2025 14:06:03 +0000
Organization: CLIENTE-DISCOTECA
MIME-Version: 1.0
Content-Type: multipart/alternative;
boundary="----=_NextPart_000_0E52_01DB5DE8.9FAFDC60"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5512
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579
This is a multi-part message in MIME format.
------=_NextPart_000_0E52_01DB5DE8.9FAFDC60
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Consulta v=EDa WhatsApp: https://api.whatsapp.com/send?phone=3D5199504167=
6&text=3DDeseo realizar una reserva en BRISZA
Si no puedes visualizar la imagen haz click aqu=ED https://i.imgur.com/O1=
2POZ2.png
Si esta informaci=F3n no es de su inter=E9s. Favor de escribirnos un corr=
eo en blanco a eliminarcorreo2016@gmail.com con el Asunto "REMOVER". Grac=
ias.
------=_NextPart_000_0E52_01DB5DE8.9FAFDC60
Content-Type: text/html;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content=3D"text/html; charset=3Diso-8859-1" http-equiv=3DContent-Ty=
pe>
<META name=3DGENERATOR content=3D"MSHTML 6.00.6000.16788">
<STYLE></STYLE>
</HEAD>
<BODY bgColor=3D#ffffff>
<DIV align=3Dleft><FONT face=3DCalibri>Consulta v=EDa WhatsApp: <A=20
href=3D"https://api.whatsapp.com/send?phone=3D51995041676&text=3DDeseo re=
alizar una reserva en BRISZA">https://api.whatsapp.com/send?phone=3D51995=
041676&amp;text=3DDeseo=20
realizar una reserva en BRISZA</A></FONT></DIV>
<DIV align=3Dleft><FONT face=3DCalibri></FONT>&nbsp;</DIV>
<DIV align=3Dleft><FONT face=3DCalibri></FONT>&nbsp;</DIV>
<DIV align=3Dcenter><FONT face=3DCalibri>Si no puedes visualizar la image=
n haz click=20
aqu=ED </FONT><FONT face=3DCalibri><A=20
href=3D"https://i.imgur.com/O12POZ2.png">https://i.imgur.com/O12POZ2.png<=
/A></FONT></DIV>
<DIV align=3Dcenter><FONT size=3D2 face=3DArial></FONT>&nbsp;</DIV>
<DIV align=3Dcenter><IMG border=3D0 hspace=3D0 alt=3D""=20
src=3D"https://i.imgur.com/O12POZ2.png"></DIV>
<DIV align=3Dcenter>&nbsp;</DIV>
<DIV align=3Dcenter>
<DIV align=3Dcenter><SPAN><FONT size=3D3 face=3DCalibri>Si esta informaci=
=F3n no es de=20
su inter=E9s. Favor de escribirnos un correo en blanco a&nbsp;</FONT><A=20
href=3D"mailto:eliminarcorreo2016@gmail.com"><FONT size=3D3=20
face=3DCalibri>eliminarcorreo2016@gmail.com</FONT></A></SPAN><SPAN><FONT =
size=3D3=20
face=3DCalibri>&nbsp;con el Asunto "REMOVER".=20
Gracias.</FONT></SPAN></DIV></DIV></BODY></HTML>
------=_NextPart_000_0E52_01DB5DE8.9FAFDC60--

2
tests/resources/smtp/antispam/from.test
View file

@ -128,7 +128,7 @@ From: "=?iso-8859-1?Q?Die_Hasen_und_die_Fr=F6sche?=" <hello@domain.org>
Test
<!-- NEXT TEST -->
envelope_from hello@domain.org
expect R_NO_SPACE_IN_FROM FROM_EQ_ENV_FROM FROM_HAS_DN
expect NO_SPACE_IN_FROM FROM_EQ_ENV_FROM FROM_HAS_DN
From: "Hello"<hello@domain.org>

38
tests/resources/smtp/antispam/html.test
View file

@ -1,4 +1,4 @@
expect MIME_HTML_ONLY
expect MIME_HTML_ONLY HTML_SHORT_1
Message-Id: <4.2.0.58.20000519002557.00a88870@pop.example.com>
X-Sender: dwsauder@pop.example.com (Unverified)
@ -36,7 +36,7 @@ wir.&quot; <br>
<br>
</font></html>
<!-- NEXT TEST -->
expect HTTP_TO_HTTPS
expect HTTP_TO_HTTPS HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -56,7 +56,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTTP_TO_IP
expect HTTP_TO_IP HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -79,7 +79,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect EXT_CSS
expect EXT_CSS HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -100,7 +100,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect EXT_CSS
expect EXT_CSS HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -121,7 +121,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTML_UNBALANCED_TAG
expect HTML_UNBALANCED_TAG HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -142,7 +142,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTML_UNBALANCED_TAG
expect HTML_UNBALANCED_TAG HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -163,7 +163,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTML_SHORT_LINK_IMG_1
expect HTML_SHORT_LINK_IMG_1 HTML_SHORT_1 HAS_LINK_TO_LARGE_IMG
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -188,7 +188,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect BODY_URI_ONLY
expect BODY_URI_ONLY HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -212,7 +212,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTML_TEXT_IMG_RATIO
expect HTML_TEXT_IMG_RATIO HTML_SHORT_1
Content-Type: multipart/alternative;
boundary="=====================_714967308==_.ALT"
@ -238,7 +238,7 @@ Content-Transfer-Encoding: 8bit
--=====================_714967308==_.ALT--
<!-- NEXT TEST -->
expect HTML_META_REFRESH_URL MIME_HTML_ONLY
expect HTML_META_REFRESH_URL MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -250,7 +250,7 @@ Content-Transfer-Encoding: 8bit
<p>some text</p>
</body>
<!-- NEXT TEST -->
expect MIME_HTML_ONLY
expect MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -262,7 +262,7 @@ Content-Transfer-Encoding: 8bit
<p>some text</p>
</body>
<!-- NEXT TEST -->
expect HAS_DATA_URI DATA_URI_OBFU MIME_HTML_ONLY
expect HAS_DATA_URI DATA_URI_OBFU MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -275,7 +275,7 @@ Content-Transfer-Encoding: 8bit
<a href="data:text/plain;base64,SGVsbG8sIHdvcmxkIQ==">Click me for a hello message</a>
</body>
<!-- NEXT TEST -->
expect HAS_DATA_URI MIME_HTML_ONLY
expect HAS_DATA_URI MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -289,7 +289,7 @@ Content-Transfer-Encoding: 8bit
<a href="data:other">Click me for a hello message</a>
</body>
<!-- NEXT TEST -->
expect PHISHING MIME_HTML_ONLY
expect PHISHING MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -298,7 +298,7 @@ Content-Transfer-Encoding: 8bit
<a href="https://domain1.com/query">https://domain2.com/otherquery</a>
</body>
<!-- NEXT TEST -->
expect MIME_HTML_ONLY
expect MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -307,7 +307,7 @@ Content-Transfer-Encoding: 8bit
<a href="https://domain1.co.uk/query">https://subdomain.domain1.co.uk/otherquery</a>
</body>
<!-- NEXT TEST -->
expect PHISHING MIME_HTML_ONLY
expect PHISHING MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -316,7 +316,7 @@ Content-Transfer-Encoding: 8bit
<a href="https://domain1.com/query">domain2.com/otherquery</a>
</body>
<!-- NEXT TEST -->
expect MIME_HTML_ONLY
expect MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
@ -325,7 +325,7 @@ Content-Transfer-Encoding: 8bit
<a href="https://domain1.co.uk/query">subdomain.domain1.co.uk/otherquery</a>
</body>
<!-- NEXT TEST -->
expect MIME_HTML_ONLY
expect MIME_HTML_ONLY HTML_SHORT_1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit

8
tests/resources/smtp/antispam/mime.test
View file

@ -33,7 +33,7 @@ Content-Type: text/html; charset="us-ascii"
Test
<!-- NEXT TEST -->
expect R_BAD_CTE_7BIT SINGLE_SHORT_PART
expect BAD_CTE_7BIT SINGLE_SHORT_PART
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
@ -41,7 +41,7 @@ MIME-Version: 1.0
Téstíng
<!-- NEXT TEST -->
expect R_MISSING_CHARSET SINGLE_SHORT_PART
expect MISSING_CHARSET SINGLE_SHORT_PART
Content-Type: text/plain
Content-Transfer-Encoding: 8bit
@ -139,7 +139,7 @@ culpa qui officia deserunt mollit anim id est laborum.
--boundary--
<!-- NEXT TEST -->
expect R_PARTS_DIFFER
expect PARTS_DIFFER
MIME-Version: 1.0
Content-Type: multipart/alternative;
@ -353,7 +353,7 @@ this is a test
--boundary--
<!-- NEXT TEST -->
expect R_MIXED_CHARSET SINGLE_SHORT_PART
expect MIXED_CHARSET SINGLE_SHORT_PART
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

4
tests/resources/smtp/antispam/received.test
View file

@ -50,10 +50,10 @@ Subject: test
test
<!-- NEXT TEST -->
expect DIRECT_TO_MX ONCE_RECEIVED RCVD_COUNT_ZERO RCVD_NO_TLS_LAST
expect DIRECT_TO_MX RCVD_COUNT_ZERO RCVD_NO_TLS_LAST
To: user@domain.com
X-Mailer: MUA
X-Mailer: MUA 1.2
Subject: test
test

2
tests/resources/smtp/antispam/recipient.test
View file

@ -58,7 +58,7 @@ Cc: goodbye@world.com
Test
<!-- NEXT TEST -->
expect RCPT_COUNT_ZERO R_UNDISC_RCPT
expect RCPT_COUNT_ZERO UNDISC_RCPT
To: Undisclosed recipients:;

4
tests/resources/smtp/antispam/url.test
View file

@ -10,7 +10,7 @@ Subject: test
my site is https://url.org
<!-- NEXT TEST -->
expect R_SUSPICIOUS_URL
expect SUSPICIOUS_URL
Subject: test
@ -28,7 +28,7 @@ Subject: test
my site is https://www.xn--80ak6aa92e.com/
<!-- NEXT TEST -->
expect R_UNPARSABLE_URL
expect UNPARSABLE_URL
Subject: test

5
tests/src/smtp/inbound/antispam.rs
View file

@ -512,6 +512,7 @@ async fn antispam() {
match test_name {
"html" => {
server.spam_filter_analyze_html(&mut spam_ctx).await;
server.spam_filter_analyze_rules(&mut spam_ctx).await;
}
"subject" => {
server.spam_filter_analyze_headers(&mut spam_ctx).await;
@ -521,7 +522,11 @@ async fn antispam() {
spam_ctx.result.tags.retain(|t| !t.starts_with("X_HDR_"));
}
"received" => {
server.spam_filter_analyze_headers(&mut spam_ctx).await;
spam_ctx.result.tags.retain(|t| t.starts_with("X_HDR_"));
server.spam_filter_analyze_received(&mut spam_ctx).await;
server.spam_filter_analyze_rules(&mut spam_ctx).await;
spam_ctx.result.tags.retain(|t| !t.starts_with("X_HDR_"));
}
"messageid" => {
server.spam_filter_analyze_message_id(&mut spam_ctx).await;