From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 21 Mar 2017 13:24:52 +0000 (+0000)
Subject: [Fix] Fix parsing of dot at the end of the address
X-Git-Tag: 1.5.4~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f62643beef8244e765181008b37fece116ebde1;p=thirdparty%2Frspamd.git

[Fix] Fix parsing of dot at the end of the address

Issue: #1543
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index c64dbcc515..dfc590a78b 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -373,7 +373,7 @@ rspamd_protocol_handle_headers (struct rspamd_task *task,
 						g_ptr_array_add (task->rcpt_envelope, addr);
 					}
 					else {
-						msg_err_task ("bad from header: '%T'", h->value);
+						msg_err_task ("bad rcpt header: '%T'", h->value);
 						task->flags |= RSPAMD_TASK_FLAG_BROKEN_HEADERS;
 					}
 					debug_task ("read rcpt header, value: %V", hv);
diff --git a/src/ragel/smtp_address.rl b/src/ragel/smtp_address.rl
index fc69a01389..736c28b0e9 100644
--- a/src/ragel/smtp_address.rl
+++ b/src/ragel/smtp_address.rl
@@ -25,7 +25,7 @@
   Adl = Atdomain ( "," Atdomain )*;
 
   Mailbox        = Local_part "@" (address_literal | Domain >Domain_start %Domain_end);
-  UnangledPath = ( Adl ":" )? Mailbox >Addr_start %Addr_end;
+  UnangledPath = ( Adl ":" )? Mailbox >Addr_start %Addr_end "."?;
   AngledPath = "<" UnangledPath ">" %Addr_has_angle;
   Path = AngledPath | UnangledPath;
   SMTPAddr = space* (Path | "<>" %Empty_addr ) %Valid_addr space*;