diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-16 12:29:01 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-16 12:29:01 +0100 |
| commit | c47156cb81dd8b3a9b04967da91310740cdf211f (patch) | |
| tree | 99e08828246a87fbc635fe5f8649e7495d2d932f /src/ragel/smtp_received.rl | |
| parent | 8167af6e6515eda26296fcaaf8a742bbf468348b (diff) | |
| download | rspamd-c47156cb81dd8b3a9b04967da91310740cdf211f.tar.gz rspamd-c47156cb81dd8b3a9b04967da91310740cdf211f.zip | |
[Fix] Fix various issues with parsing of the received headers
Diffstat (limited to 'src/ragel/smtp_received.rl')
| -rw-r--r-- | src/ragel/smtp_received.rl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl index b13259fed..f43ad167c 100644 --- a/src/ragel/smtp_received.rl +++ b/src/ragel/smtp_received.rl @@ -24,12 +24,9 @@ ( address_literal >Real_Domain_Start %Real_Domain_End FWS "(" TCP_info ")" ) | address_literal >Real_IP_Start %Real_IP_End; # Not RFC conforming, but many MTA try this - exim_real_ip = "[" (IPv4_addr|IPv6_simple) >IP4_start %IP4_end "]" - >Real_IP_Start %Real_IP_End (":" digit{1,4})?; - exim_content = exim_real_ip; ccontent = ctext | FWS | '(' @{ fcall balanced_ccontent; }; balanced_ccontent := ccontent* ')' @{ fret; }; - comment = "(" (FWS? ccontent|exim_content)* FWS? ")"; + comment = "(" ((FWS? ccontent)* FWS?) >Comment_Start %Comment_End ")"; CFWS = ((FWS? comment)+ FWS?) | FWS; From_domain = "FROM"i FWS Extended_Domain >From_Start %From_End; |