postfixadmin-svn Mailing List for PostfixAdmin (Page 104)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 433
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=433&view=rev
Author:   GingerDog
Date:     2008-08-03 10:09:29 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
vacation.pl: initial merge of smtp rcpt/to checking stuff as per https://sourceforge.net/forum/forum.php?thread_id=2099851&forum_id=676076 ; Thank you!

Modified Paths:
--------------
    trunk/VIRTUAL_VACATION/vacation.pl

Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================

--- trunk/VIRTUAL_VACATION/vacation.pl	2008-08-01 20:47:07 UTC (rev 432)
+++ trunk/VIRTUAL_VACATION/vacation.pl	2008-08-03 10:09:29 UTC (rev 433)
@@ -43,12 +43,20 @@
 # 2008-07-29  Patch from Luxten to add repeat notification after timeout. See:
 #             https://sourceforge.net/tracker/index.php?func=detail&aid=2031631&group_id=191583&atid=937966
 #             
+# 2008-08-01  Luigi Iotti <luigi at iotti dot biz>
+#             Use envelope sender/recipient instead of using
+#             From: and To: header fields;
+#             Support to good vacation behavior as in
+#             http://www.irbs.net/internet/postfix/0707/0954.html
+#             (needs to be tested);
+#
 # Requirements:
 # You need to have the DBD::Pg or DBD::mysql perl-module installed.
 # You need to have the Mail::Sendmail module installed. 
 # You need to have the Email::Valid module installed.
 # You need to have the MIME::Charset module installed.
 # You need to have the MIME::EncWords module installed.
+# You need to have the GetOpt::Std module installed.
 #
 # On Debian based systems : 
 #   libmail-sendmail-perl
@@ -116,6 +124,7 @@
 use Email::Valid;
 use strict;
 use Mail::Sendmail;
+use Getopt::Std;
 
 binmode (STDIN,':utf8');
 
@@ -131,12 +140,12 @@
    exit(0);
 }
 
-my $db_true; # MySQL and PgSQL use different values for TRUE
+my $db_true; # MySQL and PgSQL use different values for TRUE, and unicode support...
 if ($db_type eq "mysql") {
    $dbh->do("SET CHARACTER SET utf8;");
    $db_true = '1';
 } else { # Pg
-   # TODO: SET CHARACTER SET is mysql only, needs FIX for ALL databases
+   $dbh->do("SET CLIENT ENCODING 'UTF8'");
    $db_true = 'True';
 }
 
@@ -355,9 +364,15 @@
 
 }
 
+sub strip_address {
+	my $arg = shift;
+	$arg =~ /([\w\-.%]+\@[\w.-]+)/;
+	return lc($1);
+}
+
 ########################### main #################################
 
-my ($from, $to, $cc, $subject, $messageid, $lastheader);
+my ($from, $to, $cc, ,$bcc , $subject, $messageid, $lastheader, $sender, $recipient, %opts, $sndrhdr);
 
 $subject='';
 $spam = 0;
@@ -366,55 +381,59 @@
 while (<STDIN>) {
    last if (/^$/);
    if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; }  
+   elsif (/^Return-Path:\s+(.*)\n$/i) { $sender = $1; $lastheader = \$sender; }  
+   elsif (/^Delivered-To:\s+(.*)\n$/i) { $recipient = $1; $lastheader = \$recipient; }  
    elsif (/^from:\s+(.*)\n$/i) { $from = $1; $lastheader = \$from; }  
    elsif (/^to:\s+(.*)\n$/i) { $to = $1; $lastheader = \$to; }  
    elsif (/^cc:\s+(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }  
+   elsif (/^bcc:\s+(.*)\n$/i) { $bcc = $1; $lastheader = \$bcc; }  
    elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }  
    elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }  
