diff options
| -rwxr-xr-x | pullimap | 14 | ||||
| -rw-r--r-- | pullimap.md | 3 |
2 files changed, 15 insertions, 2 deletions
@@ -269,13 +269,25 @@ sub purge() { my $ATTRS = "ENVELOPE INTERNALDATE"; $ATTRS .= " BODY.PEEK[]" unless $CONFIG{'no-delivery'}; +my $RE_ATOM = qr/[A-Za-z0-9\x21\x23-\x27\x2A\x2B\x2D\x2F\x3D\x3F\x5E-\x60\x7B-\x7E]+/; sub pull_callback($$) { my ($uids, $mail) = @_; return unless exists $mail->{RFC822} or $CONFIG{'no-delivery'}; # not for us my $uid = $mail->{UID}; my $from = first { defined $_ and @$_ } @{$mail->{ENVELOPE}}[2,3,4]; - $from = (defined $from and @$from) ? $from->[0]->[2].'@'.$from->[0]->[3] : ''; + if (defined $from and @$from) { + my ($l, $d) = ($from->[0]->[2], $from->[0]->[3]); + if ($l !~ qr/\A$RE_ATOM(?:\.$RE_ATOM)*\z/o) { # Dot-string, RFC 5321 + # quote the local part + $IMAP->panic("Invalid MAIL FROM: <$l\@$d>") unless $l =~ qr/\A[\x20-\x7E]*\z/; + $l =~ s/([\x22\x5C])/\\$1/g; # escape double-quote and backslash + $l = '"' .$l. '"'; + } + $from = $l .'@'. $d; + } else { + $from = ''; + } $IMAP->log("UID $uid from <$from> ($mail->{INTERNALDATE})") unless $CONFIG{quiet}; sendmail($from, $mail->{RFC822}) unless $CONFIG{'no-delivery'}; diff --git a/pullimap.md b/pullimap.md index 5ff3af1..06e5988 100644 --- a/pullimap.md +++ b/pullimap.md @@ -110,7 +110,8 @@ Valid options are: *deliver-rcpt* -: Message recipient. +: Message recipient. Note that the local part needs to quoted if it + contains special characters; see [RFC 5321] for details. (Default: the username associated with the effective uid of the `pullimap` process.) |