diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-02-04 17:46:05 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-02-04 17:46:05 +0000 |
| commit | 1b63d88cce181a8e84e185f32e0a0b88166d292d (patch) | |
| tree | d8952444e708c70d626d6729313359c59873ac92 | |
| parent | a59ff17c8be4d6ebe6db7b6fc2cebf724c4fd865 (diff) | |
| download | rspamd-1b63d88cce181a8e84e185f32e0a0b88166d292d.tar.gz rspamd-1b63d88cce181a8e84e185f32e0a0b88166d292d.zip | |
[Regression] Fix received parser
Issue: #2743
| -rw-r--r-- | src/ragel/smtp_received.rl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl index f43ad167c..1c76f40fb 100644 --- a/src/ragel/smtp_received.rl +++ b/src/ragel/smtp_received.rl @@ -19,10 +19,9 @@ TCP_info = address_literal >Real_IP_Start %Real_IP_End | ( Domain >Real_Domain_Start %Real_Domain_End FWS address_literal >Real_IP_Start %Real_IP_End ) | ( non_conformant_address_literal >Real_IP_Start %Real_IP_End ); - Extended_Domain = Domain >Real_Domain_Start %Real_Domain_End | # Used to be a real domain + Extended_Domain = (Domain >Real_Domain_Start %Real_Domain_End | # Used to be a real domain ( Domain >Reported_Domain_Start %Reported_Domain_End FWS "(" TCP_info ")" ) | # Here domain is something specified by remote side - ( 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 + ( address_literal >Real_Domain_Start %Real_Domain_End FWS "(" TCP_info ")" ) ); ccontent = ctext | FWS | '(' @{ fcall balanced_ccontent; }; balanced_ccontent := ccontent* ')' @{ fret; }; |