-   elsif (/^x-spam-(flag|status):\s+yes/i) { exit (0); }  
-   elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }  
-   elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }  
+   elsif (/^x-spam-(flag|status):\s+yes/i) { do_debug("x-spam-$1: yes found"); exit (0); }  
+   elsif (/^precedence:\s+(bulk|list|junk)/i) { do_debug("precedence: $1 found"); exit (0); }  
+   elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { do_debug("x-loop: postfix admin virtual vacation found"); exit (0); }  
+   elsif (/^Auto-Submitted:\s+no/i) { next; }  
+   elsif (/^Auto-Submitted:/i) { do_debug("Auto-Submitted: something found"); exit (0); }
+   elsif (/^List-(Id|Post):/i) { do_debug("List-$1: found"); exit (0); }
+   elsif (/^Sender:\s+(.*)/i) { $sndrhdr = $1; $lastheader = \$sndrhdr; }
    else {$lastheader = "" ; }
 }
 
+getopts('f:', \%opts) or die "Usage: $0 [-f sender] [-- [recipient]]";
+$opts{f} and $sender = $opts{f};
+$recipient = shift || $recipient || $ENV{"USER"} || "";
+
 # If either From: or To: are not set, exit
-if (!$from || !$to || !$messageid) { exit (0); }
+if (!$from || !$to || !$messageid || !$sender || !$recipient) { do_debug("One of from=$from, to=$to, $messageid=$messageid, sender=$sender, recipient=$recipient is empty"); exit (0); }
+if ( $sender =~ /^(mailer-daemon|listserv|majordomo|owner-|request-|bounces-)/i) { do_debug("sender $sender contains $1"); exit (0); }
+if ( $sender =~ /-(owner|request|bounces)\@/i) { do_debug("sender $sender contains $1"); exit (0); }
+my $ss = strip_address($sender);
+my $sr = strip_address($recipient);
+my $ssh = strip_address($sndrhdr);
+if ($ss eq $sr) { do_debug("sender $ss and recipient $sr are the same"); exit(0); }
+my $recipfound = 0;
+for (split(/,\s*/, lc($to)), split(/,\s*/, lc($cc)), split(/,\s*/, lc($bcc))) {
+	my $destinatario = strip_address($_);
+	if ($ssh eq $destinatario) { do_debug("sender header $sender contains recipient $destinatario"); exit(0); }
+	if ($sr eq $destinatario) { $recipfound++; }
+}
+if (!$recipfound) { do_debug("envelope recipient $sr not found in the header recipients"); exit (0); }
 
 $from = lc ($from);
 
 if (!Email::Valid->address($from,-mxcheck => 1)) { do_debug("Invalid from email address: $from; exiting."); exit(0); }
+if (!Email::Valid->address($ss,-mxcheck => 1)) { do_debug("Invalid sender email address: $ss; exiting."); exit(0); }
 
 # Check if it's an obvious sender, exit
 if ($from =~ /([\w\-.%]+\@[\w.-]+)/) { $from = $1; }
-if ($from eq "" || $from =~ /^owner-|-(request|owner)\@|^(mailer-daemon|postmaster)\@/i) { exit (0); }
+if ($from eq "" || $from =~ /^(owner-|-(?:request|owner)\@|^(?:mailer-daemon|postmaster)\@)/i) { do_debug("from $from contains $1"); exit (0); }
 
