[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 c64dbcc515cb999e7e754135625d227855315550..dfc590a78b7e5a4416d95bb15ea2e4f9a60bdd2b 100644 (file)
--- 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 fc69a01389ec5ae8d4906815dbd701435ea23fce..736c28b0e9bda94abd66fba91478af10d019e7ab 100644 (file)
--- 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*;