Check and remove invalid chars from $rcptto (#691)

* Check and remove invalid chars from $rcptto
MailScanner · Oct 12, 2024 · b3431a4 · b3431a4
1 parent 6a09777
commit b3431a4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.5.2-1
+5.5.3-1
diff --git a/changelog b/changelog
@@ -1,3 +1,7 @@
+10/12/2024 Changes in    v5.5.3-1
+==================================
+- Check for invalid chars in recipient address (msmilter) - Thanks to alexskynet
+
 06/09/2024 Changes in    v5.5.2-1
 ==================================
 - Remove references to SORBS

diff --git a/common/usr/sbin/MSMilter b/common/usr/sbin/MSMilter
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -U -I /usr/share/MailScanner/perl
 
 # (c) 2019-2020 MailScanner Project <https://www.mailscanner.info>
-#          Version 1.7
+#          Version 1.8
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -248,7 +248,13 @@ sub envrcpt_callback
         ${$message_ref} .= "\tby " . hostname . ' (MailScanner Milter) with SMTP id ';
     }
 
+    # Check and remove invalid characters from rcptto
     my $rcptto = $args[0];
+    $rcptto =~ s/^<//;
+    $rcptto =~ s/>$//;
+    $rcptto =~ s/<.*?>//g;
+    $rcptto = "<$rcptto>";
+
     my $esmtpnotify = '';
     # Capture the ESMTP options for pass through MailScanner engine
     # RFC 3461