-# Strip To: and Cc: and push them in array
-my @strip_cc_array; 
-my @strip_to_array = split(/, */, lc ($to) );
-if (defined $cc) { @strip_cc_array = split(/, */, lc ($cc) ); }
-push (@strip_to_array, @strip_cc_array);
-
-my @search_array;
-
-# Strip email address from headers
-for (@strip_to_array) {
-   if ($_ =~ /([\w\-.%]+\@[\w.-]+)/) { 
-      push (@search_array, $1); 
-      do_debug ("[STRIP RECIPIENTS]: ", $messageid, $1);
-   }
+my ($rv, $email) = find_real_address ($sr);
+if ($rv == 1) {
+   do_debug ("[FOUND VACATION]: ", $messageid, $sender, $recipient, $email);
+   send_vacation_email( $email, $sender, $recipient, $messageid);
 }
 
-# Search for email address which has vacation
-for (@search_array) {
-   /([\w\-.%]+\@[\w.-]+)/ or next; 
-   my $addr = $1;
-   my ($rv, $email) = find_real_address ($addr);
-   if ($rv == 1) {
-      do_debug ("[FOUND VACATION]: ", $messageid, $from, $to, $email);
-      send_vacation_email( $email, $from, $to, $messageid);
-   }
-}
-
 0;
 
 #/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (13)	Oct (63)	Nov (79)	Dec (34)
2008	Jan (15)	Feb (8)	Mar (8)	Apr (44)	May (18)	Jun (20)	Jul (35)	Aug (21)	Sep (8)	Oct (9)	Nov (21)	Dec (14)
2009	Jan (53)	Feb (13)	Mar (36)	Apr (40)	May (22)	Jun (10)	Jul (18)	Aug (18)	Sep (7)	Oct (26)	Nov (32)	Dec (13)
2010	Jan (6)	Feb (7)	Mar (12)	Apr (2)	May (12)	Jun (8)	Jul (9)	Aug (12)	Sep (12)	Oct (7)	Nov (9)	Dec (42)
2011	Jan (10)	Feb (35)	Mar (43)	Apr (39)	May (8)	Jun (8)	Jul (83)	Aug (20)	Sep (20)	Oct (63)	Nov (33)	Dec (20)
2012	Jan (28)	Feb (3)	Mar (1)	Apr (37)	May (16)	Jun (7)	Jul (3)	Aug	Sep	Oct (3)	Nov (1)	Dec (4)
2013	Jan (6)	Feb (16)	Mar (9)	Apr (11)	May (9)	Jun (30)	Jul (17)	Aug (6)	Sep (2)	Oct (30)	Nov (41)	Dec (26)
2014	Jan (16)	Feb (20)	Mar (5)	Apr (4)	May (14)	Jun (4)	Jul (1)	Aug	Sep (8)	Oct (18)	Nov (26)	Dec
2015	Jan (4)	Feb (9)	Mar (12)	Apr (26)	May (3)	Jun (3)	Jul (2)	Aug	Sep (15)	Oct (13)	Nov	Dec (1)
2016	Jan (1)	Feb (5)	Mar (4)	Apr (3)	May (19)	Jun	Jul	Aug (3)	Sep (16)	Oct (4)	Nov (5)	Dec (5)
2017	Jan (1)	Feb (8)	Mar	Apr (7)	May (3)	Jun (16)	Jul (13)	Aug (16)	Sep (6)	Oct (4)	Nov (10)	Dec (7)
2018	Jan (16)	Feb (17)	Mar (11)	Apr (13)	May (20)	Jun (3)	Jul (10)	Aug	Sep (3)	Oct (1)	Nov (6)	Dec (18)
2019	Jan (18)	Feb (31)	Mar (4)	Apr (4)	May (1)	Jun (8)	Jul (7)	Aug (10)	Sep (23)	Oct (6)	Nov (3)	Dec (5)
2020	Jan (10)	Feb (18)	Mar (34)	Apr (19)	May (6)	Jun (9)	Jul	Aug (10)	Sep (16)	Oct (6)	Nov (3)	Dec (11)
2021	Jan (118)	Feb (22)	Mar (13)	Apr (12)	May (48)	Jun (21)	Jul (17)	Aug (12)	Sep (19)	Oct (25)	Nov (16)	Dec (7)
2022	Jan (6)	Feb (7)	Mar (14)	Apr (4)	May	Jun (16)	Jul (18)	Aug (5)	Sep (12)	Oct (8)	Nov (10)	Dec (13)
2023	Jan	Feb (3)	Mar (2)	Apr (1)	May (2)	Jun (6)	Jul (3)	Aug (3)	Sep (3)	Oct (2)	Nov (7)	Dec (13)
2024	Jan (8)	Feb (6)	Mar (5)	Apr (10)	May (8)	Jun (6)	Jul (2)	Aug (1)	Sep (2)	Oct (4)	Nov (15)	Dec (10)
2025	Jan (3)	Feb (12)	Mar (3)	Apr (7)	May (18)	Jun (10)	Jul (10)	Aug (6)	Sep (16)	Oct (6)	Nov (2)	Dec

postfixadmin-svn Mailing List for PostfixAdmin (Page 104)

postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!